mirrors/dnscrypt-proxy
1
0
Fork 0
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git synced 2025-04-05 22:27:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add (indirect) to the logged pattern for indirect blocks

Browse source
This commit is contained in:
Frank Denis 2019-12-05 16:49:08 +01:00
parent 21c63a5608
commit 57a88eda56
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dnscrypt-proxy/plugin_block_name.go
View file

@ -24,9 +24,12 @@ const aliasesLimit = 8
var blockedNames *BlockedNames var blockedNames *BlockedNames
func (blockedNames *BlockedNames) check(pluginsState *PluginsState, qName string) (bool, error) { func (blockedNames *BlockedNames) check(pluginsState *PluginsState, qName string, indirect bool) (bool, error) {
qName = strings.ToLower(StripTrailingDot(qName)) qName = strings.ToLower(StripTrailingDot(qName))
reject, reason, xweeklyRanges := blockedNames.patternMatcher.Eval(qName) reject, reason, xweeklyRanges := blockedNames.patternMatcher.Eval(qName)
if indirect {
reason = reason + " (indirect)"
}
var weeklyRanges *WeeklyRanges var weeklyRanges *WeeklyRanges
if xweeklyRanges != nil { if xweeklyRanges != nil {
weeklyRanges = xweeklyRanges.(*WeeklyRanges) weeklyRanges = xweeklyRanges.(*WeeklyRanges)
@ -145,7 +148,7 @@ func (plugin *PluginBlockName) Eval(pluginsState *PluginsState, msg *dns.Msg) er
if len(questions) != 1 { if len(questions) != 1 {
return nil return nil
} }
_, err := blockedNames.check(pluginsState, questions[0].Name) _, err := blockedNames.check(pluginsState, questions[0].Name, false)
return err return err
} }
@ -185,7 +188,7 @@ func (plugin *PluginBlockNameResponse) Eval(pluginsState *PluginsState, msg *dns
if header.Class != dns.ClassINET || header.Rrtype != dns.TypeCNAME { if header.Class != dns.ClassINET || header.Rrtype != dns.TypeCNAME {
continue continue
} }
if blocked, err := blockedNames.check(pluginsState, answer.(*dns.CNAME).Target); blocked || err != nil { if blocked, err := blockedNames.check(pluginsState, answer.(*dns.CNAME).Target, true); blocked || err != nil {
return err return err
} }
aliasesLeft-- aliasesLeft--