mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-24 23:58:17 +03:00
c0a33ce708
Squashed commit of the following: commit 463811748fa5a1f52e084c782e94f268b00b3abc Merge: 3de62244e130560b10
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Jul 10 15:06:01 2024 +0300 Merge remote-tracking branch 'origin/master' into upd-dnsproxy commit 3de62244ee10fce9fb97c73c2955479883ce34eb Merge: e2de50bf9e269260fb
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Jul 10 09:13:40 2024 +0300 Merge remote-tracking branch 'origin/master' into upd-dnsproxy commit e2de50bf9cf4eddaa0d87c20c8c1605bf4630fce Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Jul 10 09:11:25 2024 +0300 home: todos commit58fe497eec
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Jul 9 13:29:19 2024 +0300 home: imp code commit4db7cdc0c4
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Jul 9 11:31:12 2024 +0300 all: imp code commit7e8d3b50e7
Merge:559c3b79d
9a6dd0dc5
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Jul 8 10:56:14 2024 +0300 Merge remote-tracking branch 'origin/master' into upd-dnsproxy commit559c3b79d7
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Jul 8 10:54:03 2024 +0300 dnsforward: imp code commitba4a7e1c70
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Jul 8 10:49:46 2024 +0300 aghos: imp code commitcdf9ccd371
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Jul 5 16:19:27 2024 +0300 all: partial revert slog logger usage commitf16cddbb8c
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Jul 5 13:01:37 2024 +0300 all: upd dnsproxy commit5932c8d102
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Jul 5 11:49:37 2024 +0300 dnsforward: slog logger commit3d7f734ac9
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Jul 5 11:05:14 2024 +0300 all: slog logger commit9a74d5d98b
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Jul 4 12:16:21 2024 +0300 all: upd dnsproxy commit537bdacec8
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Jul 4 12:10:30 2024 +0300 all: upd dnsproxy commit38e10dee48
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Jul 4 10:37:50 2024 +0300 dnsforward: upstream mode
240 lines
6.8 KiB
Go
240 lines
6.8 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"net/netip"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/querylog"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/stats"
|
|
"github.com/AdguardTeam/dnsproxy/proxy"
|
|
"github.com/AdguardTeam/dnsproxy/upstream"
|
|
"github.com/AdguardTeam/golibs/logutil/slogutil"
|
|
"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 actually 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
|
|
}
|
|
|
|
// ShouldLog implements the [querylog.QueryLog] interface for *testQueryLog.
|
|
func (l *testQueryLog) ShouldLog(string, uint16, uint16, []string) bool {
|
|
return true
|
|
}
|
|
|
|
// testStats is a simple [stats.Interface] implementation for tests.
|
|
type testStats struct {
|
|
// Stats is embedded here simply to make testStats a [stats.Interface]
|
|
// without actually implementing all methods.
|
|
stats.Interface
|
|
|
|
lastEntry *stats.Entry
|
|
}
|
|
|
|
// Update implements the [stats.Interface] interface for *testStats.
|
|
func (l *testStats) Update(e *stats.Entry) {
|
|
if e.Domain == "" {
|
|
return
|
|
}
|
|
|
|
l.lastEntry = e
|
|
}
|
|
|
|
// ShouldCount implements the [stats.Interface] interface for *testStats.
|
|
func (l *testStats) ShouldCount(string, uint16, uint16, []string) bool {
|
|
return true
|
|
}
|
|
|
|
func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
|
|
const domain = "example.com."
|
|
|
|
testCases := []struct {
|
|
name string
|
|
domain string
|
|
proto proxy.Proto
|
|
addr netip.AddrPort
|
|
clientID string
|
|
wantLogProto querylog.ClientProto
|
|
wantStatClient string
|
|
wantCode resultCode
|
|
reason filtering.Reason
|
|
wantStatResult stats.Result
|
|
}{{
|
|
name: "success_udp",
|
|
domain: domain,
|
|
proto: proxy.ProtoUDP,
|
|
addr: testClientAddrPort,
|
|
clientID: "",
|
|
wantLogProto: "",
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: filtering.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_tls_clientid",
|
|
domain: domain,
|
|
proto: proxy.ProtoTLS,
|
|
addr: testClientAddrPort,
|
|
clientID: "cli42",
|
|
wantLogProto: querylog.ClientProtoDoT,
|
|
wantStatClient: "cli42",
|
|
wantCode: resultCodeSuccess,
|
|
reason: filtering.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_tls",
|
|
domain: domain,
|
|
proto: proxy.ProtoTLS,
|
|
addr: testClientAddrPort,
|
|
clientID: "",
|
|
wantLogProto: querylog.ClientProtoDoT,
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: filtering.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_quic",
|
|
domain: domain,
|
|
proto: proxy.ProtoQUIC,
|
|
addr: testClientAddrPort,
|
|
clientID: "",
|
|
wantLogProto: querylog.ClientProtoDoQ,
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: filtering.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_https",
|
|
domain: domain,
|
|
proto: proxy.ProtoHTTPS,
|
|
addr: testClientAddrPort,
|
|
clientID: "",
|
|
wantLogProto: querylog.ClientProtoDoH,
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: filtering.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_dnscrypt",
|
|
domain: domain,
|
|
proto: proxy.ProtoDNSCrypt,
|
|
addr: testClientAddrPort,
|
|
clientID: "",
|
|
wantLogProto: querylog.ClientProtoDNSCrypt,
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: filtering.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_udp_filtered",
|
|
domain: domain,
|
|
proto: proxy.ProtoUDP,
|
|
addr: testClientAddrPort,
|
|
clientID: "",
|
|
wantLogProto: "",
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: filtering.FilteredBlockList,
|
|
wantStatResult: stats.RFiltered,
|
|
}, {
|
|
name: "success_udp_sb",
|
|
domain: domain,
|
|
proto: proxy.ProtoUDP,
|
|
addr: testClientAddrPort,
|
|
clientID: "",
|
|
wantLogProto: "",
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: filtering.FilteredSafeBrowsing,
|
|
wantStatResult: stats.RSafeBrowsing,
|
|
}, {
|
|
name: "success_udp_ss",
|
|
domain: domain,
|
|
proto: proxy.ProtoUDP,
|
|
addr: testClientAddrPort,
|
|
clientID: "",
|
|
wantLogProto: "",
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: filtering.FilteredSafeSearch,
|
|
wantStatResult: stats.RSafeSearch,
|
|
}, {
|
|
name: "success_udp_pc",
|
|
domain: domain,
|
|
proto: proxy.ProtoUDP,
|
|
addr: testClientAddrPort,
|
|
clientID: "",
|
|
wantLogProto: "",
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: filtering.FilteredParental,
|
|
wantStatResult: stats.RParental,
|
|
}, {
|
|
name: "success_udp_pc_empty_fqdn",
|
|
domain: ".",
|
|
proto: proxy.ProtoUDP,
|
|
addr: netip.MustParseAddrPort("4.3.2.1:1234"),
|
|
clientID: "",
|
|
wantLogProto: "",
|
|
wantStatClient: "4.3.2.1",
|
|
wantCode: resultCodeSuccess,
|
|
reason: filtering.FilteredParental,
|
|
wantStatResult: stats.RParental,
|
|
}}
|
|
|
|
ups, err := upstream.AddressToUpstream("1.1.1.1", nil)
|
|
require.NoError(t, err)
|
|
|
|
for _, tc := range testCases {
|
|
ql := &testQueryLog{}
|
|
st := &testStats{}
|
|
srv := &Server{
|
|
logger: slogutil.NewDiscardLogger(),
|
|
queryLog: ql,
|
|
stats: st,
|
|
anonymizer: aghnet.NewIPMut(nil),
|
|
}
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
req := &dns.Msg{
|
|
Question: []dns.Question{{
|
|
Name: tc.domain,
|
|
}},
|
|
}
|
|
pctx := &proxy.DNSContext{
|
|
Proto: tc.proto,
|
|
Req: req,
|
|
Res: &dns.Msg{},
|
|
Addr: tc.addr,
|
|
Upstream: ups,
|
|
}
|
|
dctx := &dnsContext{
|
|
proxyCtx: pctx,
|
|
startTime: time.Now(),
|
|
result: &filtering.Result{
|
|
Reason: tc.reason,
|
|
},
|
|
clientID: tc.clientID,
|
|
}
|
|
|
|
code := srv.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)
|
|
})
|
|
}
|
|
}
|