mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24 in DNS/adguard-dns from parental_fullhash to master 

* commit 'dcbe3dd4051f421553eb7782af67378f3d9ce85b':
  dnsfilter -- compare full hashes when parsing parental lookup result.
This commit is contained in:
Eugene Bujak 2018-09-17 01:50:09 +03:00
parent ae50a2f827 dcbe3dd405
commit 5d046c5c16
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dnsfilter/dnsfilter.go
View File

@ -542,6 +542,7 @@ func (d *Dnsfilter) checkParental(host string) (Result, error) {
Blocked bool `json:"blocked"` Blocked bool `json:"blocked"`
ClientTTL int `json:"clientTtl"` ClientTTL int `json:"clientTtl"`
Reason string `json:"reason"` Reason string `json:"reason"`
Hash string `json:"hash"`
} }
err := json.Unmarshal(body, &m) err := json.Unmarshal(body, &m)
if err != nil { if err != nil {
@ -553,6 +554,9 @@ func (d *Dnsfilter) checkParental(host string) (Result, error) {
result := Result{} result := Result{}
for i := range m { for i := range m {
if !hashes[m[i].Hash] {
continue
}
if m[i].Blocked { if m[i].Blocked {
result.IsFiltered = true result.IsFiltered = true
result.Reason = FilteredParental result.Reason = FilteredParental

2
dnsfilter/dnsfilter_test.go
View File

@ -356,6 +356,8 @@ func TestParentalControl(t *testing.T) {
if stats.Parental.Requests != l { if stats.Parental.Requests != l {
t.Errorf("Parental lookup negative cache is not working") t.Errorf("Parental lookup negative cache is not working")
} }
d.checkMatchEmpty(t, "api.jquery.com")
} }
func TestSafeSearch(t *testing.T) { func TestSafeSearch(t *testing.T) {