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

Make saving IP and CNAMEs more defensive

Browse Source
This commit is contained in:
Daniel
2024-11-12 15:13:44 +01:00
committed by Vladimir Stoilov
parent 1ff6f34631
commit ed861d606b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
service/firewall/dns.go
View File

@@ -302,11 +302,11 @@ func UpdateIPsAndCNAMEs(q *resolver.Query, rrCache *resolver.RRCache, conn *netw
Expires: rrCache.Expires, Expires: rrCache.Expires,
} }
// Resolve all CNAMEs in the correct order and add the to the record. // Resolve all CNAMEs in the correct order and add the to the record - up to max 50 layers.
domain := q.FQDN domain := q.FQDN
for { for range 50 {
nextDomain, isCNAME := cnames[domain] nextDomain, isCNAME := cnames[domain]
if !isCNAME { if !isCNAME || nextDomain == domain {
break break
} }

2
service/nameserver/nameserver.go
View File

@@ -224,8 +224,8 @@ func handleRequest(ctx context.Context, w dns.ResponseWriter, request *dns.Msg)
} }
// Save the request as open, as we don't know if there will be a connection or not. // Save the request as open, as we don't know if there will be a connection or not.
network.SaveOpenDNSRequest(q, rrCache, conn)
firewall.UpdateIPsAndCNAMEs(q, rrCache, conn) firewall.UpdateIPsAndCNAMEs(q, rrCache, conn)
network.SaveOpenDNSRequest(q, rrCache, conn)
case network.VerdictUndeterminable: case network.VerdictUndeterminable:
fallthrough fallthrough