docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
sequencelengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
case filtering.FilteredSafeBrowsing: | <mask> e.Time = uint32(elapsed / 1000)
<mask> e.Result = stats.RNotFiltered
<mask>
<mask> switch res.Reason {
<mask> case dnsfilter.FilteredSafeBrowsing:
<mask> e.Result = stats.RSafeBrowsing
<mask> case dnsfilter.FilteredParental:
<mask> e.Result = stats.RParental
<mask> case dnsfilter.FilteredSafeSearch:
<mask> e.Result = stats.RSafeSearch
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: </s> remove case dnsfilter.FilteredSafeSearch:
</s> add case filtering.FilteredSafeSearch: </s> remove case dnsfilter.FilteredBlockList:
</s> add case filtering.FilteredBlockList: </s> remove case dnsfilter.FilteredInvalid:
</s> add case filtering.FilteredInvalid: </s> remove case dnsfilter.FilteredBlockedService:
</s> add case filtering.FilteredBlockedService: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats.go |
case filtering.FilteredParental: | <mask>
<mask> switch res.Reason {
<mask> case dnsfilter.FilteredSafeBrowsing:
<mask> e.Result = stats.RSafeBrowsing
<mask> case dnsfilter.FilteredParental:
<mask> e.Result = stats.RParental
<mask> case dnsfilter.FilteredSafeSearch:
<mask> e.Result = stats.RSafeSearch
<mask> case dnsfilter.FilteredBlockList:
<mask> fallthrough
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove case dnsfilter.FilteredSafeSearch:
</s> add case filtering.FilteredSafeSearch: </s> remove case dnsfilter.FilteredSafeBrowsing:
</s> add case filtering.FilteredSafeBrowsing: </s> remove case dnsfilter.FilteredBlockList:
</s> add case filtering.FilteredBlockList: </s> remove case dnsfilter.FilteredInvalid:
</s> add case filtering.FilteredInvalid: </s> remove case dnsfilter.FilteredBlockedService:
</s> add case filtering.FilteredBlockedService: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats.go |
case filtering.FilteredSafeSearch: | <mask> case dnsfilter.FilteredSafeBrowsing:
<mask> e.Result = stats.RSafeBrowsing
<mask> case dnsfilter.FilteredParental:
<mask> e.Result = stats.RParental
<mask> case dnsfilter.FilteredSafeSearch:
<mask> e.Result = stats.RSafeSearch
<mask> case dnsfilter.FilteredBlockList:
<mask> fallthrough
<mask> case dnsfilter.FilteredInvalid:
<mask> fallthrough
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: </s> remove case dnsfilter.FilteredBlockList:
</s> add case filtering.FilteredBlockList: </s> remove case dnsfilter.FilteredInvalid:
</s> add case filtering.FilteredInvalid: </s> remove case dnsfilter.FilteredSafeBrowsing:
</s> add case filtering.FilteredSafeBrowsing: </s> remove case dnsfilter.FilteredBlockedService:
</s> add case filtering.FilteredBlockedService: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats.go |
case filtering.FilteredBlockList: | <mask> case dnsfilter.FilteredParental:
<mask> e.Result = stats.RParental
<mask> case dnsfilter.FilteredSafeSearch:
<mask> e.Result = stats.RSafeSearch
<mask> case dnsfilter.FilteredBlockList:
<mask> fallthrough
<mask> case dnsfilter.FilteredInvalid:
<mask> fallthrough
<mask> case dnsfilter.FilteredBlockedService:
<mask> e.Result = stats.RFiltered
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove case dnsfilter.FilteredInvalid:
</s> add case filtering.FilteredInvalid: </s> remove case dnsfilter.FilteredSafeSearch:
</s> add case filtering.FilteredSafeSearch: </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: </s> remove case dnsfilter.FilteredBlockedService:
</s> add case filtering.FilteredBlockedService: </s> remove case dnsfilter.FilteredSafeBrowsing:
</s> add case filtering.FilteredSafeBrowsing: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats.go |
case filtering.FilteredInvalid: | <mask> case dnsfilter.FilteredSafeSearch:
<mask> e.Result = stats.RSafeSearch
<mask> case dnsfilter.FilteredBlockList:
<mask> fallthrough
<mask> case dnsfilter.FilteredInvalid:
<mask> fallthrough
<mask> case dnsfilter.FilteredBlockedService:
<mask> e.Result = stats.RFiltered
<mask> }
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove case dnsfilter.FilteredBlockList:
</s> add case filtering.FilteredBlockList: </s> remove case dnsfilter.FilteredSafeSearch:
</s> add case filtering.FilteredSafeSearch: </s> remove case dnsfilter.FilteredBlockedService:
</s> add case filtering.FilteredBlockedService: </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: </s> remove case dnsfilter.FilteredSafeBrowsing:
</s> add case filtering.FilteredSafeBrowsing: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats.go |
case filtering.FilteredBlockedService: | <mask> case dnsfilter.FilteredBlockList:
<mask> fallthrough
<mask> case dnsfilter.FilteredInvalid:
<mask> fallthrough
<mask> case dnsfilter.FilteredBlockedService:
<mask> e.Result = stats.RFiltered
<mask> }
<mask>
<mask> s.stats.Update(e)
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove case dnsfilter.FilteredInvalid:
</s> add case filtering.FilteredInvalid: </s> remove case dnsfilter.FilteredBlockList:
</s> add case filtering.FilteredBlockList: </s> remove case dnsfilter.FilteredSafeSearch:
</s> add case filtering.FilteredSafeSearch: </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: </s> remove case dnsfilter.FilteredSafeBrowsing:
</s> add case filtering.FilteredSafeBrowsing: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "net"
<mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/miekg/dns"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
reason filtering.Reason | <mask> clientID string
<mask> wantLogProto querylog.ClientProto
<mask> wantStatClient string
<mask> wantCode resultCode
<mask> reason dnsfilter.Reason
<mask> wantStatResult stats.Result
<mask> }{{
<mask> name: "success_udp",
<mask> proto: proxy.ProtoUDP,
<mask> addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.FilteredBlockList,
</s> add reason: filtering.FilteredBlockList, </s> remove reason: dnsfilter.FilteredSafeSearch,
</s> add reason: filtering.FilteredSafeSearch, </s> remove reason: dnsfilter.FilteredSafeBrowsing,
</s> add reason: filtering.FilteredSafeBrowsing, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
reason: filtering.NotFilteredNotFound, | <mask> clientID: "",
<mask> wantLogProto: "",
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.NotFilteredNotFound,
<mask> wantStatResult: stats.RNotFiltered,
<mask> }, {
<mask> name: "success_tls_client_id",
<mask> proto: proxy.ProtoTLS,
<mask> addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
reason: filtering.NotFilteredNotFound, | <mask> clientID: "cli42",
<mask> wantLogProto: querylog.ClientProtoDOT,
<mask> wantStatClient: "cli42",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.NotFilteredNotFound,
<mask> wantStatResult: stats.RNotFiltered,
<mask> }, {
<mask> name: "success_tls",
<mask> proto: proxy.ProtoTLS,
<mask> addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
reason: filtering.NotFilteredNotFound, | <mask> clientID: "",
<mask> wantLogProto: querylog.ClientProtoDOT,
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.NotFilteredNotFound,
<mask> wantStatResult: stats.RNotFiltered,
<mask> }, {
<mask> name: "success_quic",
<mask> proto: proxy.ProtoQUIC,
<mask> addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
reason: filtering.NotFilteredNotFound, | <mask> clientID: "",
<mask> wantLogProto: querylog.ClientProtoDOQ,
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.NotFilteredNotFound,
<mask> wantStatResult: stats.RNotFiltered,
<mask> }, {
<mask> name: "success_https",
<mask> proto: proxy.ProtoHTTPS,
<mask> addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
reason: filtering.NotFilteredNotFound, | <mask> clientID: "",
<mask> wantLogProto: querylog.ClientProtoDOH,
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.NotFilteredNotFound,
<mask> wantStatResult: stats.RNotFiltered,
<mask> }, {
<mask> name: "success_dnscrypt",
<mask> proto: proxy.ProtoDNSCrypt,
<mask> addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
reason: filtering.NotFilteredNotFound, | <mask> clientID: "",
<mask> wantLogProto: querylog.ClientProtoDNSCrypt,
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.NotFilteredNotFound,
<mask> wantStatResult: stats.RNotFiltered,
<mask> }, {
<mask> name: "success_udp_filtered",
<mask> proto: proxy.ProtoUDP,
<mask> addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.FilteredSafeSearch,
</s> add reason: filtering.FilteredSafeSearch, </s> remove reason: dnsfilter.FilteredBlockList,
</s> add reason: filtering.FilteredBlockList, </s> remove reason: dnsfilter.FilteredSafeBrowsing,
</s> add reason: filtering.FilteredSafeBrowsing, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
reason: filtering.FilteredBlockList, | <mask> clientID: "",
<mask> wantLogProto: "",
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.FilteredBlockList,
<mask> wantStatResult: stats.RFiltered,
<mask> }, {
<mask> name: "success_udp_sb",
<mask> proto: proxy.ProtoUDP,
<mask> addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.FilteredSafeBrowsing,
</s> add reason: filtering.FilteredSafeBrowsing, </s> remove reason: dnsfilter.FilteredSafeSearch,
</s> add reason: filtering.FilteredSafeSearch, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
reason: filtering.FilteredSafeBrowsing, | <mask> clientID: "",
<mask> wantLogProto: "",
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.FilteredSafeBrowsing,
<mask> wantStatResult: stats.RSafeBrowsing,
<mask> }, {
<mask> name: "success_udp_ss",
<mask> proto: proxy.ProtoUDP,
<mask> addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.FilteredSafeSearch,
</s> add reason: filtering.FilteredSafeSearch, </s> remove reason: dnsfilter.FilteredBlockList,
</s> add reason: filtering.FilteredBlockList, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
reason: filtering.FilteredSafeSearch, | <mask> clientID: "",
<mask> wantLogProto: "",
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.FilteredSafeSearch,
<mask> wantStatResult: stats.RSafeSearch,
<mask> }, {
<mask> name: "success_udp_pc",
<mask> proto: proxy.ProtoUDP,
<mask> addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.FilteredBlockList,
</s> add reason: filtering.FilteredBlockList, </s> remove reason: dnsfilter.FilteredSafeBrowsing,
</s> add reason: filtering.FilteredSafeBrowsing, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
reason: filtering.FilteredParental, | <mask> clientID: "",
<mask> wantLogProto: "",
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.FilteredParental,
<mask> wantStatResult: stats.RParental,
<mask> }}
<mask>
<mask> ups, err := upstream.AddressToUpstream("1.1.1.1", upstream.Options{})
<mask> require.Nil(t, err)
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.FilteredSafeSearch,
</s> add reason: filtering.FilteredSafeSearch, </s> remove reason: dnsfilter.FilteredBlockList,
</s> add reason: filtering.FilteredBlockList, </s> remove reason: dnsfilter.FilteredSafeBrowsing,
</s> add reason: filtering.FilteredSafeBrowsing, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
result: &filtering.Result{ | <mask> stats: st,
<mask> },
<mask> proxyCtx: pctx,
<mask> startTime: time.Now(),
<mask> result: &dnsfilter.Result{
<mask> Reason: tc.reason,
<mask> },
<mask> clientID: tc.clientID,
<mask> }
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove result: &dnsfilter.Result{},
</s> add result: &filtering.Result{}, </s> remove res := dnsfilter.Result{
</s> add res := filtering.Result{ </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.FilteredSafeSearch,
</s> add reason: filtering.FilteredSafeSearch, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghstrings"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/clients.go |
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghstrings"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/clients.go |
if !filtering.BlockedSvcKnown(s) { | <mask> Upstreams: cy.Upstreams,
<mask> }
<mask>
<mask> for _, s := range cy.BlockedServices {
<mask> if !dnsfilter.BlockedSvcKnown(s) {
<mask> log.Debug("clients: skipping unknown blocked-service %q", s)
<mask> continue
<mask> }
<mask> cli.BlockedServices = append(cli.BlockedServices, s)
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filters = append(filters, dnsfilter.Filter{
</s> add filters = append(filters, filtering.Filter{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/clients.go |
<mask> "path/filepath"
<mask> "sync"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/version"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/config.go |
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "sync"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/version"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/config.go |
DnsfilterConf filtering.Config `yaml:",inline"` | <mask> dnsforward.FilteringConfig `yaml:",inline"`
<mask>
<mask> FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists
<mask> FiltersUpdateIntervalHours uint32 `yaml:"filters_update_interval"` // time period to update filters (in hours)
<mask> DnsfilterConf dnsfilter.Config `yaml:",inline"`
<mask>
<mask> // LocalDomainName is the domain name used for known internal hosts.
<mask> // For example, a machine called "myhost" can be addressed as
<mask> // "myhost.lan" when LocalDomainName is "lan".
<mask> LocalDomainName string `yaml:"local_domain_name"`
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of filtering features </s> remove dnsfilter.Filter `yaml:",inline"`
</s> add filtering.Filter `yaml:",inline"` </s> remove ProtectionEnabled: true, // whether or not use any of dnsfilter features
</s> add ProtectionEnabled: true, // whether or not use any of filtering features </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove setts *dnsfilter.FilteringSettings
</s> add setts *filtering.Settings | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/config.go |
ProtectionEnabled: true, // whether or not use any of filtering features | <mask> BindHosts: []net.IP{{0, 0, 0, 0}},
<mask> Port: 53,
<mask> StatsInterval: 1,
<mask> FilteringConfig: dnsforward.FilteringConfig{
<mask> ProtectionEnabled: true, // whether or not use any of dnsfilter features
<mask> BlockingMode: "default", // mode how to answer filtered requests
<mask> BlockedResponseTTL: 10, // in seconds
<mask> Ratelimit: 20,
<mask> RefuseAny: true,
<mask> AllServers: false,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of filtering features </s> remove DnsfilterConf dnsfilter.Config `yaml:",inline"`
</s> add DnsfilterConf filtering.Config `yaml:",inline"` </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/config.go |
c := filtering.Config{} | <mask> config.DNS.AnonymizeClientIP = dc.AnonymizeClientIP
<mask> }
<mask>
<mask> if Context.dnsFilter != nil {
<mask> c := dnsfilter.Config{}
<mask> Context.dnsFilter.WriteDiskConfig(&c)
<mask> config.DNS.DnsfilterConf = c
<mask> }
<mask>
<mask> if s := Context.dnsServer; s != nil {
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) </s> remove ctx.result = &dnsfilter.Result{}
</s> add ctx.result = &filtering.Result{} </s> remove } else if res.Reason == dnsfilter.RewrittenRule {
</s> add } else if res.Reason == filtering.RewrittenRule { </s> remove Context.dnsFilter = dnsfilter.New(&filterConf, nil)
</s> add Context.dnsFilter = filtering.New(&filterConf, nil) </s> remove c := dnsfilter.Config{
</s> add c := filtering.Config{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/config.go |
<mask> "path/filepath"
<mask> "strconv"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/dns.go |
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/ameshkov/dnscrypt/v2"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/dns.go |
Context.dnsFilter = filtering.New(&filterConf, nil) | <mask> filterConf := config.DNS.DnsfilterConf
<mask> filterConf.EtcHosts = Context.etcHosts
<mask> filterConf.ConfigModified = onConfigModified
<mask> filterConf.HTTPRegister = httpRegister
<mask> Context.dnsFilter = dnsfilter.New(&filterConf, nil)
<mask>
<mask> p := dnsforward.DNSCreateParams{
<mask> DNSFilter: Context.dnsFilter,
<mask> Stats: Context.stats,
<mask> QueryLog: Context.queryLog,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove c := dnsfilter.Config{}
</s> add c := filtering.Config{} </s> remove DNSFilter: dnsfilter.New(&c, nil),
</s> add DNSFilter: filtering.New(&c, nil), </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, filters),
</s> add DNSFilter: filtering.New(&filtering.Config{}, filters), </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/dns.go |
func applyAdditionalFiltering(clientAddr net.IP, clientID string, setts *filtering.Settings) { | <mask> }
<mask>
<mask> // applyAdditionalFiltering adds additional client information and settings if
<mask> // the client has them.
<mask> func applyAdditionalFiltering(clientAddr net.IP, clientID string, setts *dnsfilter.FilteringSettings) {
<mask> Context.dnsFilter.ApplyBlockedServices(setts, nil, true)
<mask>
<mask> if clientAddr == nil {
<mask> return
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove FilterHandler func(clientAddr net.IP, clientID string, settings *dnsfilter.FilteringSettings) `yaml:"-"`
</s> add FilterHandler func(clientAddr net.IP, clientID string, settings *filtering.Settings) `yaml:"-"` </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings { </s> remove FilterHandler: func(_ net.IP, _ string, settings *dnsfilter.FilteringSettings) {
</s> add FilterHandler: func(_ net.IP, _ string, settings *filtering.Settings) { </s> remove setts *dnsfilter.FilteringSettings
</s> add setts *filtering.Settings </s> remove result *dnsfilter.Result
</s> add result *filtering.Result | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/dns.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "sync"
<mask> "sync/atomic"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> var nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/filter.go |
{Filter: filtering.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard DNS filter"},
{Filter: filtering.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway Default Blocklist"},
{Filter: filtering.Filter{ID: 4}, Enabled: false, URL: "https://www.malwaredomainlist.com/hostslist/hosts.txt", Name: "MalwareDomainList.com Hosts List"}, | <mask> }
<mask>
<mask> func defaultFilters() []filter {
<mask> return []filter{
<mask> {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard DNS filter"},
<mask> {Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway Default Blocklist"},
<mask> {Filter: dnsfilter.Filter{ID: 4}, Enabled: false, URL: "https://www.malwaredomainlist.com/hostslist/hosts.txt", Name: "MalwareDomainList.com Hosts List"},
<mask> }
<mask> }
<mask>
<mask> // field ordering is important -- yaml fields will mirror ordering from here
<mask> type filter struct {
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove dnsFilter *dnsfilter.DNSFilter // DNS filter instance
</s> add dnsFilter *filtering.DNSFilter // DNS filter instance </s> remove } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == filtering.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove ProtectionEnabled: true, // whether or not use any of dnsfilter features
</s> add ProtectionEnabled: true, // whether or not use any of filtering features </s> remove Result *dnsfilter.Result // Filtering result (optional)
</s> add Result *filtering.Result // Filtering result (optional) </s> remove result *dnsfilter.Result
</s> add result *filtering.Result | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/filter.go |
filtering.Filter `yaml:",inline"` | <mask> LastUpdated time.Time `yaml:"-"`
<mask> checksum uint32 // checksum of the file data
<mask> white bool
<mask>
<mask> dnsfilter.Filter `yaml:",inline"`
<mask> }
<mask>
<mask> const (
<mask> statusFound = 1
<mask> statusEnabledChanged = 2
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove DnsfilterConf dnsfilter.Config `yaml:",inline"`
</s> add DnsfilterConf filtering.Config `yaml:",inline"` </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of filtering features </s> remove ent.Result.DNSRewriteResult.Response = dnsfilter.DNSRewriteResultResponse{}
</s> add ent.Result.DNSRewriteResult.Response = filtering.DNSRewriteResultResponse{} </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/filter.go |
// On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters | <mask> // . If filter data hasn't changed, just set new update time on file
<mask> // . If filter data has changed:
<mask> // . rename the temporary file (<temp> -> 1.txt)
<mask> // Note that this method works only on UNIX.
<mask> // On Windows we don't pass files to dnsfilter - we pass the whole data.
<mask> // . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
<mask> // . dnsfilter activates new filters
<mask> //
<mask> // Return the number of updated filters
<mask> // Return TRUE - there was a network error and nothing could be updated
<mask> func (f *Filtering) refreshFiltersIfNecessary(flags int) (int, bool) {
<mask> log.Debug("Filters: updating...")
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove dnsfilter.InitModule()
</s> add filtering.InitModule() </s> remove // clients package uses dnsfilter package's static data (dnsfilter.BlockedSvcKnown()),
// so we have to initialize dnsfilter's static data first,
</s> add // clients package uses filtering package's static data (filtering.BlockedSvcKnown()),
// so we have to initialize filtering's static data first, </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: </s> remove // If the query was filtered by "Safe search", dnsfilter also must return
</s> add // If the query was filtered by "Safe search", filtering also must return </s> remove ent.Result.DNSRewriteResult.Response = dnsfilter.DNSRewriteResultResponse{}
</s> add ent.Result.DNSRewriteResult.Response = filtering.DNSRewriteResultResponse{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/filter.go |
var whiteFilters []filtering.Filter
filters := []filtering.Filter{{ | <mask> return filepath.Join(Context.getDataDir(), filterDir, strconv.FormatInt(filter.ID, 10)+".txt")
<mask> }
<mask>
<mask> func enableFilters(async bool) {
<mask> var whiteFilters []dnsfilter.Filter
<mask> filters := []dnsfilter.Filter{{
<mask> Data: []byte(strings.Join(config.UserRules, "\n")),
<mask> }}
<mask>
<mask> for _, filter := range config.Filters {
<mask> if !filter.Enabled {
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filters = append(filters, dnsfilter.Filter{
</s> add filters = append(filters, filtering.Filter{ </s> remove filters := []dnsfilter.Filter{{
</s> add filters := []filtering.Filter{{ </s> remove filters := []dnsfilter.Filter{{
</s> add filters := []filtering.Filter{{ </s> remove f := dnsfilter.New(filterConf, filters)
</s> add f := filtering.New(filterConf, filters) </s> remove whiteFilters = append(whiteFilters, dnsfilter.Filter{
</s> add whiteFilters = append(whiteFilters, filtering.Filter{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/filter.go |
filters = append(filters, filtering.Filter{ | <mask> if !filter.Enabled {
<mask> continue
<mask> }
<mask>
<mask> filters = append(filters, dnsfilter.Filter{
<mask> ID: filter.ID,
<mask> FilePath: filter.Path(),
<mask> })
<mask> }
<mask> for _, filter := range config.WhitelistFilters {
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove whiteFilters = append(whiteFilters, dnsfilter.Filter{
</s> add whiteFilters = append(whiteFilters, filtering.Filter{ </s> remove var whiteFilters []dnsfilter.Filter
filters := []dnsfilter.Filter{{
</s> add var whiteFilters []filtering.Filter
filters := []filtering.Filter{{ </s> remove if !dnsfilter.BlockedSvcKnown(s) {
</s> add if !filtering.BlockedSvcKnown(s) { </s> remove } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == filtering.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove filters := []dnsfilter.Filter{{
</s> add filters := []filtering.Filter{{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/filter.go |
whiteFilters = append(whiteFilters, filtering.Filter{ | <mask> if !filter.Enabled {
<mask> continue
<mask> }
<mask>
<mask> whiteFilters = append(whiteFilters, dnsfilter.Filter{
<mask> ID: filter.ID,
<mask> FilePath: filter.Path(),
<mask> })
<mask> }
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filters = append(filters, dnsfilter.Filter{
</s> add filters = append(filters, filtering.Filter{ </s> remove var whiteFilters []dnsfilter.Filter
filters := []dnsfilter.Filter{{
</s> add var whiteFilters []filtering.Filter
filters := []filtering.Filter{{ </s> remove if !dnsfilter.BlockedSvcKnown(s) {
</s> add if !filtering.BlockedSvcKnown(s) { </s> remove DNSFilter: dnsfilter.New(&c, nil),
</s> add DNSFilter: filtering.New(&c, nil), </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, nil),
</s> add DNSFilter: filtering.New(&filtering.Config{}, nil), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/filter.go |
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghos"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/updater"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/version"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/home.go |
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghos"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/updater"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/version"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/home.go |
dnsFilter *filtering.DNSFilter // DNS filtering module | <mask> queryLog querylog.QueryLog // query log module
<mask> dnsServer *dnsforward.Server // DNS module
<mask> rdns *RDNS // rDNS module
<mask> whois *Whois // WHOIS module
<mask> dnsFilter *dnsfilter.DNSFilter // DNS filtering module
<mask> dhcpServer *dhcpd.Server // DHCP module
<mask> auth *Auth // HTTP authentication module
<mask> filters Filtering // DNS filtering module
<mask> web *Web // Web (HTTP, HTTPS) module
<mask> tls *TLSMod // TLS module
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove dnsFilter *dnsfilter.DNSFilter // DNS filter instance
</s> add dnsFilter *filtering.DNSFilter // DNS filter instance </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove Result *dnsfilter.Result // Filtering result (optional)
</s> add Result *filtering.Result // Filtering result (optional) </s> remove // If the query was filtered by "Safe search", dnsfilter also must return
</s> add // If the query was filtered by "Safe search", filtering also must return </s> remove FilterHandler func(clientAddr net.IP, clientID string, settings *dnsfilter.FilteringSettings) `yaml:"-"`
</s> add FilterHandler func(clientAddr net.IP, clientID string, settings *filtering.Settings) `yaml:"-"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/home.go |
// clients package uses filtering package's static data (filtering.BlockedSvcKnown()),
// so we have to initialize filtering's static data first, | <mask> }
<mask>
<mask> setupContext(args)
<mask>
<mask> // clients package uses dnsfilter package's static data (dnsfilter.BlockedSvcKnown()),
<mask> // so we have to initialize dnsfilter's static data first,
<mask> // but also avoid relying on automatic Go init() function
<mask> dnsfilter.InitModule()
<mask>
<mask> setupConfig(args)
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove dnsfilter.InitModule()
</s> add filtering.InitModule() </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove dnsfilter.Filter `yaml:",inline"`
</s> add filtering.Filter `yaml:",inline"` </s> remove // If the query was filtered by "Safe search", dnsfilter also must return
</s> add // If the query was filtered by "Safe search", filtering also must return </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/home.go |
filtering.InitModule() | <mask>
<mask> // clients package uses dnsfilter package's static data (dnsfilter.BlockedSvcKnown()),
<mask> // so we have to initialize dnsfilter's static data first,
<mask> // but also avoid relying on automatic Go init() function
<mask> dnsfilter.InitModule()
<mask>
<mask> setupConfig(args)
<mask>
<mask> if !Context.firstRun {
<mask> // Save the updated config
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove // clients package uses dnsfilter package's static data (dnsfilter.BlockedSvcKnown()),
// so we have to initialize dnsfilter's static data first,
</s> add // clients package uses filtering package's static data (filtering.BlockedSvcKnown()),
// so we have to initialize filtering's static data first, </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove // If the query was filtered by "Safe search", dnsfilter also must return
</s> add // If the query was filtered by "Safe search", filtering also must return </s> remove if result.Reason == dnsfilter.FilteredSafeSearch &&
</s> add if result.Reason == filtering.FilteredSafeSearch && </s> remove FilterHandler func(clientAddr net.IP, clientID string, settings *dnsfilter.FilteringSettings) `yaml:"-"`
</s> add FilterHandler func(clientAddr net.IP, clientID string, settings *filtering.Settings) `yaml:"-"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/home.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "net"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/urlfilter/rules"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
ent.Result.Rules = []*filtering.ResultRule{{}} | <mask> }
<mask>
<mask> l := len(ent.Result.Rules)
<mask> if l == 0 {
<mask> ent.Result.Rules = []*dnsfilter.ResultRule{{}}
<mask> l++
<mask> }
<mask>
<mask> ent.Result.Rules[l-1].Text = s
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ent.Result.Rules = []*dnsfilter.ResultRule{{}}
</s> add ent.Result.Rules = []*filtering.ResultRule{{}} </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == filtering.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
ent.Result.Rules = []*filtering.ResultRule{{}} | <mask> }
<mask>
<mask> l := len(ent.Result.Rules)
<mask> if l == 0 {
<mask> ent.Result.Rules = []*dnsfilter.ResultRule{{}}
<mask> l++
<mask> }
<mask>
<mask> ent.Result.Rules[l-1].FilterListID = i
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ent.Result.Rules = []*dnsfilter.ResultRule{{}}
</s> add ent.Result.Rules = []*filtering.ResultRule{{}} </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == filtering.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
ent.Result.Reason = filtering.Reason(i) | <mask> i, err := v.Int64()
<mask> if err != nil {
<mask> return err
<mask> }
<mask> ent.Result.Reason = dnsfilter.Reason(i)
<mask> return nil
<mask> },
<mask> "ServiceName": func(t json.Token, ent *logEntry) error {
<mask> s, ok := t.(string)
<mask> if !ok {
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove } else if res.Reason == dnsfilter.RewrittenRule {
</s> add } else if res.Reason == filtering.RewrittenRule { </s> remove return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err)
</s> add return nil, fmt.Errorf("filtering failed to check host %q: %w", host, err) </s> remove ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
</s> add ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) | <mask> return
<mask> }
<mask>
<mask> if len(ent.Result.Rules) < i+1 {
<mask> ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
<mask> }
<mask>
<mask> if n, ok := vToken.(json.Number); ok {
<mask> ent.Result.Rules[i].FilterListID, _ = n.Int64()
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
</s> add ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} </s> remove ent.Result.Rules = []*dnsfilter.ResultRule{{}}
</s> add ent.Result.Rules = []*filtering.ResultRule{{}} </s> remove ent.Result.Rules = []*dnsfilter.ResultRule{{}}
</s> add ent.Result.Rules = []*filtering.ResultRule{{}} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) | <mask> return
<mask> }
<mask>
<mask> if len(ent.Result.Rules) < i+1 {
<mask> ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
<mask> }
<mask>
<mask> if ipStr, ok := vToken.(string); ok {
<mask> ent.Result.Rules[i].IP = net.ParseIP(ipStr)
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
</s> add ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} </s> remove ent.Result.Rules = []*dnsfilter.ResultRule{{}}
</s> add ent.Result.Rules = []*filtering.ResultRule{{}} </s> remove ent.Result.Rules = []*dnsfilter.ResultRule{{}}
</s> add ent.Result.Rules = []*filtering.ResultRule{{}} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) | <mask> return
<mask> }
<mask>
<mask> if len(ent.Result.Rules) < i+1 {
<mask> ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
<mask> }
<mask>
<mask> if s, ok := vToken.(string); ok {
<mask> ent.Result.Rules[i].Text = s
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
</s> add ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} </s> remove ent.Result.Rules = []*dnsfilter.ResultRule{{}}
</s> add ent.Result.Rules = []*filtering.ResultRule{{}} </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} | <mask> return
<mask> }
<mask>
<mask> if ent.Result.DNSRewriteResult == nil {
<mask> ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
<mask> }
<mask>
<mask> if n, ok := vToken.(json.Number); ok {
<mask> rcode64, _ := n.Int64()
<mask> ent.Result.DNSRewriteResult.RCode = rules.RCode(rcode64)
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
</s> add ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} | <mask> ent.Result.DNSRewriteResult.RCode = rules.RCode(rcode64)
<mask> }
<mask> case "Response":
<mask> if ent.Result.DNSRewriteResult == nil {
<mask> ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
<mask> }
<mask>
<mask> if ent.Result.DNSRewriteResult.Response == nil {
<mask> ent.Result.DNSRewriteResult.Response = dnsfilter.DNSRewriteResultResponse{}
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
</s> add ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} </s> remove ent.Result.DNSRewriteResult.Response = dnsfilter.DNSRewriteResultResponse{}
</s> add ent.Result.DNSRewriteResult.Response = filtering.DNSRewriteResultResponse{} </s> remove } else if res.Reason == dnsfilter.RewrittenRule {
</s> add } else if res.Reason == filtering.RewrittenRule { </s> remove params.Result = &dnsfilter.Result{}
</s> add params.Result = &filtering.Result{} </s> remove c := dnsfilter.Config{}
</s> add c := filtering.Config{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
ent.Result.DNSRewriteResult.Response = filtering.DNSRewriteResultResponse{} | <mask> ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
<mask> }
<mask>
<mask> if ent.Result.DNSRewriteResult.Response == nil {
<mask> ent.Result.DNSRewriteResult.Response = dnsfilter.DNSRewriteResultResponse{}
<mask> }
<mask>
<mask> // TODO(a.garipov): I give up. This whole file is a mess.
<mask> // Luckily, we can assume that this field is relatively rare and
<mask> // just use the normal decoding and correct the values.
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
</s> add ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove if result.Reason == dnsfilter.FilteredSafeSearch &&
</s> add if result.Reason == filtering.FilteredSafeSearch && </s> remove DnsfilterConf dnsfilter.Config `yaml:",inline"`
</s> add DnsfilterConf filtering.Config `yaml:",inline"` </s> remove ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
</s> add ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/urlfilter/rules"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> )
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode_test.go |
Result: filtering.Result{ | <mask> QClass: "IN",
<mask> ClientID: "cli42",
<mask> ClientProto: "",
<mask> Answer: ans,
<mask> Result: dnsfilter.Result{
<mask> IsFiltered: true,
<mask> Reason: dnsfilter.FilteredBlockList,
<mask> ReverseHosts: []string{"example.net"},
<mask> IPList: []net.IP{net.IPv4(127, 0, 0, 2)},
<mask> Rules: []*dnsfilter.ResultRule{{
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove Reason: dnsfilter.FilteredBlockList,
</s> add Reason: filtering.FilteredBlockList, </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ </s> remove Reason: dnsfilter.Rewritten,
</s> add Reason: filtering.Rewritten, </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ </s> remove res := dnsfilter.Result{
</s> add res := filtering.Result{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode_test.go |
Reason: filtering.FilteredBlockList, | <mask> ClientProto: "",
<mask> Answer: ans,
<mask> Result: dnsfilter.Result{
<mask> IsFiltered: true,
<mask> Reason: dnsfilter.FilteredBlockList,
<mask> ReverseHosts: []string{"example.net"},
<mask> IPList: []net.IP{net.IPv4(127, 0, 0, 2)},
<mask> Rules: []*dnsfilter.ResultRule{{
<mask> FilterListID: 42,
<mask> Text: "||an.yandex.ru",
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove Result: dnsfilter.Result{
</s> add Result: filtering.Result{ </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ </s> remove Reason: dnsfilter.Rewritten,
</s> add Reason: filtering.Rewritten, </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ </s> remove res := dnsfilter.Result{
</s> add res := filtering.Result{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode_test.go |
Rules: []*filtering.ResultRule{{ | <mask> IsFiltered: true,
<mask> Reason: dnsfilter.FilteredBlockList,
<mask> ReverseHosts: []string{"example.net"},
<mask> IPList: []net.IP{net.IPv4(127, 0, 0, 2)},
<mask> Rules: []*dnsfilter.ResultRule{{
<mask> FilterListID: 42,
<mask> Text: "||an.yandex.ru",
<mask> IP: net.IPv4(127, 0, 0, 2),
<mask> }, {
<mask> FilterListID: 43,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove Reason: dnsfilter.FilteredBlockList,
</s> add Reason: filtering.FilteredBlockList, </s> remove Result: dnsfilter.Result{
</s> add Result: filtering.Result{ </s> remove DNSRewriteResult: &dnsfilter.DNSRewriteResult{
</s> add DNSRewriteResult: &filtering.DNSRewriteResult{ </s> remove Reason: dnsfilter.Rewritten,
</s> add Reason: filtering.Rewritten, </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode_test.go |
DNSRewriteResult: &filtering.DNSRewriteResult{ | <mask> IP: net.IPv4(127, 0, 0, 3),
<mask> }},
<mask> CanonName: "example.com",
<mask> ServiceName: "example.org",
<mask> DNSRewriteResult: &dnsfilter.DNSRewriteResult{
<mask> RCode: dns.RcodeSuccess,
<mask> Response: dnsfilter.DNSRewriteResultResponse{
<mask> dns.TypeA: []rules.RRValue{net.IPv4(127, 0, 0, 2)},
<mask> },
<mask> },
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove Response: dnsfilter.DNSRewriteResultResponse{
</s> add Response: filtering.DNSRewriteResultResponse{ </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ </s> remove return dnsfilter.Result{
DNSRewriteResult: &dnsfilter.DNSRewriteResult{
</s> add return filtering.Result{
DNSRewriteResult: &filtering.DNSRewriteResult{ </s> remove Reason: dnsfilter.FilteredBlockList,
</s> add Reason: filtering.FilteredBlockList, </s> remove Result: dnsfilter.Result{
</s> add Result: filtering.Result{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode_test.go |
Response: filtering.DNSRewriteResultResponse{ | <mask> CanonName: "example.com",
<mask> ServiceName: "example.org",
<mask> DNSRewriteResult: &dnsfilter.DNSRewriteResult{
<mask> RCode: dns.RcodeSuccess,
<mask> Response: dnsfilter.DNSRewriteResultResponse{
<mask> dns.TypeA: []rules.RRValue{net.IPv4(127, 0, 0, 2)},
<mask> },
<mask> },
<mask> },
<mask> Elapsed: 837429,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove DNSRewriteResult: &dnsfilter.DNSRewriteResult{
</s> add DNSRewriteResult: &filtering.DNSRewriteResult{ </s> remove return dnsfilter.Result{
DNSRewriteResult: &dnsfilter.DNSRewriteResult{
</s> add return filtering.Result{
DNSRewriteResult: &filtering.DNSRewriteResult{ </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ </s> remove makeRes := func(rcode rules.RCode, rr rules.RRType, v rules.RRValue) (res dnsfilter.Result) {
resp := dnsfilter.DNSRewriteResultResponse{
</s> add makeRes := func(rcode rules.RCode, rr rules.RRType, v rules.RRValue) (res filtering.Result) {
resp := filtering.DNSRewriteResultResponse{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode_test.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "strconv"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // TODO(a.garipov): Use a proper structured approach here.
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/json.go |
func resultRulesToJSONRules(rules []*filtering.ResultRule) (jsonRules []jobject) { | <mask>
<mask> return jsonEntry
<mask> }
<mask>
<mask> func resultRulesToJSONRules(rules []*dnsfilter.ResultRule) (jsonRules []jobject) {
<mask> jsonRules = make([]jobject, len(rules))
<mask> for i, r := range rules {
<mask> jsonRules[i] = jobject{
<mask> "filter_list_id": r.FilterListID,
<mask> "text": r.Text,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filters = append(filters, dnsfilter.Filter{
</s> add filters = append(filters, filtering.Filter{ </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) </s> remove var whiteFilters []dnsfilter.Filter
filters := []dnsfilter.Filter{{
</s> add var whiteFilters []filtering.Filter
filters := []filtering.Filter{{ </s> remove if !dnsfilter.BlockedSvcKnown(s) {
</s> add if !filtering.BlockedSvcKnown(s) { </s> remove filters := []dnsfilter.Filter{{
</s> add filters := []filtering.Filter{{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/json.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "strings"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> const (
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/qlog.go |
Result filtering.Result | <mask>
<mask> Answer []byte `json:",omitempty"` // sometimes empty answers happen like binerdunt.top or rev2.globalrootservers.net
<mask> OrigAnswer []byte `json:",omitempty"`
<mask>
<mask> Result dnsfilter.Result
<mask> Elapsed time.Duration
<mask> Upstream string `json:",omitempty"` // if empty, means it was cached
<mask> }
<mask>
<mask> func (l *queryLog) Start() {
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove Result *dnsfilter.Result // Filtering result (optional)
</s> add Result *filtering.Result // Filtering result (optional) </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of filtering features </s> remove result *dnsfilter.Result
</s> add result *filtering.Result </s> remove s = createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s = createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove if result.Reason == dnsfilter.FilteredSafeSearch &&
</s> add if result.Reason == filtering.FilteredSafeSearch && | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/qlog.go |
params.Result = &filtering.Result{} | <mask> return
<mask> }
<mask>
<mask> if params.Result == nil {
<mask> params.Result = &dnsfilter.Result{}
<mask> }
<mask>
<mask> now := time.Now()
<mask> entry := logEntry{
<mask> IP: l.getClientIP(params.ClientIP),
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ctx.result = &dnsfilter.Result{}
</s> add ctx.result = &filtering.Result{} </s> remove ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
</s> add ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} </s> remove ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
</s> add ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} </s> remove } else if res.Reason == dnsfilter.RewrittenRule {
</s> add } else if res.Reason == filtering.RewrittenRule { </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/qlog.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxyutil"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/qlog_test.go |
res := filtering.Result{ | <mask> },
<mask> A: answerStr,
<mask> }},
<mask> }
<mask> res := dnsfilter.Result{
<mask> IsFiltered: true,
<mask> Reason: dnsfilter.Rewritten,
<mask> ServiceName: "SomeService",
<mask> Rules: []*dnsfilter.ResultRule{{
<mask> FilterListID: 1,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove Reason: dnsfilter.Rewritten,
</s> add Reason: filtering.Rewritten, </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ </s> remove Reason: dnsfilter.FilteredBlockList,
</s> add Reason: filtering.FilteredBlockList, </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ </s> remove Result: dnsfilter.Result{
</s> add Result: filtering.Result{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/qlog_test.go |
Reason: filtering.Rewritten, | <mask> }},
<mask> }
<mask> res := dnsfilter.Result{
<mask> IsFiltered: true,
<mask> Reason: dnsfilter.Rewritten,
<mask> ServiceName: "SomeService",
<mask> Rules: []*dnsfilter.ResultRule{{
<mask> FilterListID: 1,
<mask> Text: "SomeRule",
<mask> }},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ </s> remove res := dnsfilter.Result{
</s> add res := filtering.Result{ </s> remove Reason: dnsfilter.FilteredBlockList,
</s> add Reason: filtering.FilteredBlockList, </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ </s> remove Result: dnsfilter.Result{
</s> add Result: filtering.Result{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/qlog_test.go |
Rules: []*filtering.ResultRule{{ | <mask> res := dnsfilter.Result{
<mask> IsFiltered: true,
<mask> Reason: dnsfilter.Rewritten,
<mask> ServiceName: "SomeService",
<mask> Rules: []*dnsfilter.ResultRule{{
<mask> FilterListID: 1,
<mask> Text: "SomeRule",
<mask> }},
<mask> }
<mask> params := AddParams{
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove Reason: dnsfilter.Rewritten,
</s> add Reason: filtering.Rewritten, </s> remove res := dnsfilter.Result{
</s> add res := filtering.Result{ </s> remove Reason: dnsfilter.FilteredBlockList,
</s> add Reason: filtering.FilteredBlockList, </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ </s> remove Result: dnsfilter.Result{
</s> add Result: filtering.Result{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/qlog_test.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "path/filepath"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // QueryLog - main interface
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/querylog.go |
Result *filtering.Result // Filtering result (optional) | <mask> type AddParams struct {
<mask> Question *dns.Msg
<mask> Answer *dns.Msg // The response we sent to the client (optional)
<mask> OrigAnswer *dns.Msg // The response from an upstream server (optional)
<mask> Result *dnsfilter.Result // Filtering result (optional)
<mask> Elapsed time.Duration // Time spent for processing the request
<mask> ClientID string
<mask> ClientIP net.IP
<mask> Upstream string // Upstream server URL
<mask> ClientProto ClientProto
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove result *dnsfilter.Result
</s> add result *filtering.Result </s> remove setts *dnsfilter.FilteringSettings
</s> add setts *filtering.Settings </s> remove Result dnsfilter.Result
</s> add Result filtering.Result </s> remove dnsFilter *dnsfilter.DNSFilter // DNS filter instance
</s> add dnsFilter *filtering.DNSFilter // DNS filter instance </s> remove case dnsfilter.NotFilteredAllowList:
</s> add case filtering.NotFilteredAllowList: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/querylog.go |
"github.com/AdguardTeam/AdGuardHome/internal/filtering" | <mask> "strings"
<mask> "unicode"
<mask> "unicode/utf8"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> )
<mask>
<mask> type criterionType int
<mask>
<mask> const (
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/searchcriterion.go |
func (c *searchCriterion) ctFilteringStatusCase(res filtering.Result) bool { | <mask>
<mask> return c.ctDomainOrClientCaseNonStrict(term, clientID, name, host, ip)
<mask> }
<mask>
<mask> func (c *searchCriterion) ctFilteringStatusCase(res dnsfilter.Result) bool {
<mask> switch c.value {
<mask> case filteringStatusAll:
<mask> return true
<mask>
<mask> case filteringStatusFiltered:
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove dnsfilter.NotFilteredAllowList,
dnsfilter.Rewritten,
dnsfilter.RewrittenAutoHosts,
dnsfilter.RewrittenRule,
</s> add filtering.NotFilteredAllowList,
filtering.Rewritten,
filtering.RewrittenAutoHosts,
filtering.RewrittenRule, </s> remove case dnsfilter.FilteredSafeBrowsing:
</s> add case filtering.FilteredSafeBrowsing: </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
</s> add return res.IsFiltered && res.Reason == filtering.FilteredSafeBrowsing </s> remove return res.Reason == dnsfilter.NotFilteredAllowList
</s> add return res.Reason == filtering.NotFilteredAllowList | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/searchcriterion.go |
filtering.NotFilteredAllowList,
filtering.Rewritten,
filtering.RewrittenAutoHosts,
filtering.RewrittenRule, | <mask>
<mask> case filteringStatusFiltered:
<mask> return res.IsFiltered ||
<mask> res.Reason.In(
<mask> dnsfilter.NotFilteredAllowList,
<mask> dnsfilter.Rewritten,
<mask> dnsfilter.RewrittenAutoHosts,
<mask> dnsfilter.RewrittenRule,
<mask> )
<mask>
<mask> case filteringStatusBlocked:
<mask> return res.IsFiltered &&
<mask> res.Reason.In(dnsfilter.FilteredBlockList, dnsfilter.FilteredBlockedService)
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove res.Reason.In(dnsfilter.FilteredBlockList, dnsfilter.FilteredBlockedService)
</s> add res.Reason.In(filtering.FilteredBlockList, filtering.FilteredBlockedService) </s> remove dnsfilter.Rewritten,
dnsfilter.RewrittenAutoHosts,
dnsfilter.RewrittenRule,
</s> add filtering.Rewritten,
filtering.RewrittenAutoHosts,
filtering.RewrittenRule, </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredBlockedService
</s> add return res.IsFiltered && res.Reason == filtering.FilteredBlockedService </s> remove return res.Reason == dnsfilter.NotFilteredAllowList
</s> add return res.Reason == filtering.NotFilteredAllowList </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
</s> add return res.IsFiltered && res.Reason == filtering.FilteredSafeSearch | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/searchcriterion.go |
res.Reason.In(filtering.FilteredBlockList, filtering.FilteredBlockedService) | <mask> )
<mask>
<mask> case filteringStatusBlocked:
<mask> return res.IsFiltered &&
<mask> res.Reason.In(dnsfilter.FilteredBlockList, dnsfilter.FilteredBlockedService)
<mask>
<mask> case filteringStatusBlockedService:
<mask> return res.IsFiltered && res.Reason == dnsfilter.FilteredBlockedService
<mask>
<mask> case filteringStatusBlockedParental:
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredBlockedService
</s> add return res.IsFiltered && res.Reason == filtering.FilteredBlockedService </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredParental
</s> add return res.IsFiltered && res.Reason == filtering.FilteredParental </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
</s> add return res.IsFiltered && res.Reason == filtering.FilteredSafeBrowsing </s> remove dnsfilter.NotFilteredAllowList,
dnsfilter.Rewritten,
dnsfilter.RewrittenAutoHosts,
dnsfilter.RewrittenRule,
</s> add filtering.NotFilteredAllowList,
filtering.Rewritten,
filtering.RewrittenAutoHosts,
filtering.RewrittenRule, </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
</s> add return res.IsFiltered && res.Reason == filtering.FilteredSafeSearch | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/searchcriterion.go |
return res.IsFiltered && res.Reason == filtering.FilteredBlockedService | <mask> return res.IsFiltered &&
<mask> res.Reason.In(dnsfilter.FilteredBlockList, dnsfilter.FilteredBlockedService)
<mask>
<mask> case filteringStatusBlockedService:
<mask> return res.IsFiltered && res.Reason == dnsfilter.FilteredBlockedService
<mask>
<mask> case filteringStatusBlockedParental:
<mask> return res.IsFiltered && res.Reason == dnsfilter.FilteredParental
<mask>
<mask> case filteringStatusBlockedSafebrowsing:
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredParental
</s> add return res.IsFiltered && res.Reason == filtering.FilteredParental </s> remove res.Reason.In(dnsfilter.FilteredBlockList, dnsfilter.FilteredBlockedService)
</s> add res.Reason.In(filtering.FilteredBlockList, filtering.FilteredBlockedService) </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
</s> add return res.IsFiltered && res.Reason == filtering.FilteredSafeBrowsing </s> remove return res.Reason == dnsfilter.NotFilteredAllowList
</s> add return res.Reason == filtering.NotFilteredAllowList </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
</s> add return res.IsFiltered && res.Reason == filtering.FilteredSafeSearch | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/searchcriterion.go |
return res.IsFiltered && res.Reason == filtering.FilteredParental | <mask> case filteringStatusBlockedService:
<mask> return res.IsFiltered && res.Reason == dnsfilter.FilteredBlockedService
<mask>
<mask> case filteringStatusBlockedParental:
<mask> return res.IsFiltered && res.Reason == dnsfilter.FilteredParental
<mask>
<mask> case filteringStatusBlockedSafebrowsing:
<mask> return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
<mask>
<mask> case filteringStatusWhitelisted:
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredBlockedService
</s> add return res.IsFiltered && res.Reason == filtering.FilteredBlockedService </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
</s> add return res.IsFiltered && res.Reason == filtering.FilteredSafeBrowsing </s> remove res.Reason.In(dnsfilter.FilteredBlockList, dnsfilter.FilteredBlockedService)
</s> add res.Reason.In(filtering.FilteredBlockList, filtering.FilteredBlockedService) </s> remove return res.Reason == dnsfilter.NotFilteredAllowList
</s> add return res.Reason == filtering.NotFilteredAllowList </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
</s> add return res.IsFiltered && res.Reason == filtering.FilteredSafeSearch | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/searchcriterion.go |
return res.IsFiltered && res.Reason == filtering.FilteredSafeBrowsing | <mask> case filteringStatusBlockedParental:
<mask> return res.IsFiltered && res.Reason == dnsfilter.FilteredParental
<mask>
<mask> case filteringStatusBlockedSafebrowsing:
<mask> return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
<mask>
<mask> case filteringStatusWhitelisted:
<mask> return res.Reason == dnsfilter.NotFilteredAllowList
<mask>
<mask> case filteringStatusRewritten:
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredParental
</s> add return res.IsFiltered && res.Reason == filtering.FilteredParental </s> remove return res.Reason == dnsfilter.NotFilteredAllowList
</s> add return res.Reason == filtering.NotFilteredAllowList </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredBlockedService
</s> add return res.IsFiltered && res.Reason == filtering.FilteredBlockedService </s> remove dnsfilter.Rewritten,
dnsfilter.RewrittenAutoHosts,
dnsfilter.RewrittenRule,
</s> add filtering.Rewritten,
filtering.RewrittenAutoHosts,
filtering.RewrittenRule, </s> remove res.Reason.In(dnsfilter.FilteredBlockList, dnsfilter.FilteredBlockedService)
</s> add res.Reason.In(filtering.FilteredBlockList, filtering.FilteredBlockedService) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/searchcriterion.go |
return res.Reason == filtering.NotFilteredAllowList | <mask> case filteringStatusBlockedSafebrowsing:
<mask> return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
<mask>
<mask> case filteringStatusWhitelisted:
<mask> return res.Reason == dnsfilter.NotFilteredAllowList
<mask>
<mask> case filteringStatusRewritten:
<mask> return res.Reason.In(
<mask> dnsfilter.Rewritten,
<mask> dnsfilter.RewrittenAutoHosts,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
</s> add return res.IsFiltered && res.Reason == filtering.FilteredSafeBrowsing </s> remove dnsfilter.Rewritten,
dnsfilter.RewrittenAutoHosts,
dnsfilter.RewrittenRule,
</s> add filtering.Rewritten,
filtering.RewrittenAutoHosts,
filtering.RewrittenRule, </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredParental
</s> add return res.IsFiltered && res.Reason == filtering.FilteredParental </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredBlockedService
</s> add return res.IsFiltered && res.Reason == filtering.FilteredBlockedService </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
</s> add return res.IsFiltered && res.Reason == filtering.FilteredSafeSearch | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/searchcriterion.go |
filtering.Rewritten,
filtering.RewrittenAutoHosts,
filtering.RewrittenRule, | <mask> return res.Reason == dnsfilter.NotFilteredAllowList
<mask>
<mask> case filteringStatusRewritten:
<mask> return res.Reason.In(
<mask> dnsfilter.Rewritten,
<mask> dnsfilter.RewrittenAutoHosts,
<mask> dnsfilter.RewrittenRule,
<mask> )
<mask>
<mask> case filteringStatusSafeSearch:
<mask> return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove return res.Reason == dnsfilter.NotFilteredAllowList
</s> add return res.Reason == filtering.NotFilteredAllowList </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
</s> add return res.IsFiltered && res.Reason == filtering.FilteredSafeSearch </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
</s> add return res.IsFiltered && res.Reason == filtering.FilteredSafeBrowsing </s> remove dnsfilter.NotFilteredAllowList,
dnsfilter.Rewritten,
dnsfilter.RewrittenAutoHosts,
dnsfilter.RewrittenRule,
</s> add filtering.NotFilteredAllowList,
filtering.Rewritten,
filtering.RewrittenAutoHosts,
filtering.RewrittenRule, </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredParental
</s> add return res.IsFiltered && res.Reason == filtering.FilteredParental | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/searchcriterion.go |
return res.IsFiltered && res.Reason == filtering.FilteredSafeSearch | <mask> dnsfilter.RewrittenRule,
<mask> )
<mask>
<mask> case filteringStatusSafeSearch:
<mask> return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
<mask>
<mask> case filteringStatusProcessed:
<mask> return !res.Reason.In(
<mask> dnsfilter.FilteredBlockList,
<mask> dnsfilter.FilteredBlockedService,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove dnsfilter.FilteredBlockList,
dnsfilter.FilteredBlockedService,
dnsfilter.NotFilteredAllowList,
</s> add filtering.FilteredBlockList,
filtering.FilteredBlockedService,
filtering.NotFilteredAllowList, </s> remove dnsfilter.Rewritten,
dnsfilter.RewrittenAutoHosts,
dnsfilter.RewrittenRule,
</s> add filtering.Rewritten,
filtering.RewrittenAutoHosts,
filtering.RewrittenRule, </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredParental
</s> add return res.IsFiltered && res.Reason == filtering.FilteredParental </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
</s> add return res.IsFiltered && res.Reason == filtering.FilteredSafeBrowsing </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredBlockedService
</s> add return res.IsFiltered && res.Reason == filtering.FilteredBlockedService | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/searchcriterion.go |
filtering.FilteredBlockList,
filtering.FilteredBlockedService,
filtering.NotFilteredAllowList, | <mask> return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
<mask>
<mask> case filteringStatusProcessed:
<mask> return !res.Reason.In(
<mask> dnsfilter.FilteredBlockList,
<mask> dnsfilter.FilteredBlockedService,
<mask> dnsfilter.NotFilteredAllowList,
<mask> )
<mask>
<mask> default:
<mask> return false
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <[email protected]>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
</s> add return res.IsFiltered && res.Reason == filtering.FilteredSafeSearch </s> remove dnsfilter.Rewritten,
dnsfilter.RewrittenAutoHosts,
dnsfilter.RewrittenRule,
</s> add filtering.Rewritten,
filtering.RewrittenAutoHosts,
filtering.RewrittenRule, </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredParental
</s> add return res.IsFiltered && res.Reason == filtering.FilteredParental </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredBlockedService
</s> add return res.IsFiltered && res.Reason == filtering.FilteredBlockedService </s> remove return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
</s> add return res.IsFiltered && res.Reason == filtering.FilteredSafeBrowsing | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/searchcriterion.go |
"filter_confirm_delete": "Are you sure you want to delete filter?", | <mask> "client_updated": "Client \"{{key}}\" successfully updated",
<mask> "table_statistics": "Requests count (last 24 hours)",
<mask> "clients_not_found": "No clients found",
<mask> "client_confirm_delete": "Are you sure you want to delete client \"{{key}}\"?",
<mask> "auto_clients_title": "Clients (runtime)",
<mask> "auto_clients_desc": "Data on the clients that use AdGuard Home, but not stored in the configuration"
<mask> } </s> * client: use JSON for filtering/remove_url </s> remove GET_CLIENTS = { path: 'clients', method: 'GET' }
ADD_CLIENT = { path: 'clients/add', method: 'POST' }
DELETE_CLIENT = { path: 'clients/delete', method: 'POST' }
UPDATE_CLIENT = { path: 'clients/update', method: 'POST' }
</s> add GET_CLIENTS = { path: 'clients', method: 'GET' };
ADD_CLIENT = { path: 'clients/add', method: 'POST' };
DELETE_CLIENT = { path: 'clients/delete', method: 'POST' };
UPDATE_CLIENT = { path: 'clients/update', method: 'POST' }; </s> remove const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, </s> remove removeFilter(url) {
</s> add removeFilter(config) { </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f5ac19b592c2a63e52a5e5319e9e8eb687c7410 | client/src/__locales/en.json |
removeFilter(config) { | <mask> };
<mask> return this.makeRequest(path, method, config);
<mask> }
<mask>
<mask> removeFilter(url) {
<mask> const { path, method } = this.FILTERING_REMOVE_FILTER;
<mask> const parameter = 'url';
<mask> const requestBody = `${parameter}=${url}`;
<mask> const config = {
<mask> data: requestBody,
</s> * client: use JSON for filtering/remove_url </s> remove const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); </s> remove GET_CLIENTS = { path: 'clients', method: 'GET' }
ADD_CLIENT = { path: 'clients/add', method: 'POST' }
DELETE_CLIENT = { path: 'clients/delete', method: 'POST' }
UPDATE_CLIENT = { path: 'clients/update', method: 'POST' }
</s> add GET_CLIENTS = { path: 'clients', method: 'GET' };
ADD_CLIENT = { path: 'clients/add', method: 'POST' };
DELETE_CLIENT = { path: 'clients/delete', method: 'POST' };
UPDATE_CLIENT = { path: 'clients/update', method: 'POST' }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f5ac19b592c2a63e52a5e5319e9e8eb687c7410 | client/src/api/Api.js |
const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, | <mask> }
<mask>
<mask> removeFilter(url) {
<mask> const { path, method } = this.FILTERING_REMOVE_FILTER;
<mask> const parameter = 'url';
<mask> const requestBody = `${parameter}=${url}`;
<mask> const config = {
<mask> data: requestBody,
<mask> header: { 'Content-Type': 'text/plain' },
<mask> };
<mask> return this.makeRequest(path, method, config);
<mask> }
<mask>
<mask> setRules(rules) {
</s> * client: use JSON for filtering/remove_url </s> remove removeFilter(url) {
</s> add removeFilter(config) { </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); </s> remove GET_CLIENTS = { path: 'clients', method: 'GET' }
ADD_CLIENT = { path: 'clients/add', method: 'POST' }
DELETE_CLIENT = { path: 'clients/delete', method: 'POST' }
UPDATE_CLIENT = { path: 'clients/update', method: 'POST' }
</s> add GET_CLIENTS = { path: 'clients', method: 'GET' };
ADD_CLIENT = { path: 'clients/add', method: 'POST' };
DELETE_CLIENT = { path: 'clients/delete', method: 'POST' };
UPDATE_CLIENT = { path: 'clients/update', method: 'POST' }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f5ac19b592c2a63e52a5e5319e9e8eb687c7410 | client/src/api/Api.js |
return this.makeRequest(path, method, parameters); | <mask> const config = {
<mask> data: requestBody,
<mask> header: { 'Content-Type': 'text/plain' },
<mask> };
<mask> return this.makeRequest(path, method, config);
<mask> }
<mask>
<mask> setRules(rules) {
<mask> const { path, method } = this.FILTERING_SET_RULES;
<mask> const parameters = {
</s> * client: use JSON for filtering/remove_url </s> remove const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, </s> remove removeFilter(url) {
</s> add removeFilter(config) { </s> remove GET_CLIENTS = { path: 'clients', method: 'GET' }
ADD_CLIENT = { path: 'clients/add', method: 'POST' }
DELETE_CLIENT = { path: 'clients/delete', method: 'POST' }
UPDATE_CLIENT = { path: 'clients/update', method: 'POST' }
</s> add GET_CLIENTS = { path: 'clients', method: 'GET' };
ADD_CLIENT = { path: 'clients/add', method: 'POST' };
DELETE_CLIENT = { path: 'clients/delete', method: 'POST' };
UPDATE_CLIENT = { path: 'clients/update', method: 'POST' }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f5ac19b592c2a63e52a5e5319e9e8eb687c7410 | client/src/api/Api.js |
GET_CLIENTS = { path: 'clients', method: 'GET' };
ADD_CLIENT = { path: 'clients/add', method: 'POST' };
DELETE_CLIENT = { path: 'clients/delete', method: 'POST' };
UPDATE_CLIENT = { path: 'clients/update', method: 'POST' }; | <mask> return this.makeRequest(path, method, parameters);
<mask> }
<mask>
<mask> // Per-client settings
<mask> GET_CLIENTS = { path: 'clients', method: 'GET' }
<mask> ADD_CLIENT = { path: 'clients/add', method: 'POST' }
<mask> DELETE_CLIENT = { path: 'clients/delete', method: 'POST' }
<mask> UPDATE_CLIENT = { path: 'clients/update', method: 'POST' }
<mask>
<mask> getClients() {
<mask> const { path, method } = this.GET_CLIENTS;
<mask> return this.makeRequest(path, method);
<mask> }
</s> * client: use JSON for filtering/remove_url </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); </s> remove removeFilter(url) {
</s> add removeFilter(config) { </s> remove const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f5ac19b592c2a63e52a5e5319e9e8eb687c7410 | client/src/api/Api.js |
handleDelete = (url) => {
// eslint-disable-next-line no-alert
if (window.confirm(this.props.t('filter_confirm_delete'))) {
this.props.removeFilter({ url });
}
}
| <mask> };
<mask>
<mask> columns = [{
<mask> Header: <Trans>enabled_table_header</Trans>,
<mask> accessor: 'enabled',
<mask> Cell: this.renderCheckbox,
</s> * client: use JSON for filtering/remove_url </s> remove GET_CLIENTS = { path: 'clients', method: 'GET' }
ADD_CLIENT = { path: 'clients/add', method: 'POST' }
DELETE_CLIENT = { path: 'clients/delete', method: 'POST' }
UPDATE_CLIENT = { path: 'clients/update', method: 'POST' }
</s> add GET_CLIENTS = { path: 'clients', method: 'GET' };
ADD_CLIENT = { path: 'clients/add', method: 'POST' };
DELETE_CLIENT = { path: 'clients/delete', method: 'POST' };
UPDATE_CLIENT = { path: 'clients/update', method: 'POST' }; </s> remove onClick={() => this.props.removeFilter(value)}
</s> add onClick={() => this.handleDelete(value)} </s> remove removeFilter(url) {
</s> add removeFilter(config) { </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); </s> remove const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f5ac19b592c2a63e52a5e5319e9e8eb687c7410 | client/src/components/Filters/index.js |
onClick={() => this.handleDelete(value)} | <mask> Cell: ({ value }) => (
<mask> <button
<mask> type="button"
<mask> className="btn btn-icon btn-outline-secondary btn-sm"
<mask> onClick={() => this.props.removeFilter(value)}
<mask> title={this.props.t('delete_table_action')}
<mask> >
<mask> <svg className="icons">
<mask> <use xlinkHref="#delete" />
<mask> </svg>
</s> * client: use JSON for filtering/remove_url </s> remove GET_CLIENTS = { path: 'clients', method: 'GET' }
ADD_CLIENT = { path: 'clients/add', method: 'POST' }
DELETE_CLIENT = { path: 'clients/delete', method: 'POST' }
UPDATE_CLIENT = { path: 'clients/update', method: 'POST' }
</s> add GET_CLIENTS = { path: 'clients', method: 'GET' };
ADD_CLIENT = { path: 'clients/add', method: 'POST' };
DELETE_CLIENT = { path: 'clients/delete', method: 'POST' };
UPDATE_CLIENT = { path: 'clients/update', method: 'POST' }; </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); </s> remove const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, </s> remove removeFilter(url) {
</s> add removeFilter(config) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f5ac19b592c2a63e52a5e5319e9e8eb687c7410 | client/src/components/Filters/index.js |
<mask> package dnsfilter
<mask>
<mask> import (
<mask> "bufio"
<mask> "bytes"
<mask> "context"
<mask> "crypto/sha256"
<mask> "encoding/binary"
<mask> "encoding/gob"
</s> + dnsfilter: use AG DNS server for SB/PC services
* move SS/SB/PC services to security.go
* remove old useless code (HTTP client) </s> remove "context"
"crypto/sha256"
"encoding/binary"
"encoding/gob"
"encoding/json"
</s> add </s> remove "net/http"
"net/http/httptest"
</s> add </s> remove // check safeSearch if no match
</s> add </s> remove /*
expire byte[4]
res Result
*/
func (d *Dnsfilter) setCacheResult(cache cache.Cache, host string, res Result) {
var buf bytes.Buffer
expire := uint(time.Now().Unix()) + d.Config.CacheTime*60
var exp []byte
exp = make([]byte, 4)
binary.BigEndian.PutUint32(exp, uint32(expire))
_, _ = buf.Write(exp)
enc := gob.NewEncoder(&buf)
err := enc.Encode(res)
if err != nil {
log.Error("gob.Encode(): %s", err)
return
}
_ = cache.Set([]byte(host), buf.Bytes())
log.Debug("Stored in cache %p: %s", cache, host)
}
func getCachedResult(cache cache.Cache, host string) (Result, bool) {
data := cache.Get([]byte(host))
if data == nil {
return Result{}, false
}
exp := int(binary.BigEndian.Uint32(data[:4]))
if exp <= int(time.Now().Unix()) {
cache.Del([]byte(host))
return Result{}, false
}
var buf bytes.Buffer
buf.Write(data[4:])
dec := gob.NewDecoder(&buf)
r := Result{}
err := dec.Decode(&r)
if err != nil {
log.Debug("gob.Decode(): %s", err)
return Result{}, false
}
return r, true
}
// for each dot, hash it and add it to string
func hostnameToHashParam(host string, addslash bool) (string, map[string]bool) {
var hashparam bytes.Buffer
hashes := map[string]bool{}
tld, icann := publicsuffix.PublicSuffix(host)
if !icann {
// private suffixes like cloudfront.net
tld = ""
}
curhost := host
for {
if curhost == "" {
// we've reached end of string
break
}
if tld != "" && curhost == tld {
// we've reached the TLD, don't hash it
break
}
tohash := []byte(curhost)
if addslash {
tohash = append(tohash, '/')
}
sum := sha256.Sum256(tohash)
hexhash := fmt.Sprintf("%X", sum)
hashes[hexhash] = true
hashparam.WriteString(fmt.Sprintf("%02X%02X%02X%02X/", sum[0], sum[1], sum[2], sum[3]))
pos := strings.IndexByte(curhost, byte('.'))
if pos < 0 {
break
}
curhost = curhost[pos+1:]
}
return hashparam.String(), hashes
}
func (d *Dnsfilter) checkSafeSearch(host string) (Result, error) {
if log.GetLevel() >= log.DEBUG {
timer := log.StartTimer()
defer timer.LogElapsed("SafeSearch HTTP lookup for %s", host)
}
// Check cache. Return cached result if it was found
cachedValue, isFound := getCachedResult(gctx.safeSearchCache, host)
if isFound {
atomic.AddUint64(&gctx.stats.Safesearch.CacheHits, 1)
log.Tracef("%s: found in SafeSearch cache", host)
return cachedValue, nil
}
safeHost, ok := d.SafeSearchDomain(host)
if !ok {
return Result{}, nil
}
res := Result{IsFiltered: true, Reason: FilteredSafeSearch}
if ip := net.ParseIP(safeHost); ip != nil {
res.IP = ip
d.setCacheResult(gctx.safeSearchCache, host, res)
return res, nil
}
// TODO this address should be resolved with upstream that was configured in dnsforward
addrs, err := net.LookupIP(safeHost)
if err != nil {
log.Tracef("SafeSearchDomain for %s was found but failed to lookup for %s cause %s", host, safeHost, err)
return Result{}, err
}
for _, i := range addrs {
if ipv4 := i.To4(); ipv4 != nil {
res.IP = ipv4
break
}
}
if len(res.IP) == 0 {
return Result{}, fmt.Errorf("no ipv4 addresses in safe search response for %s", safeHost)
}
// Cache result
d.setCacheResult(gctx.safeSearchCache, host, res)
return res, nil
}
func (d *Dnsfilter) checkSafeBrowsing(host string) (Result, error) {
if log.GetLevel() >= log.DEBUG {
timer := log.StartTimer()
defer timer.LogElapsed("SafeBrowsing HTTP lookup for %s", host)
}
format := func(hashparam string) string {
schema := "https"
if d.UsePlainHTTP {
schema = "http"
}
url := fmt.Sprintf(defaultSafebrowsingURL, schema, d.safeBrowsingServer, hashparam)
return url
}
handleBody := func(body []byte, hashes map[string]bool) (Result, error) {
result := Result{}
scanner := bufio.NewScanner(strings.NewReader(string(body)))
for scanner.Scan() {
line := scanner.Text()
splitted := strings.Split(line, ":")
if len(splitted) < 3 {
continue
}
hash := splitted[2]
if _, ok := hashes[hash]; ok {
// it's in the hash
result.IsFiltered = true
result.Reason = FilteredSafeBrowsing
result.Rule = splitted[0]
break
}
}
if err := scanner.Err(); err != nil {
// error, don't save cache
return Result{}, err
}
return result, nil
}
// check cache
cachedValue, isFound := getCachedResult(gctx.safebrowsingCache, host)
if isFound {
atomic.AddUint64(&gctx.stats.Safebrowsing.CacheHits, 1)
log.Tracef("%s: found in the lookup cache %p", host, gctx.safebrowsingCache)
return cachedValue, nil
}
result, err := d.lookupCommon(host, &gctx.stats.Safebrowsing, true, format, handleBody)
if err == nil {
d.setCacheResult(gctx.safebrowsingCache, host, result)
}
return result, err
}
func (d *Dnsfilter) checkParental(host string) (Result, error) {
if log.GetLevel() >= log.DEBUG {
timer := log.StartTimer()
defer timer.LogElapsed("Parental HTTP lookup for %s", host)
}
format := func(hashparam string) string {
schema := "https"
if d.UsePlainHTTP {
schema = "http"
}
sensitivity := d.ParentalSensitivity
if sensitivity == 0 {
sensitivity = defaultParentalSensitivity
}
url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, sensitivity)
return url
}
handleBody := func(body []byte, hashes map[string]bool) (Result, error) {
// parse json
var m []struct {
Blocked bool `json:"blocked"`
ClientTTL int `json:"clientTtl"`
Reason string `json:"reason"`
Hash string `json:"hash"`
}
err := json.Unmarshal(body, &m)
if err != nil {
// error, don't save cache
log.Printf("Couldn't parse json '%s': %s", body, err)
return Result{}, err
}
result := Result{}
for i := range m {
if !hashes[m[i].Hash] {
continue
}
if m[i].Blocked {
result.IsFiltered = true
result.Reason = FilteredParental
result.Rule = fmt.Sprintf("parental %s", m[i].Reason)
break
}
}
return result, nil
}
// check cache
cachedValue, isFound := getCachedResult(gctx.parentalCache, host)
if isFound {
atomic.AddUint64(&gctx.stats.Parental.CacheHits, 1)
log.Tracef("%s: found in the lookup cache %p", host, gctx.parentalCache)
return cachedValue, nil
}
result, err := d.lookupCommon(host, &gctx.stats.Parental, false, format, handleBody)
if err == nil {
d.setCacheResult(gctx.parentalCache, host, result)
}
return result, err
}
type formatHandler func(hashparam string) string
type bodyHandler func(body []byte, hashes map[string]bool) (Result, error)
// real implementation of lookup/check
func (d *Dnsfilter) lookupCommon(host string, lookupstats *LookupStats, hashparamNeedSlash bool, format formatHandler, handleBody bodyHandler) (Result, error) {
// convert hostname to hash parameters
hashparam, hashes := hostnameToHashParam(host, hashparamNeedSlash)
// format URL with our hashes
url := format(hashparam)
// do HTTP request
atomic.AddUint64(&lookupstats.Requests, 1)
atomic.AddInt64(&lookupstats.Pending, 1)
updateMax(&lookupstats.Pending, &lookupstats.PendingMax)
resp, err := d.client.Get(url)
atomic.AddInt64(&lookupstats.Pending, -1)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
// error, don't save cache
return Result{}, err
}
// get body text
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
// error, don't save cache
return Result{}, err
}
// handle status code
switch {
case resp.StatusCode == 204:
// empty result, save cache
return Result{}, nil
case resp.StatusCode != 200:
return Result{}, fmt.Errorf("HTTP status code: %d", resp.StatusCode)
}
result, err := handleBody(body, hashes)
if err != nil {
return Result{}, err
}
return result, nil
}
</s> add | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f69848084a68cdf1e227a555454991295fc5866 | dnsfilter/dnsfilter.go |
|
<mask>
<mask> import (
<mask> "bufio"
<mask> "bytes"
<mask> "context"
<mask> "crypto/sha256"
<mask> "encoding/binary"
<mask> "encoding/gob"
<mask> "encoding/json"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "net"
<mask> "net/http"
<mask> "os"
</s> + dnsfilter: use AG DNS server for SB/PC services
* move SS/SB/PC services to security.go
* remove old useless code (HTTP client) </s> remove "bufio"
</s> add </s> remove "net/http"
"net/http/httptest"
</s> add </s> remove "sync/atomic"
"time"
"github.com/joomcode/errorx"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f69848084a68cdf1e227a555454991295fc5866 | dnsfilter/dnsfilter.go |
|
<mask> "os"
<mask> "runtime"
<mask> "strings"
<mask> "sync"
<mask> "sync/atomic"
<mask> "time"
<mask>
<mask> "github.com/joomcode/errorx"
<mask>
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/cache"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/urlfilter"
</s> + dnsfilter: use AG DNS server for SB/PC services
* move SS/SB/PC services to security.go
* remove old useless code (HTTP client) </s> remove "github.com/bluele/gcache"
</s> add </s> remove "time"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f69848084a68cdf1e227a555454991295fc5866 | dnsfilter/dnsfilter.go |
|
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/cache"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/urlfilter"
<mask> "github.com/bluele/gcache"
<mask> "github.com/miekg/dns"
<mask> "golang.org/x/net/publicsuffix"
<mask> )
<mask>
<mask> const defaultHTTPTimeout = 5 * time.Minute
</s> + dnsfilter: use AG DNS server for SB/PC services
* move SS/SB/PC services to security.go
* remove old useless code (HTTP client) </s> remove "golang.org/x/net/publicsuffix"
</s> add </s> remove const defaultHTTPTimeout = 5 * time.Minute
const defaultHTTPMaxIdleConnections = 100
const defaultSafebrowsingServer = "sb.adtidy.org"
const defaultSafebrowsingURL = "%s://%s/safebrowsing-lookup-hash.html?prefixes=%s"
const defaultParentalServer = "pctrl.adguard.com"
const defaultParentalURL = "%s://%s/check-parental-control-hash?prefixes=%s&sensitivity=%d"
const defaultParentalSensitivity = 13 // use "TEEN" by default
const maxDialCacheSize = 2 // the number of host names for safebrowsing and parental control
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f69848084a68cdf1e227a555454991295fc5866 | dnsfilter/dnsfilter.go |
|
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/urlfilter"
<mask> "github.com/bluele/gcache"
<mask> "github.com/miekg/dns"
<mask> "golang.org/x/net/publicsuffix"
<mask> )
<mask>
<mask> const defaultHTTPTimeout = 5 * time.Minute
<mask> const defaultHTTPMaxIdleConnections = 100
<mask>
</s> + dnsfilter: use AG DNS server for SB/PC services
* move SS/SB/PC services to security.go
* remove old useless code (HTTP client) </s> remove "github.com/bluele/gcache"
</s> add </s> remove const defaultHTTPTimeout = 5 * time.Minute
const defaultHTTPMaxIdleConnections = 100
const defaultSafebrowsingServer = "sb.adtidy.org"
const defaultSafebrowsingURL = "%s://%s/safebrowsing-lookup-hash.html?prefixes=%s"
const defaultParentalServer = "pctrl.adguard.com"
const defaultParentalURL = "%s://%s/check-parental-control-hash?prefixes=%s&sensitivity=%d"
const defaultParentalSensitivity = 13 // use "TEEN" by default
const maxDialCacheSize = 2 // the number of host names for safebrowsing and parental control
</s> add </s> remove "github.com/bluele/gcache"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f69848084a68cdf1e227a555454991295fc5866 | dnsfilter/dnsfilter.go |
|
<mask> "github.com/miekg/dns"
<mask> "golang.org/x/net/publicsuffix"
<mask> )
<mask>
<mask> const defaultHTTPTimeout = 5 * time.Minute
<mask> const defaultHTTPMaxIdleConnections = 100
<mask>
<mask> const defaultSafebrowsingServer = "sb.adtidy.org"
<mask> const defaultSafebrowsingURL = "%s://%s/safebrowsing-lookup-hash.html?prefixes=%s"
<mask> const defaultParentalServer = "pctrl.adguard.com"
<mask> const defaultParentalURL = "%s://%s/check-parental-control-hash?prefixes=%s&sensitivity=%d"
<mask> const defaultParentalSensitivity = 13 // use "TEEN" by default
<mask> const maxDialCacheSize = 2 // the number of host names for safebrowsing and parental control
<mask>
<mask> // ServiceEntry - blocked service array element
<mask> type ServiceEntry struct {
<mask> Name string
<mask> Rules []*urlfilter.NetworkRule
<mask> }
</s> + dnsfilter: use AG DNS server for SB/PC services
* move SS/SB/PC services to security.go
* remove old useless code (HTTP client) </s> remove "golang.org/x/net/publicsuffix"
</s> add </s> remove "github.com/bluele/gcache"
</s> add </s> remove // Customize the Transport to have larger connection pool,
// We are not (re)using http.DefaultTransport because of race conditions found by tests
d.transport = &http.Transport{
Proxy: http.ProxyFromEnvironment,
MaxIdleConns: defaultHTTPMaxIdleConnections, // default 100
MaxIdleConnsPerHost: defaultHTTPMaxIdleConnections, // default 2
IdleConnTimeout: 90 * time.Second,
TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second,
}
if c != nil && len(c.ResolverAddress) != 0 {
d.transport.DialContext = d.createCustomDialContext(c.ResolverAddress)
}
d.client = http.Client{
Transport: d.transport,
Timeout: defaultHTTPTimeout,
</s> add err := d.initSecurityServices()
if err != nil {
log.Error("dnsfilter: initialize services: %s", err)
return nil </s> remove //
// config manipulation helpers
//
// SetSafeBrowsingServer lets you optionally change hostname of safesearch lookup
func (d *Dnsfilter) SetSafeBrowsingServer(host string) {
if len(host) == 0 {
d.safeBrowsingServer = defaultSafebrowsingServer
} else {
d.safeBrowsingServer = host
}
}
// SetHTTPTimeout lets you optionally change timeout during lookups
func (d *Dnsfilter) SetHTTPTimeout(t time.Duration) {
d.client.Timeout = t
}
// ResetHTTPTimeout resets lookup timeouts
func (d *Dnsfilter) ResetHTTPTimeout() {
d.client.Timeout = defaultHTTPTimeout
}
// SafeSearchDomain returns replacement address for search engine
func (d *Dnsfilter) SafeSearchDomain(host string) (string, bool) {
if d.SafeSearchEnabled {
val, ok := safeSearchDomains[host]
return val, ok
}
return "", false
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f69848084a68cdf1e227a555454991295fc5866 | dnsfilter/dnsfilter.go |
|
<mask> // Config allows you to configure DNS filtering with New() or just change variables directly.
<mask> type Config struct {
<mask> ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
<mask> ParentalEnabled bool `yaml:"parental_enabled"`
<mask> UsePlainHTTP bool `yaml:"-"` // use plain HTTP for requests to parental and safe browsing servers
<mask> SafeSearchEnabled bool `yaml:"safesearch_enabled"`
<mask> SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
<mask> ResolverAddress string `yaml:"-"` // DNS server address
<mask>
<mask> SafeBrowsingCacheSize uint `yaml:"safebrowsing_cache_size"` // (in bytes)
</s> + dnsfilter: use AG DNS server for SB/PC services
* move SS/SB/PC services to security.go
* remove old useless code (HTTP client) </s> remove // HTTP lookups for safebrowsing and parental
client http.Client // handle for http client -- single instance as recommended by docs
transport *http.Transport // handle for http transport used by http client
parentalServer string // access via methods
safeBrowsingServer string // access via methods
</s> add parentalServer string // access via methods
safeBrowsingServer string // access via methods
parentalUpstream upstream.Upstream
safeBrowsingUpstream upstream.Upstream </s> remove const defaultHTTPTimeout = 5 * time.Minute
const defaultHTTPMaxIdleConnections = 100
const defaultSafebrowsingServer = "sb.adtidy.org"
const defaultSafebrowsingURL = "%s://%s/safebrowsing-lookup-hash.html?prefixes=%s"
const defaultParentalServer = "pctrl.adguard.com"
const defaultParentalURL = "%s://%s/check-parental-control-hash?prefixes=%s&sensitivity=%d"
const defaultParentalSensitivity = 13 // use "TEEN" by default
const maxDialCacheSize = 2 // the number of host names for safebrowsing and parental control
</s> add </s> remove dialCache gcache.Cache // "host" -> "IP" cache for safebrowsing and parental control servers
</s> add </s> remove //
// lifecycle helper functions
//
// Return TRUE if this host's IP should be cached
func (d *Dnsfilter) shouldBeInDialCache(host string) bool {
return host == d.safeBrowsingServer ||
host == d.parentalServer
}
// Search for an IP address by host name
func searchInDialCache(host string) string {
rawValue, err := gctx.dialCache.Get(host)
if err != nil {
return ""
}
ip, _ := rawValue.(string)
log.Debug("Found in cache: %s -> %s", host, ip)
return ip
}
// Add "hostname" -> "IP address" entry to cache
func addToDialCache(host, ip string) {
err := gctx.dialCache.Set(host, ip)
if err != nil {
log.Debug("dialCache.Set: %s", err)
}
log.Debug("Added to cache: %s -> %s", host, ip)
}
type dialFunctionType func(ctx context.Context, network, addr string) (net.Conn, error)
// Connect to a remote server resolving hostname using our own DNS server
func (d *Dnsfilter) createCustomDialContext(resolverAddr string) dialFunctionType {
return func(ctx context.Context, network, addr string) (net.Conn, error) {
log.Tracef("network:%v addr:%v", network, addr)
host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
}
dialer := &net.Dialer{
Timeout: time.Minute * 5,
}
if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
}
cache := d.shouldBeInDialCache(host)
if cache {
ip := searchInDialCache(host)
if len(ip) != 0 {
addr = fmt.Sprintf("%s:%s", ip, port)
return dialer.DialContext(ctx, network, addr)
}
}
r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
}
if len(addrs) == 0 {
return nil, fmt.Errorf("couldn't lookup host: %s", host)
}
var dialErrs []error
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
dialErrs = append(dialErrs, err)
continue
}
if cache {
addToDialCache(host, a.String())
}
return con, err
}
return nil, errorx.DecorateMany(fmt.Sprintf("couldn't dial to %s", addr), dialErrs...)
}
}
</s> add </s> remove //
// config manipulation helpers
//
// SetSafeBrowsingServer lets you optionally change hostname of safesearch lookup
func (d *Dnsfilter) SetSafeBrowsingServer(host string) {
if len(host) == 0 {
d.safeBrowsingServer = defaultSafebrowsingServer
} else {
d.safeBrowsingServer = host
}
}
// SetHTTPTimeout lets you optionally change timeout during lookups
func (d *Dnsfilter) SetHTTPTimeout(t time.Duration) {
d.client.Timeout = t
}
// ResetHTTPTimeout resets lookup timeouts
func (d *Dnsfilter) ResetHTTPTimeout() {
d.client.Timeout = defaultHTTPTimeout
}
// SafeSearchDomain returns replacement address for search engine
func (d *Dnsfilter) SafeSearchDomain(host string) (string, bool) {
if d.SafeSearchEnabled {
val, ok := safeSearchDomains[host]
return val, ok
}
return "", false
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f69848084a68cdf1e227a555454991295fc5866 | dnsfilter/dnsfilter.go |
|
parentalServer string // access via methods
safeBrowsingServer string // access via methods
parentalUpstream upstream.Upstream
safeBrowsingUpstream upstream.Upstream | <mask> rulesStorage *urlfilter.RuleStorage
<mask> filteringEngine *urlfilter.DNSEngine
<mask> engineLock sync.RWMutex
<mask>
<mask> // HTTP lookups for safebrowsing and parental
<mask> client http.Client // handle for http client -- single instance as recommended by docs
<mask> transport *http.Transport // handle for http transport used by http client
<mask>
<mask> parentalServer string // access via methods
<mask> safeBrowsingServer string // access via methods
<mask>
<mask> Config // for direct access by library users, even a = assignment
<mask> confLock sync.RWMutex
<mask>
<mask> // Channel for passing data to filters-initializer goroutine
</s> + dnsfilter: use AG DNS server for SB/PC services
* move SS/SB/PC services to security.go
* remove old useless code (HTTP client) </s> remove const defaultHTTPTimeout = 5 * time.Minute
const defaultHTTPMaxIdleConnections = 100
const defaultSafebrowsingServer = "sb.adtidy.org"
const defaultSafebrowsingURL = "%s://%s/safebrowsing-lookup-hash.html?prefixes=%s"
const defaultParentalServer = "pctrl.adguard.com"
const defaultParentalURL = "%s://%s/check-parental-control-hash?prefixes=%s&sensitivity=%d"
const defaultParentalSensitivity = 13 // use "TEEN" by default
const maxDialCacheSize = 2 // the number of host names for safebrowsing and parental control
</s> add </s> remove UsePlainHTTP bool `yaml:"-"` // use plain HTTP for requests to parental and safe browsing servers
</s> add </s> remove dialCache gcache.Cache // "host" -> "IP" cache for safebrowsing and parental control servers
</s> add </s> remove // nothing matched, return nothing
</s> add </s> remove /*
expire byte[4]
res Result
*/
func (d *Dnsfilter) setCacheResult(cache cache.Cache, host string, res Result) {
var buf bytes.Buffer
expire := uint(time.Now().Unix()) + d.Config.CacheTime*60
var exp []byte
exp = make([]byte, 4)
binary.BigEndian.PutUint32(exp, uint32(expire))
_, _ = buf.Write(exp)
enc := gob.NewEncoder(&buf)
err := enc.Encode(res)
if err != nil {
log.Error("gob.Encode(): %s", err)
return
}
_ = cache.Set([]byte(host), buf.Bytes())
log.Debug("Stored in cache %p: %s", cache, host)
}
func getCachedResult(cache cache.Cache, host string) (Result, bool) {
data := cache.Get([]byte(host))
if data == nil {
return Result{}, false
}
exp := int(binary.BigEndian.Uint32(data[:4]))
if exp <= int(time.Now().Unix()) {
cache.Del([]byte(host))
return Result{}, false
}
var buf bytes.Buffer
buf.Write(data[4:])
dec := gob.NewDecoder(&buf)
r := Result{}
err := dec.Decode(&r)
if err != nil {
log.Debug("gob.Decode(): %s", err)
return Result{}, false
}
return r, true
}
// for each dot, hash it and add it to string
func hostnameToHashParam(host string, addslash bool) (string, map[string]bool) {
var hashparam bytes.Buffer
hashes := map[string]bool{}
tld, icann := publicsuffix.PublicSuffix(host)
if !icann {
// private suffixes like cloudfront.net
tld = ""
}
curhost := host
for {
if curhost == "" {
// we've reached end of string
break
}
if tld != "" && curhost == tld {
// we've reached the TLD, don't hash it
break
}
tohash := []byte(curhost)
if addslash {
tohash = append(tohash, '/')
}
sum := sha256.Sum256(tohash)
hexhash := fmt.Sprintf("%X", sum)
hashes[hexhash] = true
hashparam.WriteString(fmt.Sprintf("%02X%02X%02X%02X/", sum[0], sum[1], sum[2], sum[3]))
pos := strings.IndexByte(curhost, byte('.'))
if pos < 0 {
break
}
curhost = curhost[pos+1:]
}
return hashparam.String(), hashes
}
func (d *Dnsfilter) checkSafeSearch(host string) (Result, error) {
if log.GetLevel() >= log.DEBUG {
timer := log.StartTimer()
defer timer.LogElapsed("SafeSearch HTTP lookup for %s", host)
}
// Check cache. Return cached result if it was found
cachedValue, isFound := getCachedResult(gctx.safeSearchCache, host)
if isFound {
atomic.AddUint64(&gctx.stats.Safesearch.CacheHits, 1)
log.Tracef("%s: found in SafeSearch cache", host)
return cachedValue, nil
}
safeHost, ok := d.SafeSearchDomain(host)
if !ok {
return Result{}, nil
}
res := Result{IsFiltered: true, Reason: FilteredSafeSearch}
if ip := net.ParseIP(safeHost); ip != nil {
res.IP = ip
d.setCacheResult(gctx.safeSearchCache, host, res)
return res, nil
}
// TODO this address should be resolved with upstream that was configured in dnsforward
addrs, err := net.LookupIP(safeHost)
if err != nil {
log.Tracef("SafeSearchDomain for %s was found but failed to lookup for %s cause %s", host, safeHost, err)
return Result{}, err
}
for _, i := range addrs {
if ipv4 := i.To4(); ipv4 != nil {
res.IP = ipv4
break
}
}
if len(res.IP) == 0 {
return Result{}, fmt.Errorf("no ipv4 addresses in safe search response for %s", safeHost)
}
// Cache result
d.setCacheResult(gctx.safeSearchCache, host, res)
return res, nil
}
func (d *Dnsfilter) checkSafeBrowsing(host string) (Result, error) {
if log.GetLevel() >= log.DEBUG {
timer := log.StartTimer()
defer timer.LogElapsed("SafeBrowsing HTTP lookup for %s", host)
}
format := func(hashparam string) string {
schema := "https"
if d.UsePlainHTTP {
schema = "http"
}
url := fmt.Sprintf(defaultSafebrowsingURL, schema, d.safeBrowsingServer, hashparam)
return url
}
handleBody := func(body []byte, hashes map[string]bool) (Result, error) {
result := Result{}
scanner := bufio.NewScanner(strings.NewReader(string(body)))
for scanner.Scan() {
line := scanner.Text()
splitted := strings.Split(line, ":")
if len(splitted) < 3 {
continue
}
hash := splitted[2]
if _, ok := hashes[hash]; ok {
// it's in the hash
result.IsFiltered = true
result.Reason = FilteredSafeBrowsing
result.Rule = splitted[0]
break
}
}
if err := scanner.Err(); err != nil {
// error, don't save cache
return Result{}, err
}
return result, nil
}
// check cache
cachedValue, isFound := getCachedResult(gctx.safebrowsingCache, host)
if isFound {
atomic.AddUint64(&gctx.stats.Safebrowsing.CacheHits, 1)
log.Tracef("%s: found in the lookup cache %p", host, gctx.safebrowsingCache)
return cachedValue, nil
}
result, err := d.lookupCommon(host, &gctx.stats.Safebrowsing, true, format, handleBody)
if err == nil {
d.setCacheResult(gctx.safebrowsingCache, host, result)
}
return result, err
}
func (d *Dnsfilter) checkParental(host string) (Result, error) {
if log.GetLevel() >= log.DEBUG {
timer := log.StartTimer()
defer timer.LogElapsed("Parental HTTP lookup for %s", host)
}
format := func(hashparam string) string {
schema := "https"
if d.UsePlainHTTP {
schema = "http"
}
sensitivity := d.ParentalSensitivity
if sensitivity == 0 {
sensitivity = defaultParentalSensitivity
}
url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, sensitivity)
return url
}
handleBody := func(body []byte, hashes map[string]bool) (Result, error) {
// parse json
var m []struct {
Blocked bool `json:"blocked"`
ClientTTL int `json:"clientTtl"`
Reason string `json:"reason"`
Hash string `json:"hash"`
}
err := json.Unmarshal(body, &m)
if err != nil {
// error, don't save cache
log.Printf("Couldn't parse json '%s': %s", body, err)
return Result{}, err
}
result := Result{}
for i := range m {
if !hashes[m[i].Hash] {
continue
}
if m[i].Blocked {
result.IsFiltered = true
result.Reason = FilteredParental
result.Rule = fmt.Sprintf("parental %s", m[i].Reason)
break
}
}
return result, nil
}
// check cache
cachedValue, isFound := getCachedResult(gctx.parentalCache, host)
if isFound {
atomic.AddUint64(&gctx.stats.Parental.CacheHits, 1)
log.Tracef("%s: found in the lookup cache %p", host, gctx.parentalCache)
return cachedValue, nil
}
result, err := d.lookupCommon(host, &gctx.stats.Parental, false, format, handleBody)
if err == nil {
d.setCacheResult(gctx.parentalCache, host, result)
}
return result, err
}
type formatHandler func(hashparam string) string
type bodyHandler func(body []byte, hashes map[string]bool) (Result, error)
// real implementation of lookup/check
func (d *Dnsfilter) lookupCommon(host string, lookupstats *LookupStats, hashparamNeedSlash bool, format formatHandler, handleBody bodyHandler) (Result, error) {
// convert hostname to hash parameters
hashparam, hashes := hostnameToHashParam(host, hashparamNeedSlash)
// format URL with our hashes
url := format(hashparam)
// do HTTP request
atomic.AddUint64(&lookupstats.Requests, 1)
atomic.AddInt64(&lookupstats.Pending, 1)
updateMax(&lookupstats.Pending, &lookupstats.PendingMax)
resp, err := d.client.Get(url)
atomic.AddInt64(&lookupstats.Pending, -1)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
// error, don't save cache
return Result{}, err
}
// get body text
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
// error, don't save cache
return Result{}, err
}
// handle status code
switch {
case resp.StatusCode == 204:
// empty result, save cache
return Result{}, nil
case resp.StatusCode != 200:
return Result{}, fmt.Errorf("HTTP status code: %d", resp.StatusCode)
}
result, err := handleBody(body, hashes)
if err != nil {
return Result{}, err
}
return result, nil
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f69848084a68cdf1e227a555454991295fc5866 | dnsfilter/dnsfilter.go |
<mask> }
<mask>
<mask> // Close - close the object
<mask> func (d *Dnsfilter) Close() {
<mask> if d != nil && d.transport != nil {
<mask> d.transport.CloseIdleConnections()
<mask> }
<mask> if d.rulesStorage != nil {
<mask> d.rulesStorage.Close()
<mask> }
<mask> }
<mask>
</s> + dnsfilter: use AG DNS server for SB/PC services
* move SS/SB/PC services to security.go
* remove old useless code (HTTP client) </s> remove // Customize the Transport to have larger connection pool,
// We are not (re)using http.DefaultTransport because of race conditions found by tests
d.transport = &http.Transport{
Proxy: http.ProxyFromEnvironment,
MaxIdleConns: defaultHTTPMaxIdleConnections, // default 100
MaxIdleConnsPerHost: defaultHTTPMaxIdleConnections, // default 2
IdleConnTimeout: 90 * time.Second,
TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second,
}
if c != nil && len(c.ResolverAddress) != 0 {
d.transport.DialContext = d.createCustomDialContext(c.ResolverAddress)
}
d.client = http.Client{
Transport: d.transport,
Timeout: defaultHTTPTimeout,
</s> add err := d.initSecurityServices()
if err != nil {
log.Error("dnsfilter: initialize services: %s", err)
return nil </s> remove
if len(c.ResolverAddress) != 0 && gctx.dialCache == nil {
dur := time.Duration(c.CacheTime) * time.Minute
gctx.dialCache = gcache.New(maxDialCacheSize).LRU().Expiration(dur).Build()
}
</s> add </s> remove /*
expire byte[4]
res Result
*/
func (d *Dnsfilter) setCacheResult(cache cache.Cache, host string, res Result) {
var buf bytes.Buffer
expire := uint(time.Now().Unix()) + d.Config.CacheTime*60
var exp []byte
exp = make([]byte, 4)
binary.BigEndian.PutUint32(exp, uint32(expire))
_, _ = buf.Write(exp)
enc := gob.NewEncoder(&buf)
err := enc.Encode(res)
if err != nil {
log.Error("gob.Encode(): %s", err)
return
}
_ = cache.Set([]byte(host), buf.Bytes())
log.Debug("Stored in cache %p: %s", cache, host)
}
func getCachedResult(cache cache.Cache, host string) (Result, bool) {
data := cache.Get([]byte(host))
if data == nil {
return Result{}, false
}
exp := int(binary.BigEndian.Uint32(data[:4]))
if exp <= int(time.Now().Unix()) {
cache.Del([]byte(host))
return Result{}, false
}
var buf bytes.Buffer
buf.Write(data[4:])
dec := gob.NewDecoder(&buf)
r := Result{}
err := dec.Decode(&r)
if err != nil {
log.Debug("gob.Decode(): %s", err)
return Result{}, false
}
return r, true
}
// for each dot, hash it and add it to string
func hostnameToHashParam(host string, addslash bool) (string, map[string]bool) {
var hashparam bytes.Buffer
hashes := map[string]bool{}
tld, icann := publicsuffix.PublicSuffix(host)
if !icann {
// private suffixes like cloudfront.net
tld = ""
}
curhost := host
for {
if curhost == "" {
// we've reached end of string
break
}
if tld != "" && curhost == tld {
// we've reached the TLD, don't hash it
break
}
tohash := []byte(curhost)
if addslash {
tohash = append(tohash, '/')
}
sum := sha256.Sum256(tohash)
hexhash := fmt.Sprintf("%X", sum)
hashes[hexhash] = true
hashparam.WriteString(fmt.Sprintf("%02X%02X%02X%02X/", sum[0], sum[1], sum[2], sum[3]))
pos := strings.IndexByte(curhost, byte('.'))
if pos < 0 {
break
}
curhost = curhost[pos+1:]
}
return hashparam.String(), hashes
}
func (d *Dnsfilter) checkSafeSearch(host string) (Result, error) {
if log.GetLevel() >= log.DEBUG {
timer := log.StartTimer()
defer timer.LogElapsed("SafeSearch HTTP lookup for %s", host)
}
// Check cache. Return cached result if it was found
cachedValue, isFound := getCachedResult(gctx.safeSearchCache, host)
if isFound {
atomic.AddUint64(&gctx.stats.Safesearch.CacheHits, 1)
log.Tracef("%s: found in SafeSearch cache", host)
return cachedValue, nil
}
safeHost, ok := d.SafeSearchDomain(host)
if !ok {
return Result{}, nil
}
res := Result{IsFiltered: true, Reason: FilteredSafeSearch}
if ip := net.ParseIP(safeHost); ip != nil {
res.IP = ip
d.setCacheResult(gctx.safeSearchCache, host, res)
return res, nil
}
// TODO this address should be resolved with upstream that was configured in dnsforward
addrs, err := net.LookupIP(safeHost)
if err != nil {
log.Tracef("SafeSearchDomain for %s was found but failed to lookup for %s cause %s", host, safeHost, err)
return Result{}, err
}
for _, i := range addrs {
if ipv4 := i.To4(); ipv4 != nil {
res.IP = ipv4
break
}
}
if len(res.IP) == 0 {
return Result{}, fmt.Errorf("no ipv4 addresses in safe search response for %s", safeHost)
}
// Cache result
d.setCacheResult(gctx.safeSearchCache, host, res)
return res, nil
}
func (d *Dnsfilter) checkSafeBrowsing(host string) (Result, error) {
if log.GetLevel() >= log.DEBUG {
timer := log.StartTimer()
defer timer.LogElapsed("SafeBrowsing HTTP lookup for %s", host)
}
format := func(hashparam string) string {
schema := "https"
if d.UsePlainHTTP {
schema = "http"
}
url := fmt.Sprintf(defaultSafebrowsingURL, schema, d.safeBrowsingServer, hashparam)
return url
}
handleBody := func(body []byte, hashes map[string]bool) (Result, error) {
result := Result{}
scanner := bufio.NewScanner(strings.NewReader(string(body)))
for scanner.Scan() {
line := scanner.Text()
splitted := strings.Split(line, ":")
if len(splitted) < 3 {
continue
}
hash := splitted[2]
if _, ok := hashes[hash]; ok {
// it's in the hash
result.IsFiltered = true
result.Reason = FilteredSafeBrowsing
result.Rule = splitted[0]
break
}
}
if err := scanner.Err(); err != nil {
// error, don't save cache
return Result{}, err
}
return result, nil
}
// check cache
cachedValue, isFound := getCachedResult(gctx.safebrowsingCache, host)
if isFound {
atomic.AddUint64(&gctx.stats.Safebrowsing.CacheHits, 1)
log.Tracef("%s: found in the lookup cache %p", host, gctx.safebrowsingCache)
return cachedValue, nil
}
result, err := d.lookupCommon(host, &gctx.stats.Safebrowsing, true, format, handleBody)
if err == nil {
d.setCacheResult(gctx.safebrowsingCache, host, result)
}
return result, err
}
func (d *Dnsfilter) checkParental(host string) (Result, error) {
if log.GetLevel() >= log.DEBUG {
timer := log.StartTimer()
defer timer.LogElapsed("Parental HTTP lookup for %s", host)
}
format := func(hashparam string) string {
schema := "https"
if d.UsePlainHTTP {
schema = "http"
}
sensitivity := d.ParentalSensitivity
if sensitivity == 0 {
sensitivity = defaultParentalSensitivity
}
url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, sensitivity)
return url
}
handleBody := func(body []byte, hashes map[string]bool) (Result, error) {
// parse json
var m []struct {
Blocked bool `json:"blocked"`
ClientTTL int `json:"clientTtl"`
Reason string `json:"reason"`
Hash string `json:"hash"`
}
err := json.Unmarshal(body, &m)
if err != nil {
// error, don't save cache
log.Printf("Couldn't parse json '%s': %s", body, err)
return Result{}, err
}
result := Result{}
for i := range m {
if !hashes[m[i].Hash] {
continue
}
if m[i].Blocked {
result.IsFiltered = true
result.Reason = FilteredParental
result.Rule = fmt.Sprintf("parental %s", m[i].Reason)
break
}
}
return result, nil
}
// check cache
cachedValue, isFound := getCachedResult(gctx.parentalCache, host)
if isFound {
atomic.AddUint64(&gctx.stats.Parental.CacheHits, 1)
log.Tracef("%s: found in the lookup cache %p", host, gctx.parentalCache)
return cachedValue, nil
}
result, err := d.lookupCommon(host, &gctx.stats.Parental, false, format, handleBody)
if err == nil {
d.setCacheResult(gctx.parentalCache, host, result)
}
return result, err
}
type formatHandler func(hashparam string) string
type bodyHandler func(body []byte, hashes map[string]bool) (Result, error)
// real implementation of lookup/check
func (d *Dnsfilter) lookupCommon(host string, lookupstats *LookupStats, hashparamNeedSlash bool, format formatHandler, handleBody bodyHandler) (Result, error) {
// convert hostname to hash parameters
hashparam, hashes := hostnameToHashParam(host, hashparamNeedSlash)
// format URL with our hashes
url := format(hashparam)
// do HTTP request
atomic.AddUint64(&lookupstats.Requests, 1)
atomic.AddInt64(&lookupstats.Pending, 1)
updateMax(&lookupstats.Pending, &lookupstats.PendingMax)
resp, err := d.client.Get(url)
atomic.AddInt64(&lookupstats.Pending, -1)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
// error, don't save cache
return Result{}, err
}
// get body text
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
// error, don't save cache
return Result{}, err
}
// handle status code
switch {
case resp.StatusCode == 204:
// empty result, save cache
return Result{}, nil
case resp.StatusCode != 200:
return Result{}, fmt.Errorf("HTTP status code: %d", resp.StatusCode)
}
result, err := handleBody(body, hashes)
if err != nil {
return Result{}, err
}
return result, nil
}
</s> add </s> remove //
// config manipulation helpers
//
// SetSafeBrowsingServer lets you optionally change hostname of safesearch lookup
func (d *Dnsfilter) SetSafeBrowsingServer(host string) {
if len(host) == 0 {
d.safeBrowsingServer = defaultSafebrowsingServer
} else {
d.safeBrowsingServer = host
}
}
// SetHTTPTimeout lets you optionally change timeout during lookups
func (d *Dnsfilter) SetHTTPTimeout(t time.Duration) {
d.client.Timeout = t
}
// ResetHTTPTimeout resets lookup timeouts
func (d *Dnsfilter) ResetHTTPTimeout() {
d.client.Timeout = defaultHTTPTimeout
}
// SafeSearchDomain returns replacement address for search engine
func (d *Dnsfilter) SafeSearchDomain(host string) (string, bool) {
if d.SafeSearchEnabled {
val, ok := safeSearchDomains[host]
return val, ok
}
return "", false
}
</s> add </s> remove //
// lifecycle helper functions
//
// Return TRUE if this host's IP should be cached
func (d *Dnsfilter) shouldBeInDialCache(host string) bool {
return host == d.safeBrowsingServer ||
host == d.parentalServer
}
// Search for an IP address by host name
func searchInDialCache(host string) string {
rawValue, err := gctx.dialCache.Get(host)
if err != nil {
return ""
}
ip, _ := rawValue.(string)
log.Debug("Found in cache: %s -> %s", host, ip)
return ip
}
// Add "hostname" -> "IP address" entry to cache
func addToDialCache(host, ip string) {
err := gctx.dialCache.Set(host, ip)
if err != nil {
log.Debug("dialCache.Set: %s", err)
}
log.Debug("Added to cache: %s -> %s", host, ip)
}
type dialFunctionType func(ctx context.Context, network, addr string) (net.Conn, error)
// Connect to a remote server resolving hostname using our own DNS server
func (d *Dnsfilter) createCustomDialContext(resolverAddr string) dialFunctionType {
return func(ctx context.Context, network, addr string) (net.Conn, error) {
log.Tracef("network:%v addr:%v", network, addr)
host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
}
dialer := &net.Dialer{
Timeout: time.Minute * 5,
}
if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
}
cache := d.shouldBeInDialCache(host)
if cache {
ip := searchInDialCache(host)
if len(ip) != 0 {
addr = fmt.Sprintf("%s:%s", ip, port)
return dialer.DialContext(ctx, network, addr)
}
}
r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
}
if len(addrs) == 0 {
return nil, fmt.Errorf("couldn't lookup host: %s", host)
}
var dialErrs []error
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
dialErrs = append(dialErrs, err)
continue
}
if cache {
addToDialCache(host, a.String())
}
return con, err
}
return nil, errorx.DecorateMany(fmt.Sprintf("couldn't dial to %s", addr), dialErrs...)
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f69848084a68cdf1e227a555454991295fc5866 | dnsfilter/dnsfilter.go |
|
<mask> }
<mask>
<mask> type dnsFilterContext struct {
<mask> stats Stats
<mask> dialCache gcache.Cache // "host" -> "IP" cache for safebrowsing and parental control servers
<mask> safebrowsingCache cache.Cache
<mask> parentalCache cache.Cache
<mask> safeSearchCache cache.Cache
<mask> }
<mask>
</s> + dnsfilter: use AG DNS server for SB/PC services
* move SS/SB/PC services to security.go
* remove old useless code (HTTP client) </s> remove const defaultHTTPTimeout = 5 * time.Minute
const defaultHTTPMaxIdleConnections = 100
const defaultSafebrowsingServer = "sb.adtidy.org"
const defaultSafebrowsingURL = "%s://%s/safebrowsing-lookup-hash.html?prefixes=%s"
const defaultParentalServer = "pctrl.adguard.com"
const defaultParentalURL = "%s://%s/check-parental-control-hash?prefixes=%s&sensitivity=%d"
const defaultParentalSensitivity = 13 // use "TEEN" by default
const maxDialCacheSize = 2 // the number of host names for safebrowsing and parental control
</s> add </s> remove UsePlainHTTP bool `yaml:"-"` // use plain HTTP for requests to parental and safe browsing servers
</s> add </s> remove //
// lifecycle helper functions
//
// Return TRUE if this host's IP should be cached
func (d *Dnsfilter) shouldBeInDialCache(host string) bool {
return host == d.safeBrowsingServer ||
host == d.parentalServer
}
// Search for an IP address by host name
func searchInDialCache(host string) string {
rawValue, err := gctx.dialCache.Get(host)
if err != nil {
return ""
}
ip, _ := rawValue.(string)
log.Debug("Found in cache: %s -> %s", host, ip)
return ip
}
// Add "hostname" -> "IP address" entry to cache
func addToDialCache(host, ip string) {
err := gctx.dialCache.Set(host, ip)
if err != nil {
log.Debug("dialCache.Set: %s", err)
}
log.Debug("Added to cache: %s -> %s", host, ip)
}
type dialFunctionType func(ctx context.Context, network, addr string) (net.Conn, error)
// Connect to a remote server resolving hostname using our own DNS server
func (d *Dnsfilter) createCustomDialContext(resolverAddr string) dialFunctionType {
return func(ctx context.Context, network, addr string) (net.Conn, error) {
log.Tracef("network:%v addr:%v", network, addr)
host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
}
dialer := &net.Dialer{
Timeout: time.Minute * 5,
}
if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
}
cache := d.shouldBeInDialCache(host)
if cache {
ip := searchInDialCache(host)
if len(ip) != 0 {
addr = fmt.Sprintf("%s:%s", ip, port)
return dialer.DialContext(ctx, network, addr)
}
}
r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
}
if len(addrs) == 0 {
return nil, fmt.Errorf("couldn't lookup host: %s", host)
}
var dialErrs []error
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
dialErrs = append(dialErrs, err)
continue
}
if cache {
addToDialCache(host, a.String())
}
return con, err
}
return nil, errorx.DecorateMany(fmt.Sprintf("couldn't dial to %s", addr), dialErrs...)
}
}
</s> add </s> remove //
// config manipulation helpers
//
// SetSafeBrowsingServer lets you optionally change hostname of safesearch lookup
func (d *Dnsfilter) SetSafeBrowsingServer(host string) {
if len(host) == 0 {
d.safeBrowsingServer = defaultSafebrowsingServer
} else {
d.safeBrowsingServer = host
}
}
// SetHTTPTimeout lets you optionally change timeout during lookups
func (d *Dnsfilter) SetHTTPTimeout(t time.Duration) {
d.client.Timeout = t
}
// ResetHTTPTimeout resets lookup timeouts
func (d *Dnsfilter) ResetHTTPTimeout() {
d.client.Timeout = defaultHTTPTimeout
}
// SafeSearchDomain returns replacement address for search engine
func (d *Dnsfilter) SafeSearchDomain(host string) (string, bool) {
if d.SafeSearchEnabled {
val, ok := safeSearchDomains[host]
return val, ok
}
return "", false
}
</s> add </s> remove /*
expire byte[4]
res Result
*/
func (d *Dnsfilter) setCacheResult(cache cache.Cache, host string, res Result) {
var buf bytes.Buffer
expire := uint(time.Now().Unix()) + d.Config.CacheTime*60
var exp []byte
exp = make([]byte, 4)
binary.BigEndian.PutUint32(exp, uint32(expire))
_, _ = buf.Write(exp)
enc := gob.NewEncoder(&buf)
err := enc.Encode(res)
if err != nil {
log.Error("gob.Encode(): %s", err)
return
}
_ = cache.Set([]byte(host), buf.Bytes())
log.Debug("Stored in cache %p: %s", cache, host)
}
func getCachedResult(cache cache.Cache, host string) (Result, bool) {
data := cache.Get([]byte(host))
if data == nil {
return Result{}, false
}
exp := int(binary.BigEndian.Uint32(data[:4]))
if exp <= int(time.Now().Unix()) {
cache.Del([]byte(host))
return Result{}, false
}
var buf bytes.Buffer
buf.Write(data[4:])
dec := gob.NewDecoder(&buf)
r := Result{}
err := dec.Decode(&r)
if err != nil {
log.Debug("gob.Decode(): %s", err)
return Result{}, false
}
return r, true
}
// for each dot, hash it and add it to string
func hostnameToHashParam(host string, addslash bool) (string, map[string]bool) {
var hashparam bytes.Buffer
hashes := map[string]bool{}
tld, icann := publicsuffix.PublicSuffix(host)
if !icann {
// private suffixes like cloudfront.net
tld = ""
}
curhost := host
for {
if curhost == "" {
// we've reached end of string
break
}
if tld != "" && curhost == tld {
// we've reached the TLD, don't hash it
break
}
tohash := []byte(curhost)
if addslash {
tohash = append(tohash, '/')
}
sum := sha256.Sum256(tohash)
hexhash := fmt.Sprintf("%X", sum)
hashes[hexhash] = true
hashparam.WriteString(fmt.Sprintf("%02X%02X%02X%02X/", sum[0], sum[1], sum[2], sum[3]))
pos := strings.IndexByte(curhost, byte('.'))
if pos < 0 {
break
}
curhost = curhost[pos+1:]
}
return hashparam.String(), hashes
}
func (d *Dnsfilter) checkSafeSearch(host string) (Result, error) {
if log.GetLevel() >= log.DEBUG {
timer := log.StartTimer()
defer timer.LogElapsed("SafeSearch HTTP lookup for %s", host)
}
// Check cache. Return cached result if it was found
cachedValue, isFound := getCachedResult(gctx.safeSearchCache, host)
if isFound {
atomic.AddUint64(&gctx.stats.Safesearch.CacheHits, 1)
log.Tracef("%s: found in SafeSearch cache", host)
return cachedValue, nil
}
safeHost, ok := d.SafeSearchDomain(host)
if !ok {
return Result{}, nil
}
res := Result{IsFiltered: true, Reason: FilteredSafeSearch}
if ip := net.ParseIP(safeHost); ip != nil {
res.IP = ip
d.setCacheResult(gctx.safeSearchCache, host, res)
return res, nil
}
// TODO this address should be resolved with upstream that was configured in dnsforward
addrs, err := net.LookupIP(safeHost)
if err != nil {
log.Tracef("SafeSearchDomain for %s was found but failed to lookup for %s cause %s", host, safeHost, err)
return Result{}, err
}
for _, i := range addrs {
if ipv4 := i.To4(); ipv4 != nil {
res.IP = ipv4
break
}
}
if len(res.IP) == 0 {
return Result{}, fmt.Errorf("no ipv4 addresses in safe search response for %s", safeHost)
}
// Cache result
d.setCacheResult(gctx.safeSearchCache, host, res)
return res, nil
}
func (d *Dnsfilter) checkSafeBrowsing(host string) (Result, error) {
if log.GetLevel() >= log.DEBUG {
timer := log.StartTimer()
defer timer.LogElapsed("SafeBrowsing HTTP lookup for %s", host)
}
format := func(hashparam string) string {
schema := "https"
if d.UsePlainHTTP {
schema = "http"
}
url := fmt.Sprintf(defaultSafebrowsingURL, schema, d.safeBrowsingServer, hashparam)
return url
}
handleBody := func(body []byte, hashes map[string]bool) (Result, error) {
result := Result{}
scanner := bufio.NewScanner(strings.NewReader(string(body)))
for scanner.Scan() {
line := scanner.Text()
splitted := strings.Split(line, ":")
if len(splitted) < 3 {
continue
}
hash := splitted[2]
if _, ok := hashes[hash]; ok {
// it's in the hash
result.IsFiltered = true
result.Reason = FilteredSafeBrowsing
result.Rule = splitted[0]
break
}
}
if err := scanner.Err(); err != nil {
// error, don't save cache
return Result{}, err
}
return result, nil
}
// check cache
cachedValue, isFound := getCachedResult(gctx.safebrowsingCache, host)
if isFound {
atomic.AddUint64(&gctx.stats.Safebrowsing.CacheHits, 1)
log.Tracef("%s: found in the lookup cache %p", host, gctx.safebrowsingCache)
return cachedValue, nil
}
result, err := d.lookupCommon(host, &gctx.stats.Safebrowsing, true, format, handleBody)
if err == nil {
d.setCacheResult(gctx.safebrowsingCache, host, result)
}
return result, err
}
func (d *Dnsfilter) checkParental(host string) (Result, error) {
if log.GetLevel() >= log.DEBUG {
timer := log.StartTimer()
defer timer.LogElapsed("Parental HTTP lookup for %s", host)
}
format := func(hashparam string) string {
schema := "https"
if d.UsePlainHTTP {
schema = "http"
}
sensitivity := d.ParentalSensitivity
if sensitivity == 0 {
sensitivity = defaultParentalSensitivity
}
url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, sensitivity)
return url
}
handleBody := func(body []byte, hashes map[string]bool) (Result, error) {
// parse json
var m []struct {
Blocked bool `json:"blocked"`
ClientTTL int `json:"clientTtl"`
Reason string `json:"reason"`
Hash string `json:"hash"`
}
err := json.Unmarshal(body, &m)
if err != nil {
// error, don't save cache
log.Printf("Couldn't parse json '%s': %s", body, err)
return Result{}, err
}
result := Result{}
for i := range m {
if !hashes[m[i].Hash] {
continue
}
if m[i].Blocked {
result.IsFiltered = true
result.Reason = FilteredParental
result.Rule = fmt.Sprintf("parental %s", m[i].Reason)
break
}
}
return result, nil
}
// check cache
cachedValue, isFound := getCachedResult(gctx.parentalCache, host)
if isFound {
atomic.AddUint64(&gctx.stats.Parental.CacheHits, 1)
log.Tracef("%s: found in the lookup cache %p", host, gctx.parentalCache)
return cachedValue, nil
}
result, err := d.lookupCommon(host, &gctx.stats.Parental, false, format, handleBody)
if err == nil {
d.setCacheResult(gctx.parentalCache, host, result)
}
return result, err
}
type formatHandler func(hashparam string) string
type bodyHandler func(body []byte, hashes map[string]bool) (Result, error)
// real implementation of lookup/check
func (d *Dnsfilter) lookupCommon(host string, lookupstats *LookupStats, hashparamNeedSlash bool, format formatHandler, handleBody bodyHandler) (Result, error) {
// convert hostname to hash parameters
hashparam, hashes := hostnameToHashParam(host, hashparamNeedSlash)
// format URL with our hashes
url := format(hashparam)
// do HTTP request
atomic.AddUint64(&lookupstats.Requests, 1)
atomic.AddInt64(&lookupstats.Pending, 1)
updateMax(&lookupstats.Pending, &lookupstats.PendingMax)
resp, err := d.client.Get(url)
atomic.AddInt64(&lookupstats.Pending, -1)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
// error, don't save cache
return Result{}, err
}
// get body text
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
// error, don't save cache
return Result{}, err
}
// handle status code
switch {
case resp.StatusCode == 204:
// empty result, save cache
return Result{}, nil
case resp.StatusCode != 200:
return Result{}, fmt.Errorf("HTTP status code: %d", resp.StatusCode)
}
result, err := handleBody(body, hashes)
if err != nil {
return Result{}, err
}
return result, nil
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f69848084a68cdf1e227a555454991295fc5866 | dnsfilter/dnsfilter.go |
|
<mask> return result, nil
<mask> }
<mask> }
<mask>
<mask> // check safeSearch if no match
<mask> if setts.SafeSearchEnabled {
<mask> result, err = d.checkSafeSearch(host)
<mask> if err != nil {
<mask> log.Printf("Failed to safesearch HTTP lookup, ignoring check: %v", err)
<mask> return Result{}, nil
</s> + dnsfilter: use AG DNS server for SB/PC services
* move SS/SB/PC services to security.go
* remove old useless code (HTTP client) </s> remove log.Printf("Failed to safesearch HTTP lookup, ignoring check: %v", err)
</s> add log.Info("SafeSearch: failed: %v", err) </s> remove // failed to do HTTP lookup -- treat it as if we got empty response, but don't save cache
log.Printf("Failed to do safebrowsing HTTP lookup, ignoring check: %v", err)
</s> add log.Info("SafeBrowsing: failed: %v", err) </s> remove // failed to do HTTP lookup -- treat it as if we got empty response, but don't save cache
log.Printf("Failed to do parental HTTP lookup, ignoring check: %v", err)
</s> add log.Printf("Parental: failed: %v", err) </s> remove // check safebrowsing if no match
</s> add </s> remove // check parental if no match
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f69848084a68cdf1e227a555454991295fc5866 | dnsfilter/dnsfilter.go |
|
log.Info("SafeSearch: failed: %v", err) | <mask> // check safeSearch if no match
<mask> if setts.SafeSearchEnabled {
<mask> result, err = d.checkSafeSearch(host)
<mask> if err != nil {
<mask> log.Printf("Failed to safesearch HTTP lookup, ignoring check: %v", err)
<mask> return Result{}, nil
<mask> }
<mask>
<mask> if result.Reason.Matched() {
<mask> return result, nil
</s> + dnsfilter: use AG DNS server for SB/PC services
* move SS/SB/PC services to security.go
* remove old useless code (HTTP client) </s> remove // check safeSearch if no match
</s> add </s> remove // failed to do HTTP lookup -- treat it as if we got empty response, but don't save cache
log.Printf("Failed to do safebrowsing HTTP lookup, ignoring check: %v", err)
</s> add log.Info("SafeBrowsing: failed: %v", err) </s> remove // failed to do HTTP lookup -- treat it as if we got empty response, but don't save cache
log.Printf("Failed to do parental HTTP lookup, ignoring check: %v", err)
</s> add log.Printf("Parental: failed: %v", err) </s> remove // check safebrowsing if no match
</s> add </s> remove // check parental if no match
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7f69848084a68cdf1e227a555454991295fc5866 | dnsfilter/dnsfilter.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.