mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-24 08:44:27 +03:00
fc9ddcf941
Merge in DNS/adguard-home from 1383-client-id to master Updates #1383. Squashed commit of the following: commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:51:59 2021 +0300 - client: check if IP is valid commit 0c330585a170ea149ee75e43dfa65211e057299c Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:07:50 2021 +0300 - client: find clients by client_id commit 71c9593ee35d996846f061e114b7867c3aa3c978 Merge: 9104f1613e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 16:09:45 2021 +0300 Merge branch 'master' into 1383-client-id commit 9104f1615d2d462606c52017df25a422df872cea Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 13:28:50 2021 +0300 dnsforward: imp tests commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 12:39:52 2021 +0300 dnsforward: fix address commit 98b222ba69a5d265f620c180c960d01c84a1fb3b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:50:31 2021 +0300 home: imp code commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20 Merge: 199fdc05c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:45:13 2021 +0300 Merge branch 'master' into 1383-client-id commit 199fdc056f8a8be5500584f3aaee32865188aedc Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:20:37 2021 +0300 all: imp tests, logging, etc commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:55:19 2021 +0300 + client: remove block button from clients with client_id commit 32991a0b4c56583a02fb5e00bba95d96000bce20 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:54:25 2021 +0300 + client: add requests count for client_id commit 2d68df4d2eac4a296d7469923e601dad4575c1a1 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 15:49:50 2021 +0300 stats: handle client ids commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:45:25 2021 +0300 openapi: fix example commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:37:10 2021 +0300 openapi: improve clients find api docs commit f79876e550c424558b704bc316a4cd04f25db011 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:18:52 2021 +0300 home: accept ids in clients find commit 5b72595122aa0bd64debadfd753ed8a0e0840629 Merge: 607e241fabf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:34:56 2021 +0300 Merge branch 'master' into 1383-client-id commit 607e241f1c339dd6397218f70b8301e3de6a1ee0 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:30:39 2021 +0300 dnsforward: fix quic commit f046352fef93e46234c2bbe8ae316d21034260e5 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 16:53:09 2021 +0300 all: remove wildcard requirement commit 3b679489bae82c54177372be453fe184d8f0bab6 Author: Andrey Meshkov <am@adguard.com> Date: Mon Jan 25 16:02:28 2021 +0300 workDir now supports symlinks commit 0647ab4f113de2223f6949df001f42ecab05c995 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:59:46 2021 +0300 - client: remove wildcard from domain validation commit b1aec04a4ecadc9d65648ed6d284188fecce01c3 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:55:39 2021 +0300 + client: add form to download mobileconfig ... and 12 more commits
162 lines
3.4 KiB
Go
162 lines
3.4 KiB
Go
package stats
|
|
|
|
import (
|
|
"fmt"
|
|
"net"
|
|
"os"
|
|
"sync/atomic"
|
|
"testing"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/testutil"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestMain(m *testing.M) {
|
|
testutil.DiscardLogOutput(m)
|
|
}
|
|
|
|
func UIntArrayEquals(a, b []uint64) bool {
|
|
if len(a) != len(b) {
|
|
return false
|
|
}
|
|
|
|
for i := range a {
|
|
if a[i] != b[i] {
|
|
return false
|
|
}
|
|
}
|
|
|
|
return true
|
|
}
|
|
|
|
func TestStats(t *testing.T) {
|
|
conf := Config{
|
|
Filename: "./stats.db",
|
|
LimitDays: 1,
|
|
}
|
|
s, _ := createObject(conf)
|
|
|
|
e := Entry{}
|
|
|
|
e.Domain = "domain"
|
|
e.Client = "127.0.0.1"
|
|
e.Result = RFiltered
|
|
e.Time = 123456
|
|
s.Update(e)
|
|
|
|
e.Domain = "domain"
|
|
e.Client = "127.0.0.1"
|
|
e.Result = RNotFiltered
|
|
e.Time = 123456
|
|
s.Update(e)
|
|
|
|
d, ok := s.getData()
|
|
assert.True(t, ok)
|
|
|
|
a := []uint64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2}
|
|
assert.True(t, UIntArrayEquals(d.DNSQueries, a))
|
|
|
|
a = []uint64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}
|
|
assert.True(t, UIntArrayEquals(d.BlockedFiltering, a))
|
|
|
|
a = []uint64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
|
|
assert.True(t, UIntArrayEquals(d.ReplacedSafebrowsing, a))
|
|
|
|
a = []uint64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
|
|
assert.True(t, UIntArrayEquals(d.ReplacedParental, a))
|
|
|
|
m := d.TopQueried
|
|
assert.EqualValues(t, 1, m[0]["domain"])
|
|
|
|
m = d.TopBlocked
|
|
assert.EqualValues(t, 1, m[0]["domain"])
|
|
|
|
m = d.TopClients
|
|
assert.EqualValues(t, 2, m[0]["127.0.0.1"])
|
|
|
|
assert.EqualValues(t, 2, d.NumDNSQueries)
|
|
assert.EqualValues(t, 1, d.NumBlockedFiltering)
|
|
assert.EqualValues(t, 0, d.NumReplacedSafebrowsing)
|
|
assert.EqualValues(t, 0, d.NumReplacedSafesearch)
|
|
assert.EqualValues(t, 0, d.NumReplacedParental)
|
|
assert.EqualValues(t, 0.123456, d.AvgProcessingTime)
|
|
|
|
topClients := s.GetTopClientsIP(2)
|
|
assert.True(t, net.IP{127, 0, 0, 1}.Equal(topClients[0]))
|
|
|
|
s.clear()
|
|
s.Close()
|
|
os.Remove(conf.Filename)
|
|
}
|
|
|
|
func TestLargeNumbers(t *testing.T) {
|
|
var hour int32 = 1
|
|
newID := func() uint32 {
|
|
// use "atomic" to make Go race detector happy
|
|
return uint32(atomic.LoadInt32(&hour))
|
|
}
|
|
|
|
// log.SetLevel(log.DEBUG)
|
|
conf := Config{
|
|
Filename: "./stats.db",
|
|
LimitDays: 1,
|
|
UnitID: newID,
|
|
}
|
|
os.Remove(conf.Filename)
|
|
s, _ := createObject(conf)
|
|
e := Entry{}
|
|
|
|
n := 1000 // number of distinct clients and domains every hour
|
|
for h := 0; h != 12; h++ {
|
|
if h != 0 {
|
|
atomic.AddInt32(&hour, 1)
|
|
}
|
|
for i := 0; i != n; i++ {
|
|
e.Domain = fmt.Sprintf("domain%d", i)
|
|
ip := net.IP{127, 0, 0, 1}
|
|
ip[2] = byte((i & 0xff00) >> 8)
|
|
ip[3] = byte(i & 0xff)
|
|
e.Client = ip.String()
|
|
e.Result = RNotFiltered
|
|
e.Time = 123456
|
|
s.Update(e)
|
|
}
|
|
}
|
|
|
|
d, ok := s.getData()
|
|
assert.True(t, ok)
|
|
assert.EqualValues(t, int(hour)*n, d.NumDNSQueries)
|
|
|
|
s.Close()
|
|
os.Remove(conf.Filename)
|
|
}
|
|
|
|
// this code is a chunk copied from getData() that generates aggregate data per day
|
|
func aggregateDataPerDay(firstID uint32) int {
|
|
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
|
|
a := []uint64{}
|
|
var sum uint64
|
|
id := firstDayID
|
|
nextDayID := firstDayID + 24
|
|
for i := firstDayID - firstID; int(i) != 720; i++ {
|
|
sum++
|
|
if id == nextDayID {
|
|
a = append(a, sum)
|
|
sum = 0
|
|
nextDayID += 24
|
|
}
|
|
id++
|
|
}
|
|
if id <= nextDayID {
|
|
a = append(a, sum)
|
|
}
|
|
return len(a)
|
|
}
|
|
|
|
func TestAggregateDataPerTimeUnit(t *testing.T) {
|
|
for i := 0; i != 25; i++ {
|
|
alen := aggregateDataPerDay(uint32(i))
|
|
assert.Equalf(t, 30, alen, "i=%d", i)
|
|
}
|
|
}
|