From e1f87ac8f47fec4ce49533e63845390837b6f10e Mon Sep 17 00:00:00 2001
From: Eugene Burkov <e.burkov@adguard.com>
Date: Wed, 4 Jun 2025 18:06:43 +0300
Subject: [PATCH] Pull request #2421: AGNDS-2949 Fix DHCP name resolve

Merge in DNS/adguard-home from AGNDS-2949-fix-dhcp-name-resolve to master

Squashed commit of the following:

commit f766313f391643cb80c97e6e7333c753614d6d8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Jun 3 17:39:19 2025 +0300

    dnsforward: fix test

commit a181c98df6ad4a2e5690c34288cb87c65c2c3f50
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Jun 2 17:37:38 2025 +0300

    dnsforward: add tests, imp docs

commit 81cee6f47a78d57b6cbeb6ff55b9601b3f84afd4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Jun 2 17:20:49 2025 +0300

    dnsforward: match whole subdomain for dhcp names
---
 CHANGELOG.md                                 |  2 +
 internal/dnsforward/process.go               |  2 +-
 internal/dnsforward/process_internal_test.go | 77 +++++++++++---------
 3 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d81ec51d..b87ea61c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,8 @@ NOTE: Add new changes BELOW THIS COMMENT.
 
 ### Fixed
 
+- The hostnames of DHCP clients with multiple labels not being recognized.
+
 - Status reported by the systemd service implementation in cases of auto-restart after a failed start.
 
 <!--
diff --git a/internal/dnsforward/process.go b/internal/dnsforward/process.go
index 405ccc70..623edff0 100644
--- a/internal/dnsforward/process.go
+++ b/internal/dnsforward/process.go
@@ -563,7 +563,7 @@ func (s *Server) dhcpHostFromRequest(q *dns.Question) (reqHost string) {
 	}
 
 	reqHost = strings.ToLower(q.Name[:len(q.Name)-1])
-	if !netutil.IsImmediateSubdomain(reqHost, s.localDomainSuffix) {
+	if !netutil.IsSubdomain(reqHost, s.localDomainSuffix) {
 		return ""
 	}
 
diff --git a/internal/dnsforward/process_internal_test.go b/internal/dnsforward/process_internal_test.go
index d2aeda09..71a91fdd 100644
--- a/internal/dnsforward/process_internal_test.go
+++ b/internal/dnsforward/process_internal_test.go
@@ -498,14 +498,28 @@ func TestServer_ProcessDHCPHosts_localRestriction(t *testing.T) {
 
 func TestServer_ProcessDHCPHosts(t *testing.T) {
 	const (
-		localTLD = "lan"
+		localTLD  = "lan"
+		customTLD = "custom"
 
-		knownClient  = "example"
-		externalHost = knownClient + ".com"
-		clientHost   = knownClient + "." + localTLD
+		oneLabelClient     = "example"
+		twoLabelClient     = "sub.example"
+		externalHost       = oneLabelClient + ".com"
+		oneLabelClientHost = oneLabelClient + "." + localTLD
+		twoLabelClientHost = twoLabelClient + "." + localTLD
 	)
 
-	knownIP := netip.MustParseAddr("1.2.3.4")
+	knownClients := map[string]netip.Addr{
+		oneLabelClient: netip.MustParseAddr("1.2.3.4"),
+		twoLabelClient: netip.MustParseAddr("1.2.3.5"),
+	}
+
+	testDHCP := &testDHCP{
+		OnEnabled: func() (ok bool) { return true },
+		OnIPByHost: func(host string) (ip netip.Addr) {
+			return knownClients[host]
+		},
+		OnHostByIP: func(ip netip.Addr) (host string) { panic("not implemented") },
+	}
 
 	testCases := []struct {
 		wantIP  netip.Addr
@@ -529,9 +543,16 @@ func TestServer_ProcessDHCPHosts(t *testing.T) {
 		wantRes: resultCodeSuccess,
 		qtyp:    dns.TypeCNAME,
 	}, {
-		wantIP:  knownIP,
+		wantIP:  knownClients[oneLabelClient],
 		name:    "internal",
-		host:    clientHost,
+		host:    oneLabelClientHost,
+		suffix:  localTLD,
+		wantRes: resultCodeSuccess,
+		qtyp:    dns.TypeA,
+	}, {
+		wantIP:  knownClients[twoLabelClient],
+		name:    "internal_two_label",
+		host:    twoLabelClientHost,
 		suffix:  localTLD,
 		wantRes: resultCodeSuccess,
 		qtyp:    dns.TypeA,
@@ -545,32 +566,27 @@ func TestServer_ProcessDHCPHosts(t *testing.T) {
 	}, {
 		wantIP:  netip.Addr{},
 		name:    "internal_aaaa",
-		host:    clientHost,
+		host:    oneLabelClientHost,
 		suffix:  localTLD,
 		wantRes: resultCodeSuccess,
 		qtyp:    dns.TypeAAAA,
 	}, {
-		wantIP:  knownIP,
+		wantIP:  knownClients[oneLabelClient],
 		name:    "custom_suffix",
-		host:    knownClient + ".custom",
-		suffix:  "custom",
+		host:    oneLabelClient + "." + customTLD,
+		suffix:  customTLD,
+		wantRes: resultCodeSuccess,
+		qtyp:    dns.TypeA,
+	}, {
+		wantIP:  knownClients[twoLabelClient],
+		name:    "custom_suffix_two_label",
+		host:    twoLabelClient + "." + customTLD,
+		suffix:  customTLD,
 		wantRes: resultCodeSuccess,
 		qtyp:    dns.TypeA,
 	}}
 
 	for _, tc := range testCases {
-		testDHCP := &testDHCP{
-			OnEnabled: func() (_ bool) { return true },
-			OnIPByHost: func(host string) (ip netip.Addr) {
-				if host == knownClient {
-					ip = knownIP
-				}
-
-				return ip
-			},
-			OnHostByIP: func(ip netip.Addr) (host string) { panic("not implemented") },
-		}
-
 		s := &Server{
 			dnsFilter:         createTestDNSFilter(t),
 			dhcpServer:        testDHCP,
@@ -578,16 +594,7 @@ func TestServer_ProcessDHCPHosts(t *testing.T) {
 			baseLogger:        slogutil.NewDiscardLogger(),
 		}
 
-		req := &dns.Msg{
-			MsgHdr: dns.MsgHdr{
-				Id: 1234,
-			},
-			Question: []dns.Question{{
-				Name:   dns.Fqdn(tc.host),
-				Qtype:  tc.qtyp,
-				Qclass: dns.ClassINET,
-			}},
-		}
+		req := (&dns.Msg{}).SetQuestion(dns.Fqdn(tc.host), tc.qtyp)
 
 		dctx := &dnsContext{
 			proxyCtx: &proxy.DNSContext{
@@ -603,8 +610,8 @@ func TestServer_ProcessDHCPHosts(t *testing.T) {
 			require.NoError(t, dctx.err)
 
 			if tc.qtyp == dns.TypeAAAA {
-				// TODO(a.garipov): Remove this special handling
-				// when we fully support AAAA.
+				// TODO(a.garipov): Remove this special handling when we fully
+				// support AAAA.
 				require.NotNil(t, pctx.Res)
 
 				ans := pctx.Res.Answer