dnsforward: fix disallowed domains case matching

AdguardTeam · May 11, 2021 · cdd1de6 · cdd1de6
1 parent e27525e
commit cdd1de6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,12 @@ and this project adheres to
 ## [v0.106.3] - 2021-05-17 (APPROX.)
 -->
 
+### Fixed
+
+- Disallowed domains are now case-insesitive ([#3115]).
+
+[#3115]: https://github.com/AdguardTeam/AdGuardHome/issues/3115
+
 
 
 ## [v0.106.2] - 2021-05-06

diff --git a/internal/dnsforward/access.go b/internal/dnsforward/access.go
@@ -47,7 +47,7 @@ func newAccessCtx(allowedClients, disallowedClients, blockedHosts []string) (a *
 
 	b := &strings.Builder{}
 	for _, s := range blockedHosts {
-		aghstrings.WriteToBuilder(b, s, "\n")
+		aghstrings.WriteToBuilder(b, strings.ToLower(s), "\n")
 	}
 
 	listArray := []filterlist.RuleList{}

diff --git a/internal/dnsforward/filter.go b/internal/dnsforward/filter.go
@@ -20,7 +20,11 @@ func (s *Server) beforeRequestHandler(_ *proxy.Proxy, d *proxy.DNSContext) (bool
 	}
 
 	if len(d.Req.Question) == 1 {
-		host := strings.TrimSuffix(d.Req.Question[0].Name, ".")
+		// It's bringed to the lowercase here since this handler is
+		// called before any other one.
+		name := strings.ToLower(d.Req.Question[0].Name)
+		d.Req.Question[0].Name = name
+		host := strings.TrimSuffix(name, ".")
 		if s.access.IsBlockedDomain(host) {
 			log.Tracef("Domain %s is blocked by settings", host)
 			return false, nil