From 299371e0fddb353c4fd9cddec26872e5a3397cd5 Mon Sep 17 00:00:00 2001 From: Dimitry Kolyshev Date: Mon, 19 Dec 2022 12:50:00 +0700 Subject: [PATCH] rewrite: imp code --- internal/filtering/rewrite/storage.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/filtering/rewrite/storage.go b/internal/filtering/rewrite/storage.go index 5083102d..e9a2178c 100644 --- a/internal/filtering/rewrite/storage.go +++ b/internal/filtering/rewrite/storage.go @@ -84,7 +84,7 @@ func (s *DefaultStorage) MatchRequest(dReq *urlfilter.DNSRequest) (rws []*rules. return nil } - // TODO(a.garipov): Check cnames for cycles on initialisation. + // TODO(a.garipov): Check cnames for cycles on initialization. cnames := stringutil.NewSet() host := dReq.Hostname 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) 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. + log.Debug("rewrite: request for hostname itself for %q", dReq.Hostname) 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. // // 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} }