daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rewrite: imp code

Browse Source
This commit is contained in:
Dimitry Kolyshev
2022-12-19 12:50:00 +07:00
parent 12f52f07c5
commit 299371e0fd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/filtering/rewrite/storage.go
View File

@@ -84,7 +84,7 @@ func (s *DefaultStorage) MatchRequest(dReq *urlfilter.DNSRequest) (rws []*rules.
return nil return nil
} }
// TODO(a.garipov): Check cnames for cycles on initialisation. // TODO(a.garipov): Check cnames for cycles on initialization.
cnames := stringutil.NewSet() cnames := stringutil.NewSet()
host := dReq.Hostname host := dReq.Hostname
var lastCNAMERule *rules.NetworkRule var lastCNAMERule *rules.NetworkRule
@@ -96,8 +96,9 @@ func (s *DefaultStorage) MatchRequest(dReq *urlfilter.DNSRequest) (rws []*rules.
log.Debug("rewrite: cname for %s is %s", host, rwAns) log.Debug("rewrite: cname for %s is %s", host, rwAns)
if dReq.Hostname == rwAns { if dReq.Hostname == rwAns {
// A request for the hostname itself is an exception lastCNAMERule. // A request for the hostname itself.
// TODO(d.kolyshev): Check rewrite of a pattern onto itself. // TODO(d.kolyshev): Check rewrite of a pattern onto itself.
log.Debug("rewrite: request for hostname itself for %q", dReq.Hostname)
return nil return nil
} }
@@ -106,6 +107,7 @@ func (s *DefaultStorage) MatchRequest(dReq *urlfilter.DNSRequest) (rws []*rules.
// An "*.example.com → sub.example.com" rewrite matching in a loop. // An "*.example.com → sub.example.com" rewrite matching in a loop.
// //
// See https://github.com/AdguardTeam/AdGuardHome/issues/4016. // See https://github.com/AdguardTeam/AdGuardHome/issues/4016.
log.Debug("rewrite: cname wildcard loop for %q on %q", dReq.Hostname, rwAns)
return []*rules.DNSRewrite{lastDNSRewrite} return []*rules.DNSRewrite{lastDNSRewrite}
} }