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

Improve resilience and logging in resolver and nameserver

Browse Source
This commit is contained in:
Daniel
2020-08-17 22:17:48 +02:00
parent 633bb34288
commit 39aa3d0879
3 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
resolver/rrcache.go
View File

@@ -7,6 +7,7 @@ import (
"sync"
"time"
"github.com/safing/portbase/log"
"github.com/safing/portmaster/netenv"
"github.com/miekg/dns"
@@ -163,22 +164,13 @@ func GetRRCache(domain string, question dns.Type) (*RRCache, error) {
rrCache.TTL = nameRecord.TTL
for _, entry := range nameRecord.Answer {
rr, err := dns.NewRR(entry)
if err == nil {
rrCache.Answer = append(rrCache.Answer, rr)
}
rrCache.Answer = parseRR(rrCache.Answer, entry)
}
for _, entry := range nameRecord.Ns {
rr, err := dns.NewRR(entry)
if err == nil {
rrCache.Ns = append(rrCache.Ns, rr)
}
rrCache.Ns = parseRR(rrCache.Ns, entry)
}
for _, entry := range nameRecord.Extra {
rr, err := dns.NewRR(entry)
if err == nil {
rrCache.Extra = append(rrCache.Extra, rr)
}
rrCache.Extra = parseRR(rrCache.Extra, entry)
}
rrCache.Server = nameRecord.Server
@@ -187,6 +179,19 @@ func GetRRCache(domain string, question dns.Type) (*RRCache, error) {
return rrCache, nil
}
func parseRR(section []dns.RR, entry string) []dns.RR {
rr, err := dns.NewRR(entry)
switch {
case err != nil:
log.Warningf("resolver: failed to parse cached record %q: %s", entry, err)
case rr == nil:
log.Warningf("resolver: failed to parse cached record %q: resulted in nil record", entry)
default:
return append(section, rr)
}
return section
}
// ServedFromCache marks the RRCache as served from cache.
func (rrCache *RRCache) ServedFromCache() bool {
return rrCache.servedFromCache