mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-25 22:45:46 +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
165 lines
3.5 KiB
Go
165 lines
3.5 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"net"
|
|
"testing"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
|
|
"github.com/AdguardTeam/urlfilter/rules"
|
|
"github.com/miekg/dns"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestGenAnswerHTTPS_andSVCB(t *testing.T) {
|
|
// Preconditions.
|
|
|
|
s := createTestServer(t, &filtering.Config{
|
|
BlockingMode: filtering.BlockingModeDefault,
|
|
}, ServerConfig{
|
|
Config: Config{
|
|
UpstreamMode: UpstreamModeLoadBalance,
|
|
EDNSClientSubnet: &EDNSClientSubnet{Enabled: false},
|
|
},
|
|
ServePlainDNS: true,
|
|
}, nil)
|
|
|
|
req := &dns.Msg{
|
|
Question: []dns.Question{{
|
|
Name: "abcd",
|
|
}},
|
|
}
|
|
|
|
// Constants and helper values.
|
|
|
|
const host = "example.com"
|
|
const prio = 32
|
|
|
|
ip4 := net.IPv4(127, 0, 0, 1)
|
|
ip6 := net.IP{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}
|
|
|
|
// Helper functions.
|
|
|
|
dnssvcb := func(key, value string) (svcb *rules.DNSSVCB) {
|
|
svcb = &rules.DNSSVCB{
|
|
Target: host,
|
|
Priority: prio,
|
|
}
|
|
|
|
if key == "" {
|
|
return svcb
|
|
}
|
|
|
|
svcb.Params = map[string]string{
|
|
key: value,
|
|
}
|
|
|
|
return svcb
|
|
}
|
|
|
|
wantsvcb := func(kv dns.SVCBKeyValue) (want *dns.SVCB) {
|
|
want = &dns.SVCB{
|
|
Hdr: s.hdr(req, dns.TypeSVCB),
|
|
Priority: prio,
|
|
Target: dns.Fqdn(host),
|
|
}
|
|
|
|
if kv == nil {
|
|
return want
|
|
}
|
|
|
|
want.Value = []dns.SVCBKeyValue{kv}
|
|
|
|
return want
|
|
}
|
|
|
|
// Tests.
|
|
|
|
testCases := []struct {
|
|
svcb *rules.DNSSVCB
|
|
want *dns.SVCB
|
|
name string
|
|
}{{
|
|
svcb: dnssvcb("", ""),
|
|
want: wantsvcb(nil),
|
|
name: "no_params",
|
|
}, {
|
|
svcb: dnssvcb("foo", "bar"),
|
|
want: wantsvcb(nil),
|
|
name: "invalid",
|
|
}, {
|
|
svcb: dnssvcb("alpn", "h3"),
|
|
want: wantsvcb(&dns.SVCBAlpn{Alpn: []string{"h3"}}),
|
|
name: "alpn",
|
|
}, {
|
|
svcb: dnssvcb("ech", "AAAA"),
|
|
want: wantsvcb(&dns.SVCBECHConfig{ECH: []byte{0, 0, 0}}),
|
|
name: "ech",
|
|
}, {
|
|
svcb: dnssvcb("echconfig", "AAAA"),
|
|
want: wantsvcb(&dns.SVCBECHConfig{ECH: []byte{0, 0, 0}}),
|
|
name: "ech_deprecated",
|
|
}, {
|
|
svcb: dnssvcb("echconfig", "%BAD%"),
|
|
want: wantsvcb(nil),
|
|
name: "ech_invalid",
|
|
}, {
|
|
svcb: dnssvcb("ipv4hint", "127.0.0.1"),
|
|
want: wantsvcb(&dns.SVCBIPv4Hint{Hint: []net.IP{ip4}}),
|
|
name: "ipv4hint",
|
|
}, {
|
|
svcb: dnssvcb("ipv4hint", "127.0.01"),
|
|
want: wantsvcb(nil),
|
|
name: "ipv4hint_invalid",
|
|
}, {
|
|
svcb: dnssvcb("ipv6hint", "::1"),
|
|
want: wantsvcb(&dns.SVCBIPv6Hint{Hint: []net.IP{ip6}}),
|
|
name: "ipv6hint",
|
|
}, {
|
|
svcb: dnssvcb("ipv6hint", ":::1"),
|
|
want: wantsvcb(nil),
|
|
name: "ipv6hint_invalid",
|
|
}, {
|
|
svcb: dnssvcb("mandatory", "alpn"),
|
|
want: wantsvcb(&dns.SVCBMandatory{Code: []dns.SVCBKey{dns.SVCB_ALPN}}),
|
|
name: "mandatory",
|
|
}, {
|
|
svcb: dnssvcb("mandatory", "alpnn"),
|
|
want: wantsvcb(nil),
|
|
name: "mandatory_invalid",
|
|
}, {
|
|
svcb: dnssvcb("no-default-alpn", ""),
|
|
want: wantsvcb(&dns.SVCBNoDefaultAlpn{}),
|
|
name: "no_default_alpn",
|
|
}, {
|
|
svcb: dnssvcb("dohpath", "/dns-query"),
|
|
want: wantsvcb(&dns.SVCBDoHPath{Template: "/dns-query"}),
|
|
name: "dohpath",
|
|
}, {
|
|
svcb: dnssvcb("port", "8080"),
|
|
want: wantsvcb(&dns.SVCBPort{Port: 8080}),
|
|
name: "port",
|
|
}, {
|
|
svcb: dnssvcb("port", "1005008080"),
|
|
want: wantsvcb(nil),
|
|
name: "bad_port",
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run("https", func(t *testing.T) {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
want := &dns.HTTPS{SVCB: *tc.want}
|
|
want.Hdr.Rrtype = dns.TypeHTTPS
|
|
|
|
got := s.genAnswerHTTPS(req, tc.svcb)
|
|
assert.Equal(t, want, got)
|
|
})
|
|
})
|
|
|
|
t.Run("svcb", func(t *testing.T) {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
got := s.genAnswerSVCB(req, tc.svcb)
|
|
assert.Equal(t, tc.want, got)
|
|
})
|
|
})
|
|
}
|
|
}
|