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:
commit
5d046c5c16
@ -542,6 +542,7 @@ func (d *Dnsfilter) checkParental(host string) (Result, error) {
|
||||
Blocked bool `json:"blocked"`
|
||||
ClientTTL int `json:"clientTtl"`
|
||||
Reason string `json:"reason"`
|
||||
Hash string `json:"hash"`
|
||||
}
|
||||
err := json.Unmarshal(body, &m)
|
||||
if err != nil {
|
||||
@ -553,6 +554,9 @@ func (d *Dnsfilter) checkParental(host string) (Result, error) {
|
||||
result := Result{}
|
||||
|
||||
for i := range m {
|
||||
if !hashes[m[i].Hash] {
|
||||
continue
|
||||
}
|
||||
if m[i].Blocked {
|
||||
result.IsFiltered = true
|
||||
result.Reason = FilteredParental
|
||||
|
@ -356,6 +356,8 @@ func TestParentalControl(t *testing.T) {
|
||||
if stats.Parental.Requests != l {
|
||||
t.Errorf("Parental lookup negative cache is not working")
|
||||
}
|
||||
|
||||
d.checkMatchEmpty(t, "api.jquery.com")
|
||||
}
|
||||
|
||||
func TestSafeSearch(t *testing.T) {
|
||||
|
Loading…
Reference in New Issue
Block a user