mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-26 06:55:48 +03:00
c47509fabc
Updates #1453. Squashed commit of the following: commit f08f68ef5493dad03d3eb120d886f2df1af28be6 Merge: b70b088af54aee2272
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Aug 8 19:04:06 2023 +0300 Merge branch 'master' into 1453-stats-tests commit b70b088af0fdc7d6d048d688160048bad1fceb12 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Aug 3 19:32:04 2023 +0300 stats: imp code commit c341012ba61894c255c1868624be1cac0d26a6fa Merge: a2ac8c34e5eb3cd0f9
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Aug 3 13:36:24 2023 +0300 Merge branch 'master' into 1453-stats-tests commit a2ac8c34ee32606ca5e259c3e2a47db0dd5858de Author: Ildar Kamalov <ik@adguard.com> Date: Thu Aug 3 13:25:12 2023 +0300 client: add top upstreams and average processing time tables commit 11118947f9bf945be0b056f8475cf3b848c6e66e Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Aug 1 17:24:57 2023 +0300 stats: imp docs commit 904cf81d02a1f327b9647fa7ad9e181cfabb68a4 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Jul 31 17:34:06 2023 +0300 stats: imp code commit 34f0c96dd5865d1470385322a88842dd0b3d996d Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Jul 31 15:43:46 2023 +0300 all: imp docs commit 2cb2d0d8bef3580f64bc25c414fe9b5ea6b9f997 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jul 28 17:24:31 2023 +0300 all: imp code commit 5251a899fecc21e50a0ba06042f96f5b404e196a Merge: b6c2b12d4300821a7f
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jul 27 20:34:39 2023 +0300 Merge branch 'master' into 1453-stats-tests commit b6c2b12d4425012efd73549c3a426735f3a677cd Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jul 27 20:32:18 2023 +0300 stats: imp code commit 5546b82a78326f9cc6d8c87df5083f8fc66a0178 Merge: 8a3d6b1b45f8fa006c
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jul 27 14:24:01 2023 +0300 Merge branch 'master' into 1453-stats-tests commit 8a3d6b1b49ce189f95adfa7406a34108e885e676 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jul 27 14:17:47 2023 +0300 all: imp code commit 2a48001e275e3cdcf70e13e1c9cebd4e502f3259 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Jul 25 18:27:20 2023 +0300 all: imp docs commit 3dd21890175af32a3368378f7e013383f6d040ec Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Jul 25 16:00:39 2023 +0300 all: imp naming commit 6124456fc3149b71f6bd58d35ecf24eb6cf40d5d Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jul 20 16:15:56 2023 +0300 all: add upstreams avg processing time commit 187ad0c77a81c9fd95c24e23141355db2e83e50d Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Jul 18 16:42:19 2023 +0300 all: add top upstreams
238 lines
7 KiB
Go
238 lines
7 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"net"
|
|
"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/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 net.Addr
|
|
clientID string
|
|
wantLogProto querylog.ClientProto
|
|
wantStatClient string
|
|
wantCode resultCode
|
|
reason filtering.Reason
|
|
wantStatResult stats.Result
|
|
}{{
|
|
name: "success_udp",
|
|
domain: domain,
|
|
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: filtering.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_tls_clientid",
|
|
domain: domain,
|
|
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: filtering.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_tls",
|
|
domain: domain,
|
|
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: filtering.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_quic",
|
|
domain: domain,
|
|
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: filtering.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_https",
|
|
domain: domain,
|
|
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: filtering.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_dnscrypt",
|
|
domain: domain,
|
|
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: filtering.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_udp_filtered",
|
|
domain: domain,
|
|
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: filtering.FilteredBlockList,
|
|
wantStatResult: stats.RFiltered,
|
|
}, {
|
|
name: "success_udp_sb",
|
|
domain: domain,
|
|
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: filtering.FilteredSafeBrowsing,
|
|
wantStatResult: stats.RSafeBrowsing,
|
|
}, {
|
|
name: "success_udp_ss",
|
|
domain: domain,
|
|
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: filtering.FilteredSafeSearch,
|
|
wantStatResult: stats.RSafeSearch,
|
|
}, {
|
|
name: "success_udp_pc",
|
|
domain: domain,
|
|
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: filtering.FilteredParental,
|
|
wantStatResult: stats.RParental,
|
|
}, {
|
|
name: "success_udp_pc_empty_fqdn",
|
|
domain: ".",
|
|
proto: proxy.ProtoUDP,
|
|
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 5}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: "",
|
|
wantStatClient: "1.2.3.5",
|
|
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{
|
|
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)
|
|
})
|
|
}
|
|
}
|