daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* safebrowsing/parental: split some code

Browse Source 
* dnsfilter.CheckHost() doesn't support host="hostname." (with a trailing dot) anymore
This commit is contained in:
Simon Zolin
2019-08-07 16:01:23 +03:00
parent d659e7ee08
commit ccf72b6008
2 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dnsfilter/dnsfilter_test.go
View File

@@ -144,9 +144,7 @@ func TestSafeBrowsing(t *testing.T) {
if gctx.stats.Safebrowsing.Requests != 1 {
t.Errorf("Safebrowsing lookup positive cache is not working: %v", gctx.stats.Safebrowsing.Requests)
}
d.checkMatch(t, "wmconvirus.narod.ru.")
d.checkMatch(t, "test.wmconvirus.narod.ru")
d.checkMatch(t, "test.wmconvirus.narod.ru.")
d.checkMatchEmpty(t, "yandex.ru")
d.checkMatchEmpty(t, "pornhub.com")
l := gctx.stats.Safebrowsing.Requests
@@ -166,9 +164,7 @@ func TestParallelSB(t *testing.T) {
t.Run(fmt.Sprintf("aaa%d", i), func(t *testing.T) {
t.Parallel()
d.checkMatch(t, "wmconvirus.narod.ru")
d.checkMatch(t, "wmconvirus.narod.ru.")
d.checkMatch(t, "test.wmconvirus.narod.ru")
d.checkMatch(t, "test.wmconvirus.narod.ru.")
d.checkMatchEmpty(t, "yandex.ru")
d.checkMatchEmpty(t, "pornhub.com")
})
@@ -368,8 +364,6 @@ func TestParentalControl(t *testing.T) {
t.Errorf("Parental lookup positive cache is not working")
}
d.checkMatch(t, "www.pornhub.com")
d.checkMatch(t, "pornhub.com.")
d.checkMatch(t, "www.pornhub.com.")
d.checkMatchEmpty(t, "www.yandex.ru")
d.checkMatchEmpty(t, "yandex.ru")
l := gctx.stats.Parental.Requests