mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-16 02:18:28 -07:00
0a66913b4d
Close #1212 * Server.Start(config *ServerConfig) -> Start() + Server.Prepare(config *ServerConfig) + Server.Resolve(host string) + Server.Exchange() * rDNS: use internal DNS resolver - clients: fix race in WriteDiskConfig() - fix race: move 'clients' object from 'configuration' to 'HomeContext' Go race detector didn't like our 'clients' object in 'configuration'. + add AGH startup test . Create a configuration file . Start AGH instance . Check Web server . Check DNS server . Wait until the filters are downloaded . Stop and cleanup * move module objects from config.* to Context.* * don't call log.SetLevel() if not necessary This helps to avoid Go race detector's warning * ci.sh: 'make' and then run tests Squashed commit of the following: commit 86500c7f749307f37af4cc8c2a1066f679d0cfad Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 18:08:53 2019 +0300 minor commit 6e6abb9dca3cd250c458bec23aa30d2250a9eb40 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 18:08:31 2019 +0300 * ci.sh: 'make' and then run tests commit 114192eefea6800e565ba9ab238202c006516c27 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 17:50:04 2019 +0300 fix commit d426deea7f02cdfd4c7217a38c59e51251956a0f Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 17:46:33 2019 +0300 tests commit 7b350edf03027895b4e43dee908d0155a9b0ac9b Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:56:12 2019 +0300 fix test commit 2f5f116873bbbfdd4bb7f82a596f9e1f5c2bcfd8 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:48:56 2019 +0300 fix tests commit 3fbdc77f9c34726e2295185279444983652d559e Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:45:00 2019 +0300 linter commit 9da0b6965a2b6863bcd552fa83a4de2866600bb8 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:33:23 2019 +0300 * config.dnsctx.whois -> Context.whois commit c71ebdbdf6efd88c877b2f243c69d3bc00a997d7 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:31:08 2019 +0300 * don't call log.SetLevel() if not necessary This helps to avoid Go race detector's warning commit 0f250220133cefdcb0843a50000cb932802b8324 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:28:19 2019 +0300 * rdns: refactor commit c460d8c9414940dac852e390b6c1b4d4fb38dff9 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 14:08:08 2019 +0300 Revert: * stats: serialize access to 'limit' Use 'conf *Config' and update it atomically, as in querylog module. (Note: Race detector still doesn't like it) commit 488bcb884971276de0d5629384b29e22c59ee7e6 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:50:23 2019 +0300 * config.dnsFilter -> Context.dnsFilter commit 86c0a6827a450414b50acec7ebfc5220d13b81e4 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:45:05 2019 +0300 * config.dnsServer -> Context.dnsServer commit ee35ef095ccaabc89e3de0ef52c9b5ed56b36873 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:42:10 2019 +0300 * config.dhcpServer -> Context.dhcpServer commit 1537001cd211099d5fad01696c0b806ae5d257b1 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:39:45 2019 +0300 * config.queryLog -> Context.queryLog commit e5955fe4ff1ef6f41763461b37b502ea25a3d04c Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:03:18 2019 +0300 * config.httpsServer -> Context.httpsServer commit 6153c10a9ac173e159d1f05e0db1512579b9203c Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Dec 9 20:12:24 2019 +0300 * config.httpServer -> Context.httpServer commit abd021fb94039015cd45c97614e8b78d4694f956 Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Dec 9 20:08:05 2019 +0300 * stats: serialize access to 'limit' commit 38c2decfd87c712100edcabe62a6d4518719cb53 Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Dec 9 19:57:04 2019 +0300 * config.stats -> Context.stats commit 6caf8965ad44db9dce9a7a5103aa8fa305ad9a06 Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Dec 9 19:45:23 2019 +0300 fix Restart() ... and 6 more commits
153 lines
3.5 KiB
Go
153 lines
3.5 KiB
Go
package stats
|
|
|
|
import (
|
|
"fmt"
|
|
"net"
|
|
"os"
|
|
"sync/atomic"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func UIntArrayEquals(a []uint64, 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 = net.ParseIP("127.0.0.1")
|
|
e.Result = RFiltered
|
|
e.Time = 123456
|
|
s.Update(e)
|
|
|
|
e.Domain = "domain"
|
|
e.Client = net.ParseIP("127.0.0.1")
|
|
e.Result = RNotFiltered
|
|
e.Time = 123456
|
|
s.Update(e)
|
|
|
|
d := s.getData()
|
|
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["dns_queries"].([]uint64), 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["blocked_filtering"].([]uint64), 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["replaced_safebrowsing"].([]uint64), 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["replaced_parental"].([]uint64), a))
|
|
|
|
m := d["top_queried_domains"].([]map[string]uint64)
|
|
assert.True(t, m[0]["domain"] == 1)
|
|
|
|
m = d["top_blocked_domains"].([]map[string]uint64)
|
|
assert.True(t, m[0]["domain"] == 1)
|
|
|
|
m = d["top_clients"].([]map[string]uint64)
|
|
assert.True(t, m[0]["127.0.0.1"] == 2)
|
|
|
|
assert.True(t, d["num_dns_queries"].(uint64) == 2)
|
|
assert.True(t, d["num_blocked_filtering"].(uint64) == 1)
|
|
assert.True(t, d["num_replaced_safebrowsing"].(uint64) == 0)
|
|
assert.True(t, d["num_replaced_safesearch"].(uint64) == 0)
|
|
assert.True(t, d["num_replaced_parental"].(uint64) == 0)
|
|
assert.True(t, d["avg_processing_time"].(float64) == 0.123456)
|
|
|
|
topClients := s.GetTopClientsIP(2)
|
|
assert.True(t, topClients[0] == "127.0.0.1")
|
|
|
|
s.clear()
|
|
s.Close()
|
|
os.Remove(conf.Filename)
|
|
}
|
|
|
|
func TestLargeNumbers(t *testing.T) {
|
|
var hour int32
|
|
hour = 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)
|
|
e.Client = net.ParseIP("127.0.0.1")
|
|
e.Client[2] = byte((i & 0xff00) >> 8)
|
|
e.Client[3] = byte(i & 0xff)
|
|
e.Result = RNotFiltered
|
|
e.Time = 123456
|
|
s.Update(e)
|
|
}
|
|
}
|
|
|
|
d := s.getData()
|
|
assert.True(t, d["num_dns_queries"].(uint64) == uint64(int(hour)*n))
|
|
|
|
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.True(t, alen == 30, "i=%d", i)
|
|
}
|
|
}
|