github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #208 from safing/fix/connectivity-grant-captive-portal-domain-check

Browse Source 
Fix captive portal domain connectivity check
This commit is contained in:
Daniel
2020-12-04 16:53:33 +01:00
committed by GitHub
parent 47625e4436 a4fc8e4bef
commit 7334000e53
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
netenv/online-status.go
View File

@@ -56,8 +56,14 @@ func prepOnlineStatus() (err error) {
return err
}
// IsConnectivityDomain checks whether the given domain (fqdn) is used for any connectivity related network connections and should always be resolved using the network assigned DNS server.
// IsConnectivityDomain checks whether the given domain (fqdn) is used for any
// connectivity related network connections and should always be resolved using
// the network assigned DNS server.
func IsConnectivityDomain(domain string) bool {
if domain == "" {
return false
}
switch domain {
case SpecialCaptivePortalDomain,
"one.one.one.one.", // Internal DNS Check
@@ -92,10 +98,15 @@ func IsConnectivityDomain(domain string) bool {
// Other
"neverssl.com.", // Common Community Service
"detectportal.firefox.com.", // Firefox
"detectportal.firefox.com.": // Firefox
// Redirected Domain
GetCaptivePortal().Domain:
return true
}
// Check for captive portal domain.
captivePortal := GetCaptivePortal()
if captivePortal.Domain != "" &&
domain == captivePortal.Domain {
return true
}