mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-29 10:28:53 +03:00
1511fabeec
Squashed commit of the following: commit afb5a0d8a499bccf7761baea40910f39c92b8a20 Merge: 09ac43c85abf20c6de
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 25 12:55:45 2023 +0200 Merge remote-tracking branch 'origin/master' into conf-ups-mode commit 09ac43c859ef8cbd3bb0488d1a945589cd59ca19 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 22 14:36:07 2023 +0200 openapi: imp docs commit d0fbd4349e4bddde73c6e92f75854acfc481ac0d Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 22 11:47:10 2023 +0200 all: changelog commit 105f9c50738733b0736a768fb9ee09d2e7fbf42e Merge: 62a2cf12d4bc5c346a
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 22 11:27:21 2023 +0200 Merge remote-tracking branch 'origin/master' into conf-ups-mode # Conflicts: # openapi/CHANGELOG.md commit 62a2cf12df694611888e840a5041a9c517cdfddb Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 22 10:52:59 2023 +0200 openapi: imp docs commit 87956c49240da44b216489920feff69996e3502b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 21 12:08:07 2023 +0200 dnsforward: imp code commit bf74d67ad112735d557be3d8fac75964cd99e375 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Dec 20 15:46:38 2023 +0200 dnsforward: imp code commit 3a98dee88809a25118a14a1f07eeecbfccb14cd9 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Dec 20 15:41:06 2023 +0200 dnsforward: imp code commit 1499da1fa0319ac3ad914171e807446f2c4d2fdb Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Dec 20 13:36:28 2023 +0200 dnsforward: imp code commit 228c61a5a0f73cc13655cef8bdaa1995b3f7fced Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Dec 20 13:06:11 2023 +0200 dnsforward: imp code commit 069ee22c6d904db4e983135ce87a9fe8d12b7e9a Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Dec 19 12:39:25 2023 +0200 dnsforward: imp code commit 90919f99a975862dcb07ac82fb740e4404e48bae Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Dec 19 12:10:43 2023 +0200 confmigrate: fix commit a8c329950423b59098d1f2b16d1da7100dd54f8d Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Dec 19 12:08:05 2023 +0200 dnsforward: imp code commit 58b53ccd97d353fab0df29f13425b5e341c8fdeb Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 18 15:10:01 2023 +0200 all: conf upstream mode
311 lines
7.6 KiB
Go
311 lines
7.6 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"net"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
|
|
"github.com/AdguardTeam/dnsproxy/proxy"
|
|
"github.com/AdguardTeam/dnsproxy/upstream"
|
|
"github.com/AdguardTeam/golibs/netutil"
|
|
"github.com/AdguardTeam/golibs/testutil"
|
|
"github.com/miekg/dns"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
// maxDNS64SynTTL is the maximum TTL for synthesized DNS64 responses with no SOA
|
|
// records in seconds.
|
|
//
|
|
// If the SOA RR was not delivered with the negative response to the AAAA query,
|
|
// then the DNS64 SHOULD use the TTL of the original A RR or 600 seconds,
|
|
// whichever is shorter.
|
|
//
|
|
// See https://datatracker.ietf.org/doc/html/rfc6147#section-5.1.7.
|
|
const maxDNS64SynTTL uint32 = 600
|
|
|
|
// newRR is a helper that creates a new dns.RR with the given name, qtype, ttl
|
|
// and value. It fails the test if the qtype is not supported or the type of
|
|
// value doesn't match the qtype.
|
|
func newRR(t *testing.T, name string, qtype uint16, ttl uint32, val any) (rr dns.RR) {
|
|
t.Helper()
|
|
|
|
switch qtype {
|
|
case dns.TypeA:
|
|
rr = &dns.A{A: testutil.RequireTypeAssert[net.IP](t, val)}
|
|
case dns.TypeAAAA:
|
|
rr = &dns.AAAA{AAAA: testutil.RequireTypeAssert[net.IP](t, val)}
|
|
case dns.TypeCNAME:
|
|
rr = &dns.CNAME{Target: testutil.RequireTypeAssert[string](t, val)}
|
|
case dns.TypeSOA:
|
|
rr = &dns.SOA{
|
|
Ns: "ns." + name,
|
|
Mbox: "hostmaster." + name,
|
|
Serial: 1,
|
|
Refresh: 1,
|
|
Retry: 1,
|
|
Expire: 1,
|
|
Minttl: 1,
|
|
}
|
|
case dns.TypePTR:
|
|
rr = &dns.PTR{Ptr: testutil.RequireTypeAssert[string](t, val)}
|
|
default:
|
|
t.Fatalf("unsupported qtype: %d", qtype)
|
|
}
|
|
|
|
*rr.Header() = dns.RR_Header{
|
|
Name: name,
|
|
Rrtype: qtype,
|
|
Class: dns.ClassINET,
|
|
Ttl: ttl,
|
|
}
|
|
|
|
return rr
|
|
}
|
|
|
|
func TestServer_HandleDNSRequest_dns64(t *testing.T) {
|
|
const (
|
|
ipv4Domain = "ipv4.only."
|
|
ipv6Domain = "ipv6.only."
|
|
soaDomain = "ipv4.soa."
|
|
mappedDomain = "filterable.ipv6."
|
|
anotherDomain = "another.domain."
|
|
|
|
pointedDomain = "local1234.ipv4."
|
|
globDomain = "real1234.ipv4."
|
|
)
|
|
|
|
someIPv4 := net.IP{1, 2, 3, 4}
|
|
someIPv6 := net.IP{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}
|
|
mappedIPv6 := net.ParseIP("64:ff9b::102:304")
|
|
|
|
ptr64Domain, err := netutil.IPToReversedAddr(mappedIPv6)
|
|
require.NoError(t, err)
|
|
ptr64Domain = dns.Fqdn(ptr64Domain)
|
|
|
|
ptrGlobDomain, err := netutil.IPToReversedAddr(someIPv4)
|
|
require.NoError(t, err)
|
|
ptrGlobDomain = dns.Fqdn(ptrGlobDomain)
|
|
|
|
const (
|
|
sectionAnswer = iota
|
|
sectionAuthority
|
|
sectionAdditional
|
|
|
|
sectionsNum
|
|
)
|
|
|
|
// answerMap is a convenience alias for describing the upstream response for
|
|
// a given question type.
|
|
type answerMap = map[uint16][sectionsNum][]dns.RR
|
|
|
|
pt := testutil.PanicT{}
|
|
newUps := func(answers answerMap) (u upstream.Upstream) {
|
|
return aghtest.NewUpstreamMock(func(req *dns.Msg) (resp *dns.Msg, err error) {
|
|
q := req.Question[0]
|
|
require.Contains(pt, answers, q.Qtype)
|
|
|
|
answer := answers[q.Qtype]
|
|
|
|
resp = (&dns.Msg{}).SetReply(req)
|
|
resp.Answer = answer[sectionAnswer]
|
|
resp.Ns = answer[sectionAuthority]
|
|
resp.Extra = answer[sectionAdditional]
|
|
|
|
return resp, nil
|
|
})
|
|
}
|
|
|
|
testCases := []struct {
|
|
name string
|
|
qname string
|
|
upsAns answerMap
|
|
wantAns []dns.RR
|
|
qtype uint16
|
|
}{{
|
|
name: "simple_a",
|
|
qname: ipv4Domain,
|
|
upsAns: answerMap{
|
|
dns.TypeA: {
|
|
sectionAnswer: {newRR(t, ipv4Domain, dns.TypeA, 3600, someIPv4)},
|
|
},
|
|
dns.TypeAAAA: {},
|
|
},
|
|
wantAns: []dns.RR{&dns.A{
|
|
Hdr: dns.RR_Header{
|
|
Name: ipv4Domain,
|
|
Rrtype: dns.TypeA,
|
|
Class: dns.ClassINET,
|
|
Ttl: 3600,
|
|
Rdlength: 4,
|
|
},
|
|
A: someIPv4,
|
|
}},
|
|
qtype: dns.TypeA,
|
|
}, {
|
|
name: "simple_aaaa",
|
|
qname: ipv6Domain,
|
|
upsAns: answerMap{
|
|
dns.TypeA: {},
|
|
dns.TypeAAAA: {
|
|
sectionAnswer: {newRR(t, ipv6Domain, dns.TypeAAAA, 3600, someIPv6)},
|
|
},
|
|
},
|
|
wantAns: []dns.RR{&dns.AAAA{
|
|
Hdr: dns.RR_Header{
|
|
Name: ipv6Domain,
|
|
Rrtype: dns.TypeAAAA,
|
|
Class: dns.ClassINET,
|
|
Ttl: 3600,
|
|
Rdlength: 16,
|
|
},
|
|
AAAA: someIPv6,
|
|
}},
|
|
qtype: dns.TypeAAAA,
|
|
}, {
|
|
name: "actual_dns64",
|
|
qname: ipv4Domain,
|
|
upsAns: answerMap{
|
|
dns.TypeA: {
|
|
sectionAnswer: {newRR(t, ipv4Domain, dns.TypeA, 3600, someIPv4)},
|
|
},
|
|
dns.TypeAAAA: {},
|
|
},
|
|
wantAns: []dns.RR{&dns.AAAA{
|
|
Hdr: dns.RR_Header{
|
|
Name: ipv4Domain,
|
|
Rrtype: dns.TypeAAAA,
|
|
Class: dns.ClassINET,
|
|
Ttl: maxDNS64SynTTL,
|
|
Rdlength: 16,
|
|
},
|
|
AAAA: mappedIPv6,
|
|
}},
|
|
qtype: dns.TypeAAAA,
|
|
}, {
|
|
name: "actual_dns64_soattl",
|
|
qname: soaDomain,
|
|
upsAns: answerMap{
|
|
dns.TypeA: {
|
|
sectionAnswer: {newRR(t, soaDomain, dns.TypeA, 3600, someIPv4)},
|
|
},
|
|
dns.TypeAAAA: {
|
|
sectionAuthority: {newRR(t, soaDomain, dns.TypeSOA, maxDNS64SynTTL+50, nil)},
|
|
},
|
|
},
|
|
wantAns: []dns.RR{&dns.AAAA{
|
|
Hdr: dns.RR_Header{
|
|
Name: soaDomain,
|
|
Rrtype: dns.TypeAAAA,
|
|
Class: dns.ClassINET,
|
|
Ttl: maxDNS64SynTTL + 50,
|
|
Rdlength: 16,
|
|
},
|
|
AAAA: mappedIPv6,
|
|
}},
|
|
qtype: dns.TypeAAAA,
|
|
}, {
|
|
name: "filtered",
|
|
qname: mappedDomain,
|
|
upsAns: answerMap{
|
|
dns.TypeA: {},
|
|
dns.TypeAAAA: {
|
|
sectionAnswer: {
|
|
newRR(t, mappedDomain, dns.TypeAAAA, 3600, net.ParseIP("64:ff9b::506:708")),
|
|
newRR(t, mappedDomain, dns.TypeCNAME, 3600, anotherDomain),
|
|
},
|
|
},
|
|
},
|
|
wantAns: []dns.RR{&dns.CNAME{
|
|
Hdr: dns.RR_Header{
|
|
Name: mappedDomain,
|
|
Rrtype: dns.TypeCNAME,
|
|
Class: dns.ClassINET,
|
|
Ttl: 3600,
|
|
Rdlength: 16,
|
|
},
|
|
Target: anotherDomain,
|
|
}},
|
|
qtype: dns.TypeAAAA,
|
|
}, {
|
|
name: "ptr",
|
|
qname: ptr64Domain,
|
|
upsAns: nil,
|
|
wantAns: []dns.RR{&dns.PTR{
|
|
Hdr: dns.RR_Header{
|
|
Name: ptr64Domain,
|
|
Rrtype: dns.TypePTR,
|
|
Class: dns.ClassINET,
|
|
Ttl: 3600,
|
|
Rdlength: 16,
|
|
},
|
|
Ptr: pointedDomain,
|
|
}},
|
|
qtype: dns.TypePTR,
|
|
}, {
|
|
name: "ptr_glob",
|
|
qname: ptrGlobDomain,
|
|
upsAns: answerMap{
|
|
dns.TypePTR: {
|
|
sectionAnswer: {newRR(t, ptrGlobDomain, dns.TypePTR, 3600, globDomain)},
|
|
},
|
|
},
|
|
wantAns: []dns.RR{&dns.PTR{
|
|
Hdr: dns.RR_Header{
|
|
Name: ptrGlobDomain,
|
|
Rrtype: dns.TypePTR,
|
|
Class: dns.ClassINET,
|
|
Ttl: 3600,
|
|
Rdlength: 15,
|
|
},
|
|
Ptr: globDomain,
|
|
}},
|
|
qtype: dns.TypePTR,
|
|
}}
|
|
|
|
localRR := newRR(t, ptr64Domain, dns.TypePTR, 3600, pointedDomain)
|
|
localUps := aghtest.NewUpstreamMock(func(req *dns.Msg) (resp *dns.Msg, err error) {
|
|
require.Equal(pt, req.Question[0].Name, ptr64Domain)
|
|
resp = (&dns.Msg{}).SetReply(req)
|
|
resp.Answer = []dns.RR{localRR}
|
|
|
|
return resp, nil
|
|
})
|
|
|
|
client := &dns.Client{
|
|
Net: "tcp",
|
|
Timeout: 1 * time.Second,
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
// TODO(e.burkov): It seems [proxy.Proxy] isn't intended to be reused
|
|
// right after stop, due to a data race in [proxy.Proxy.Init] method
|
|
// when setting an OOB size. As a temporary workaround, recreate the
|
|
// whole server for each test case.
|
|
s := createTestServer(t, &filtering.Config{
|
|
BlockingMode: filtering.BlockingModeDefault,
|
|
}, ServerConfig{
|
|
UDPListenAddrs: []*net.UDPAddr{{}},
|
|
TCPListenAddrs: []*net.TCPAddr{{}},
|
|
UseDNS64: true,
|
|
Config: Config{
|
|
UpstreamMode: UpstreamModeLoadBalance,
|
|
EDNSClientSubnet: &EDNSClientSubnet{Enabled: false},
|
|
},
|
|
ServePlainDNS: true,
|
|
}, localUps)
|
|
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{newUps(tc.upsAns)}
|
|
startDeferStop(t, s)
|
|
|
|
req := (&dns.Msg{}).SetQuestion(tc.qname, tc.qtype)
|
|
|
|
resp, _, excErr := client.Exchange(req, s.dnsProxy.Addr(proxy.ProtoTCP).String())
|
|
require.NoError(t, excErr)
|
|
|
|
require.Equal(t, tc.wantAns, resp.Answer)
|
|
})
|
|
}
|
|
}
|