daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rewrite: tests subdomains matching

Browse Source
This commit is contained in:
Dimitry Kolyshev
2022-12-23 13:26:29 +07:00
parent 9efc381224
commit c5fb7e6b0d
1 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
internal/filtering/rewrite/storage_test.go
View File

@@ -164,17 +164,21 @@ func TestDefaultStorage_MatchRequest(t *testing.T) {
RRType: dns.TypeA, RRType: dns.TypeA,
}}, }},
dtyp: dns.TypeA, dtyp: dns.TypeA,
//}, { }, {
// TODO(d.kolyshev): This is about matching in urlfilter. name: "wildcard_override",
// name: "wildcard_override", host: "a.host.com",
// host: "a.host.com", wantDNSRewrites: []*rules.DNSRewrite{{
// wantDNSRewrites: []*rules.DNSRewrite{{ Value: net.IP{1, 2, 3, 4}.To16(),
// Value: net.IP{1, 2, 3, 4}.To16(), NewCNAME: "",
// NewCNAME: "", RCode: dns.RcodeSuccess,
// RCode: dns.RcodeSuccess, RRType: dns.TypeA,
// RRType: dns.TypeA, }, {
// }}, Value: net.IP{1, 2, 3, 5}.To16(),
// dtyp: dns.TypeA, NewCNAME: "",
RCode: dns.RcodeSuccess,
RRType: dns.TypeA,
}},
dtyp: dns.TypeA,
}, { }, {
name: "wildcard_cname_interaction", name: "wildcard_cname_interaction",
host: "www.host2.com", host: "www.host2.com",
@@ -320,17 +324,21 @@ func TestDefaultStorage_MatchRequest_Levels(t *testing.T) {
RRType: dns.TypeA, RRType: dns.TypeA,
}}, }},
dtyp: dns.TypeA, dtyp: dns.TypeA,
//}, { }, {
// TODO(d.kolyshev): This is about matching in urlfilter. name: "l3_match",
// name: "l3_match", host: "my.sub.host.com",
// host: "my.sub.host.com", wantDNSRewrites: []*rules.DNSRewrite{{
// wantDNSRewrites: []*rules.DNSRewrite{{ Value: net.IP{3, 3, 3, 3}.To16(),
// Value: net.IP{3, 3, 3, 3}.To16(), NewCNAME: "",
// NewCNAME: "", RCode: dns.RcodeSuccess,
// RCode: dns.RcodeSuccess, RRType: dns.TypeA,
// RRType: dns.TypeA, }, {
// }}, Value: net.IP{2, 2, 2, 2}.To16(),
// dtyp: dns.TypeA, NewCNAME: "",
RCode: dns.RcodeSuccess,
RRType: dns.TypeA,
}},
dtyp: dns.TypeA,
}} }}
for _, tc := range testCases { for _, tc := range testCases {
@@ -355,7 +363,7 @@ func TestDefaultStorage_MatchRequest_ExceptionCNAME(t *testing.T) {
Answer: "sub.host.com", Answer: "sub.host.com",
}, { }, {
Domain: "*.sub.host.com", Domain: "*.sub.host.com",
Answer: "*.sub.host.com", Answer: "sub.host.com",
}} }}
s, err := NewDefaultStorage(-1, items) s, err := NewDefaultStorage(-1, items)
@@ -381,12 +389,11 @@ func TestDefaultStorage_MatchRequest_ExceptionCNAME(t *testing.T) {
host: "sub.host.com", host: "sub.host.com",
wantDNSRewrites: nil, wantDNSRewrites: nil,
dtyp: dns.TypeA, dtyp: dns.TypeA,
//}, { }, {
// TODO(d.kolyshev): This is about matching in urlfilter. name: "exception_wildcard",
// name: "exception_wildcard", host: "my.sub.host.com",
// host: "my.sub.host.com", wantDNSRewrites: nil,
// wantDNSRewrites: nil, dtyp: dns.TypeA,
// dtyp: dns.TypeA,
}} }}
for _, tc := range testCases { for _, tc := range testCases {