vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-02 10:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #419 from safing/fix/patch-set-8

Browse source 
Update config options and add fallback dns check
This commit is contained in:
Daniel 2021-10-18 11:12:22 +02:00 • committed by GitHub
commit a10de4e811
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
netenv/online-status.go
View file

@ -39,6 +39,9 @@ var (
DNSTestDomain = "one.one.one.one." DNSTestDomain = "one.one.one.one."
DNSTestExpectedIP = net.IPv4(1, 1, 1, 1) DNSTestExpectedIP = net.IPv4(1, 1, 1, 1)
DNSFallbackTestDomain = "dns-check.safing.io."
DNSFallbackTestExpectedIP = net.IPv4(0, 65, 67, 75) // Ascii: \0ACK
// SpecialCaptivePortalDomain is the domain name used to point to the detected captive portal IP // SpecialCaptivePortalDomain is the domain name used to point to the detected captive portal IP
// or the captive portal test IP. The default value should be overridden by the resolver package, // or the captive portal test IP. The default value should be overridden by the resolver package,
// which defines the custom internal domain name to use. // which defines the custom internal domain name to use.
@ -47,7 +50,8 @@ var (
// ConnectivityDomains holds all connectivity domains. This slice must not be modified. // ConnectivityDomains holds all connectivity domains. This slice must not be modified.
ConnectivityDomains = []string{ ConnectivityDomains = []string{
SpecialCaptivePortalDomain, SpecialCaptivePortalDomain,
"one.one.one.one.", // Internal DNS Check DNSTestDomain, // Internal DNS Check
DNSFallbackTestDomain, // Internal DNS Check
// Windows // Windows
"dns.msftncsi.com.", // DNS Check "dns.msftncsi.com.", // DNS Check
@ -438,15 +442,27 @@ func checkOnlineStatus(ctx context.Context) {
// 3) resolve a query // 3) resolve a query
// make DNS request // Check with primary dns check domain.
ips, err := net.LookupIP(DNSTestDomain) ips, err := net.LookupIP(DNSTestDomain)
if err == nil {
// check for expected response
for _, ip := range ips {
if ip.Equal(DNSTestExpectedIP) {
updateOnlineStatus(StatusOnline, nil, "all checks passed")
return
}
}
}
// If that did not work, check with fallback dns check domain.
ips, err = net.LookupIP(DNSFallbackTestDomain)
if err != nil { if err != nil {
updateOnlineStatus(StatusSemiOnline, nil, "dns check query failed") updateOnlineStatus(StatusLimited, nil, "dns fallback check query failed")
return return
} }
// check for expected response // check for expected response
for _, ip := range ips { for _, ip := range ips {
if ip.Equal(DNSTestExpectedIP) { if ip.Equal(DNSFallbackTestExpectedIP) {
updateOnlineStatus(StatusOnline, nil, "all checks passed") updateOnlineStatus(StatusOnline, nil, "all checks passed")
return return
} }

2
profile/config.go
View file

@ -521,7 +521,7 @@ Current Features:
Please note that if you are using the system resolver, bypass attempts might be additionally blocked there too.`, Please note that if you are using the system resolver, bypass attempts might be additionally blocked there too.`,
OptType: config.OptTypeInt, OptType: config.OptTypeInt,
ExpertiseLevel: config.ExpertiseLevelUser, ExpertiseLevel: config.ExpertiseLevelUser,
ReleaseLevel: config.ReleaseLevelBeta, ReleaseLevel: config.ReleaseLevelStable,
DefaultValue: status.SecurityLevelsAll, DefaultValue: status.SecurityLevelsAll,
PossibleValues: status.SecurityLevelValues, PossibleValues: status.SecurityLevelValues,
Annotations: config.Annotations{ Annotations: config.Annotations{

6
updates/config.go
View file

@ -59,12 +59,6 @@ func registerConfig() error {
Description: "Dangerous development releases for testing random things and experimenting. Only use temporarily and when instructed.", Description: "Dangerous development releases for testing random things and experimenting. Only use temporarily and when instructed.",
Value: helper.ReleaseChannelStaging, Value: helper.ReleaseChannelStaging,
}, },
// TODO: Remove as soon as everyone has switched away.
{
Name: "Special (Deprecated!)",
Description: "This channel has been deprecated. If selected, the Stable channel will be used instead.",
Value: "special",
},
}, },
Annotations: config.Annotations{ Annotations: config.Annotations{
config.DisplayOrderAnnotation: -4, config.DisplayOrderAnnotation: -4,