mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-22 04:55:33 +03:00
143616ca6e
Merge in DNS/adguard-home from 4299-querylog-stats-api to master Updates #1717. Updates #4299. Squashed commit of the following: commit 5b706b7997a536bc4fd2c532fb89ca5ab3536848 Merge: 48b62b0f306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 22 13:53:09 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 48b62b0f1882f1ad120c6cdd90cd7dd8cb8a7738 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Wed Mar 22 12:25:04 2023 +0200 client: fix styles, add titles and descrs commit 97e31cff70d05b51bd0e5ea2d20e8e7a251a7e41 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Tue Mar 21 18:38:12 2023 +0200 client: add ignored domains for querylog commit 24d75c4376382205ae6b8f731b1cd23d517772c9 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Tue Mar 21 18:21:13 2023 +0200 client: add ignore domains for stats commit eefc3891d01f90af79fdac9ba8eea06d4d54a0bc Merge: 978675ea1daabb97
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 21 10:53:35 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 978675ea2c07bf248b4c8f26ebdf78cf59a12ef5 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 21 10:53:11 2023 +0300 openapi: fix chlog commit 2ed33007aade115d38b0ca582206cc10678b084c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 17:49:07 2023 +0300 home: fix tests commit 6af11520c164553ee9fce8f214ea169672188d7e Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 17:40:16 2023 +0300 home: fix typo commit 56acdfde5b1ee8d16b232c1293b91affbe319ad1 Merge: 319da34d48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 17:32:58 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 319da34de41ec84310b23bba2ad79c8a3a4c14ff Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Mar 3 17:34:38 2023 +0300 querylog: fix docs commit d5a8f24d5b336e7bdbbca18069f6ede8c96bcc2c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Mar 3 11:42:00 2023 +0300 stats: fix docs commit e0cbfc1c4078180a05835ce7587e9f45484adc81 Merge: 4743c810012e5beb
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 18:45:17 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 4743c81038052b9e0ca29ae5f1565021d36ca1ef Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 18:14:16 2023 +0300 all: imp code; fix time conversion commit 34310cffd7e331d098c535590245387051674fa8 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 12:34:11 2023 +0300 chlog: restore order commit cadd864a66655242948f1cb16e6d4945c0235d7e Merge: 2f3e25bebb226434
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 12:26:06 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 2f3e25bee56d2c6ddcf4aa2fc6a1dc51ed9b06e1 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 12:25:14 2023 +0300 all: fix fmt commit d54022baa6c8a3d0d3c308a9b6b1a6a9dc6ac7b6 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Feb 28 16:16:40 2023 +0300 all: imp code; fix chlog commit df22de91f59a51194c55e7bcbe5bc3fcc60cb8e3 Merge: e1ea4797a772212d
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Feb 27 17:24:09 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit e1ea4797af974c36f06683ffc6eaaae917921a43 Merge: d7db0a5abb80a7c2
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Feb 27 17:23:20 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit d7db0a5af1e1f49f6174c1c42e6d9306f2381d16 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Feb 27 17:12:20 2023 +0300 all: imp docs ... and 15 more commits
95 lines
1.9 KiB
Go
95 lines
1.9 KiB
Go
package querylog
|
|
|
|
import (
|
|
"net"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/golibs/timeutil"
|
|
"github.com/miekg/dns"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestQueryLog_Search_findClient(t *testing.T) {
|
|
const knownClientID = "client-1"
|
|
const knownClientName = "Known Client 1"
|
|
const unknownClientID = "client-2"
|
|
|
|
knownClient := &Client{
|
|
Name: knownClientName,
|
|
}
|
|
|
|
findClientCalls := 0
|
|
findClient := func(ids []string) (c *Client, _ error) {
|
|
defer func() { findClientCalls++ }()
|
|
|
|
if len(ids) == 0 {
|
|
return nil, nil
|
|
}
|
|
|
|
if ids[0] == knownClientID {
|
|
return knownClient, nil
|
|
}
|
|
|
|
return nil, nil
|
|
}
|
|
|
|
l, err := newQueryLog(Config{
|
|
FindClient: findClient,
|
|
BaseDir: t.TempDir(),
|
|
RotationIvl: timeutil.Day,
|
|
MemSize: 100,
|
|
Enabled: true,
|
|
FileEnabled: true,
|
|
AnonymizeClientIP: false,
|
|
})
|
|
require.NoError(t, err)
|
|
t.Cleanup(l.Close)
|
|
|
|
q := &dns.Msg{
|
|
Question: []dns.Question{{
|
|
Name: "example.com",
|
|
}},
|
|
}
|
|
|
|
l.Add(&AddParams{
|
|
Question: q,
|
|
ClientID: knownClientID,
|
|
ClientIP: net.IP{1, 2, 3, 4},
|
|
})
|
|
|
|
// Add the same thing again to test the cache.
|
|
l.Add(&AddParams{
|
|
Question: q,
|
|
ClientID: knownClientID,
|
|
ClientIP: net.IP{1, 2, 3, 4},
|
|
})
|
|
|
|
l.Add(&AddParams{
|
|
Question: q,
|
|
ClientID: unknownClientID,
|
|
ClientIP: net.IP{1, 2, 3, 5},
|
|
})
|
|
|
|
sp := &searchParams{
|
|
// Add some time to the "current" one to protect against
|
|
// low-resolution timers on some Windows machines.
|
|
//
|
|
// TODO(a.garipov): Use some kind of timeSource interface
|
|
// instead of relying on time.Now() in tests.
|
|
olderThan: time.Now().Add(10 * time.Second),
|
|
limit: 3,
|
|
}
|
|
entries, _ := l.search(sp)
|
|
assert.Equal(t, 2, findClientCalls)
|
|
|
|
require.Len(t, entries, 3)
|
|
|
|
assert.Nil(t, entries[0].client)
|
|
|
|
gotClient := entries[2].client
|
|
require.NotNil(t, gotClient)
|
|
|
|
assert.Equal(t, knownClientName, gotClient.Name)
|
|
}
|