dfdbfee4fd
Merge in DNS/adguard-home from 2639-testify-require-4 to master Closes #2639. Squashed commit of the following: commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9 Merge: 0e9e9ed12c9992e0
Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Mar 11 15:47:21 2021 +0300 Merge branch 'master' into 2639-testify-require-4 commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 10 12:43:15 2021 +0300 home: rm deletion error check commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353 Merge: c8ebe5418811c881
Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 10 12:30:07 2021 +0300 Merge branch 'master' into 2639-testify-require-4 commit c8ebe54142bba780226f76ddb72e33664ed28f30 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 10 12:28:43 2021 +0300 home: imp tests commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Mar 5 14:06:41 2021 +0300 dnsforward: imp tests commit 4528246105ed06471a8778abbe8e5c30fc5483d5 Merge: 54b08d9c90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Mar 4 18:17:52 2021 +0300 Merge branch 'master' into 2639-testify-require-4 commit 54b08d9c980b8d69d019a1a1b3931aa048275691 Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Feb 11 13:17:05 2021 +0300 dnsfilter: imp tests
200 lines
5.9 KiB
Go
200 lines
5.9 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"net"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/querylog"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/stats"
|
|
"github.com/AdguardTeam/dnsproxy/proxy"
|
|
"github.com/AdguardTeam/dnsproxy/upstream"
|
|
"github.com/miekg/dns"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
// testQueryLog is a simple querylog.QueryLog implementation for tests.
|
|
type testQueryLog struct {
|
|
// QueryLog is embedded here simply to make testQueryLog
|
|
// a querylog.QueryLog without acctually implementing all methods.
|
|
querylog.QueryLog
|
|
|
|
lastParams querylog.AddParams
|
|
}
|
|
|
|
// Add implements the querylog.QueryLog interface for *testQueryLog.
|
|
func (l *testQueryLog) Add(p querylog.AddParams) {
|
|
l.lastParams = p
|
|
}
|
|
|
|
// testStats is a simple stats.Stats implementation for tests.
|
|
type testStats struct {
|
|
// Stats is embedded here simply to make testStats a stats.Stats without
|
|
// acctually implementing all methods.
|
|
stats.Stats
|
|
|
|
lastEntry stats.Entry
|
|
}
|
|
|
|
// Update implements the stats.Stats interface for *testStats.
|
|
func (l *testStats) Update(e stats.Entry) {
|
|
l.lastEntry = e
|
|
}
|
|
|
|
func TestProcessQueryLogsAndStats(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
proto string
|
|
addr net.Addr
|
|
clientID string
|
|
wantLogProto querylog.ClientProto
|
|
wantStatClient string
|
|
wantCode resultCode
|
|
reason dnsfilter.Reason
|
|
wantStatResult stats.Result
|
|
}{{
|
|
name: "success_udp",
|
|
proto: proxy.ProtoUDP,
|
|
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: "",
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_tls_client_id",
|
|
proto: proxy.ProtoTLS,
|
|
addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "cli42",
|
|
wantLogProto: querylog.ClientProtoDOT,
|
|
wantStatClient: "cli42",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_tls",
|
|
proto: proxy.ProtoTLS,
|
|
addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: querylog.ClientProtoDOT,
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_quic",
|
|
proto: proxy.ProtoQUIC,
|
|
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: querylog.ClientProtoDOQ,
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_https",
|
|
proto: proxy.ProtoHTTPS,
|
|
addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: querylog.ClientProtoDOH,
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_dnscrypt",
|
|
proto: proxy.ProtoDNSCrypt,
|
|
addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: querylog.ClientProtoDNSCrypt,
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_udp_filtered",
|
|
proto: proxy.ProtoUDP,
|
|
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: "",
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.FilteredBlockList,
|
|
wantStatResult: stats.RFiltered,
|
|
}, {
|
|
name: "success_udp_sb",
|
|
proto: proxy.ProtoUDP,
|
|
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: "",
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.FilteredSafeBrowsing,
|
|
wantStatResult: stats.RSafeBrowsing,
|
|
}, {
|
|
name: "success_udp_ss",
|
|
proto: proxy.ProtoUDP,
|
|
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: "",
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.FilteredSafeSearch,
|
|
wantStatResult: stats.RSafeSearch,
|
|
}, {
|
|
name: "success_udp_pc",
|
|
proto: proxy.ProtoUDP,
|
|
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: "",
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.FilteredParental,
|
|
wantStatResult: stats.RParental,
|
|
}}
|
|
|
|
ups, err := upstream.AddressToUpstream("1.1.1.1", upstream.Options{})
|
|
require.Nil(t, err)
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
req := &dns.Msg{
|
|
Question: []dns.Question{{
|
|
Name: "example.com.",
|
|
}},
|
|
}
|
|
pctx := &proxy.DNSContext{
|
|
Proto: tc.proto,
|
|
Req: req,
|
|
Res: &dns.Msg{},
|
|
Addr: tc.addr,
|
|
Upstream: ups,
|
|
}
|
|
|
|
ql := &testQueryLog{}
|
|
st := &testStats{}
|
|
dctx := &dnsContext{
|
|
srv: &Server{
|
|
queryLog: ql,
|
|
stats: st,
|
|
},
|
|
proxyCtx: pctx,
|
|
startTime: time.Now(),
|
|
result: &dnsfilter.Result{
|
|
Reason: tc.reason,
|
|
},
|
|
clientID: tc.clientID,
|
|
}
|
|
|
|
code := processQueryLogsAndStats(dctx)
|
|
assert.Equal(t, tc.wantCode, code)
|
|
assert.Equal(t, tc.wantLogProto, ql.lastParams.ClientProto)
|
|
assert.Equal(t, tc.wantStatClient, st.lastEntry.Client)
|
|
assert.Equal(t, tc.wantStatResult, st.lastEntry.Result)
|
|
})
|
|
}
|
|
}
|