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

Check failing resolvers asynchronously

Browse Source
This commit is contained in:
Daniel
2023-10-10 14:10:40 +02:00
parent a386cf72f1
commit 995429629b
9 changed files with 317 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
resolver/resolvers.go
View File

@@ -358,6 +358,12 @@ func getSystemResolvers() (resolvers []*Resolver) {
const missingResolversErrorID = "missing-resolvers"
func loadResolvers() {
defer func() {
if !allConfiguredResolversAreFailing() {
resetFailingResolversNotification()
}
}()
// TODO: what happens when a lot of processes want to reload at once? we do not need to run this multiple times in a short time frame.
resolversLock.Lock()
defer resolversLock.Unlock()
@@ -383,21 +389,21 @@ func loadResolvers() {
)
if len(newResolvers) == 0 {
log.Warning("resolver: no (valid) dns server found in config or system, falling back to global defaults")
module.Warning(
missingResolversErrorID,
"Using Factory Default DNS Servers",
"The Portmaster could not find any (valid) DNS servers in the settings or system. In order to prevent being disconnected, the factory defaults are being used instead.",
)
// load defaults directly, overriding config system
newResolvers = getConfiguredResolvers(defaultNameServers)
if len(newResolvers) == 0 {
if len(newResolvers) > 0 {
log.Warning("resolver: no (valid) dns server found in config or system, falling back to global defaults")
module.Warning(
missingResolversErrorID,
"Using Factory Default DNS Servers",
"The Portmaster could not find any (valid) DNS servers in the settings or system. In order to prevent being disconnected, the factory defaults are being used instead. If you just switched your network, this should be resolved shortly.",
)
} else {
log.Critical("resolver: no (valid) dns server found in config, system or global defaults")
module.Error(
missingResolversErrorID,
"No DNS Server Configured",
"The Portmaster could not find any (valid) DNS servers in the settings or system. You will experience severe connectivity problems until resolved.",
"No DNS Servers Configured",
"The Portmaster could not find any (valid) DNS servers in the settings or system. You will experience severe connectivity problems until resolved. If you just switched your network, this should be resolved shortly.",
)
}
}
@@ -585,3 +591,25 @@ func ForceResolverReconnect(ctx context.Context) {
}
tracer.Info("resolver: all active resolvers were forced to reconnect")
}
// allConfiguredResolversAreFailing reports whether all configured resolvers are failing.
// Return false if there are no configured resolvers.
func allConfiguredResolversAreFailing() bool {
resolversLock.RLock()
defer resolversLock.RUnlock()
// If there are no configured resolvers, return as not failing.
if len(currentResolverConfig) == 0 {
return false
}
// Return as not failing, if we can find any non-failing configured resolver.
for _, resolver := range globalResolvers {
if !resolver.Conn.IsFailing() && resolver.Info.Source == ServerSourceConfigured {
// We found a non-failing configured resolver.
return false
}
}
return true
}