338209f32b
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <a.baskal@adguard.com>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling
161 lines
4.6 KiB
Go
161 lines
4.6 KiB
Go
package querylog
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
|
|
)
|
|
|
|
type criteriaType int
|
|
|
|
const (
|
|
ctDomainOrClient criteriaType = iota // domain name or client IP address
|
|
ctFilteringStatus // filtering status
|
|
)
|
|
|
|
const (
|
|
filteringStatusAll = "all"
|
|
filteringStatusFiltered = "filtered" // all kinds of filtering
|
|
|
|
filteringStatusBlocked = "blocked" // blocked or blocked services
|
|
filteringStatusBlockedService = "blocked_services" // blocked
|
|
filteringStatusBlockedSafebrowsing = "blocked_safebrowsing" // blocked by safebrowsing
|
|
filteringStatusBlockedParental = "blocked_parental" // blocked by parental control
|
|
filteringStatusWhitelisted = "whitelisted" // whitelisted
|
|
filteringStatusRewritten = "rewritten" // all kinds of rewrites
|
|
filteringStatusSafeSearch = "safe_search" // enforced safe search
|
|
filteringStatusProcessed = "processed" // not blocked, not white-listed entries
|
|
)
|
|
|
|
// filteringStatusValues -- array with all possible filteringStatus values
|
|
var filteringStatusValues = []string{
|
|
filteringStatusAll, filteringStatusFiltered, filteringStatusBlocked,
|
|
filteringStatusBlockedService, filteringStatusBlockedSafebrowsing, filteringStatusBlockedParental,
|
|
filteringStatusWhitelisted, filteringStatusRewritten, filteringStatusSafeSearch,
|
|
filteringStatusProcessed,
|
|
}
|
|
|
|
// searchCriteria - every search request may contain a list of different search criteria
|
|
// we use each of them to match the query
|
|
type searchCriteria struct {
|
|
criteriaType criteriaType // type of the criteria
|
|
strict bool // should we strictly match (equality) or not (indexOf)
|
|
value string // search criteria value
|
|
}
|
|
|
|
// quickMatch - quickly checks if the log entry matches this search criteria
|
|
// the reason is to do it as quickly as possible without de-serializing the entry
|
|
func (c *searchCriteria) quickMatch(line string) bool {
|
|
// note that we do this only for a limited set of criteria
|
|
|
|
switch c.criteriaType {
|
|
case ctDomainOrClient:
|
|
return c.quickMatchJSONValue(line, "QH") ||
|
|
c.quickMatchJSONValue(line, "IP")
|
|
default:
|
|
return true
|
|
}
|
|
}
|
|
|
|
// quickMatchJSONValue - helper used by quickMatch
|
|
func (c *searchCriteria) quickMatchJSONValue(line, propertyName string) bool {
|
|
val := readJSONValue(line, propertyName)
|
|
if len(val) == 0 {
|
|
return false
|
|
}
|
|
val = strings.ToLower(val)
|
|
searchVal := strings.ToLower(c.value)
|
|
|
|
if c.strict && searchVal == val {
|
|
return true
|
|
}
|
|
if !c.strict && strings.Contains(val, searchVal) {
|
|
return true
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
// match - checks if the log entry matches this search criteria
|
|
func (c *searchCriteria) match(entry *logEntry) bool {
|
|
switch c.criteriaType {
|
|
case ctDomainOrClient:
|
|
return c.ctDomainOrClientCase(entry)
|
|
case ctFilteringStatus:
|
|
return c.ctFilteringStatusCase(entry.Result)
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
|
|
qhost := strings.ToLower(entry.QHost)
|
|
searchVal := strings.ToLower(c.value)
|
|
if c.strict && qhost == searchVal {
|
|
return true
|
|
}
|
|
if !c.strict && strings.Contains(qhost, searchVal) {
|
|
return true
|
|
}
|
|
|
|
if c.strict && entry.IP == c.value {
|
|
return true
|
|
}
|
|
if !c.strict && strings.Contains(entry.IP, c.value) {
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
func (c *searchCriteria) ctFilteringStatusCase(res dnsfilter.Result) bool {
|
|
switch c.value {
|
|
case filteringStatusAll:
|
|
return true
|
|
|
|
case filteringStatusFiltered:
|
|
return res.IsFiltered ||
|
|
res.Reason.In(
|
|
dnsfilter.NotFilteredAllowList,
|
|
dnsfilter.Rewritten,
|
|
dnsfilter.RewrittenAutoHosts,
|
|
dnsfilter.RewrittenRule,
|
|
)
|
|
|
|
case filteringStatusBlocked:
|
|
return res.IsFiltered &&
|
|
res.Reason.In(dnsfilter.FilteredBlockList, dnsfilter.FilteredBlockedService)
|
|
|
|
case filteringStatusBlockedService:
|
|
return res.IsFiltered && res.Reason == dnsfilter.FilteredBlockedService
|
|
|
|
case filteringStatusBlockedParental:
|
|
return res.IsFiltered && res.Reason == dnsfilter.FilteredParental
|
|
|
|
case filteringStatusBlockedSafebrowsing:
|
|
return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
|
|
|
|
case filteringStatusWhitelisted:
|
|
return res.Reason == dnsfilter.NotFilteredAllowList
|
|
|
|
case filteringStatusRewritten:
|
|
return res.Reason.In(
|
|
dnsfilter.Rewritten,
|
|
dnsfilter.RewrittenAutoHosts,
|
|
dnsfilter.RewrittenRule,
|
|
)
|
|
|
|
case filteringStatusSafeSearch:
|
|
return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
|
|
|
|
case filteringStatusProcessed:
|
|
return !res.Reason.In(
|
|
dnsfilter.FilteredBlockList,
|
|
dnsfilter.FilteredBlockedService,
|
|
dnsfilter.NotFilteredAllowList,
|
|
)
|
|
|
|
default:
|
|
return false
|
|
}
|
|
}
|