7c35d208b1
Updates #1273. Squashed commit of the following: commit 55b78153b1b775c855e759011141bbbe6d4b962c Author: Artem Baskal <a.baskal@adguard.com> Date: Fri Apr 2 16:55:39 2021 +0300 Update client_info in case of null commit 5c80c1438ed9d961af11617831b704d6ae15cc34 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Apr 2 16:24:14 2021 +0300 querylog: always set client_info commit b48efd64d757cc0bcf5b34de22fdd0b0464d98a6 Merge: 4ed7eab523c9f528
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Apr 2 16:22:08 2021 +0300 Merge branch 'master' into 1273-querylog-client-name commit 4ed7eab52b6b5b0c0ddb5aa5a3225a62d1f9265b Merge: dbf990eb70d4c70e
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Apr 2 12:57:17 2021 +0300 Merge branch 'master' into 1273-querylog-client-name commit dbf990eb881116754554270e7b691b5db8e9ee34 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Apr 2 12:56:13 2021 +0300 home: imp names commit c2cfdef494ca26fff62b9fa008f1b389d9d4d46b Author: Artem Baskal <a.baskal@adguard.com> Date: Thu Apr 1 19:26:04 2021 +0300 Rename to whois commit e3cc4a68ee576770b1922680155308e33bed31e8 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Apr 1 19:03:42 2021 +0300 home: imp whois more commit 3b8ef8691c298aff35946b35923ef2e5b1f9bbbe Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Apr 1 18:51:14 2021 +0300 home: imp whois resp commit fb97e0d74976723a512d6ff4c69e830fe59c8df8 Author: Artem Baskal <a.baskal@adguard.com> Date: Thu Apr 1 18:00:03 2021 +0300 Fix client_info ids prop types commit 298005189e372651ceff453e88aca19ee925a138 Author: Artem Baskal <a.baskal@adguard.com> Date: Thu Apr 1 17:58:14 2021 +0300 Adapt changes on client commit aa1769f64197d865478a66271da483babfc5dfd0 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Apr 1 17:18:36 2021 +0300 all: add more fields to querylog client commit 4b2a2dbd380ec410f3068d15ea16430912e03e33 Merge: cda92c3f2e4e2f62
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Apr 1 16:57:26 2021 +0300 Merge branch 'master' into 1273-querylog-client-name commit cda92c3f0331cbac252f3163d31457f716bc7f2c Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Mar 29 18:03:51 2021 +0300 querylog: fix windows tests commit 5a56f0a32608869ed93a38f18f63ea3a20f7bde2 Merge: 627e4958e710ce11
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Mar 29 17:45:53 2021 +0300 Merge branch 'master' into 1273-querylog-client-name commit 627e495828e82d44cc77aa393536479f23cc68b7 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Mar 29 17:44:49 2021 +0300 querylog: add tests, imp code, docs commit 6dec468a2f0c29357875ff99458e0e8f8e580e6d Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Mar 26 16:10:47 2021 +0300 querylog: search clients by name, enrich http resp
96 lines
1.9 KiB
Go
96 lines
1.9 KiB
Go
package querylog
|
|
|
|
import (
|
|
"net"
|
|
"testing"
|
|
"time"
|
|
|
|
"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{
|
|
IDs: []string{knownClientID},
|
|
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 := newQueryLog(Config{
|
|
FindClient: findClient,
|
|
BaseDir: t.TempDir(),
|
|
RotationIvl: 1,
|
|
MemSize: 100,
|
|
Enabled: true,
|
|
FileEnabled: true,
|
|
AnonymizeClientIP: false,
|
|
})
|
|
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)
|
|
assert.Equal(t, []string{knownClientID}, gotClient.IDs)
|
|
}
|