mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-17 10:58:29 -07:00
9a764b9b82
Merge in DNS/adguard-home from 3978-ecs-ip to master
Updates #3978.
Squashed commit of the following:
commit 915b94afa4b6d90169f73d4fa171bc81bcc267a7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 3 17:46:40 2022 +0300
all: rm dot
commit 2dd2ed081b199de7e5d8269dae5d08d53b5eea6d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 3 17:42:45 2022 +0300
client: imp txt
commit 8d5a23df739f0b650f9f3870141fd83e8fa0c1e0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 3 14:36:04 2022 +0300
client: imp text
commit 69c856749a20144822ef3f1f67c5f3e3c24f5374
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 3 14:24:56 2022 +0300
client: imp description
commit cd0150128ad29d1874492735a5d621c0803ad0bd
Merge: 28181fbc e0b557ed
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 2 21:02:16 2022 +0300
Merge branch 'master' into 3978-ecs-ip
commit 28181fbc79eb22e7fd13cbd1d5a3c040af9fa2a4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 2 20:45:50 2022 +0300
client: show ecs
commit cdc5e7f8c4155b798426d815eed0da547ef6efb7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 17 20:15:56 2022 +0300
openapi: fix milestone
commit 404d6d822fa1ba4ed4cd41d92d4c1b805342fe55
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 17 20:08:21 2022 +0300
all: fix deps, docs
commit 8fb80526f1e251d3b7b193c53a4a6dee0e22c145
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 17 19:39:34 2022 +0300
all: add querylog ecs backend
195 lines
5.6 KiB
Go
195 lines
5.6 KiB
Go
package querylog
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
|
|
"github.com/AdguardTeam/golibs/stringutil"
|
|
)
|
|
|
|
type criterionType int
|
|
|
|
const (
|
|
// ctTerm is for searching by the domain name, the client's IP address,
|
|
// the client's ID or the client's name. The domain name search
|
|
// supports IDNAs.
|
|
ctTerm criterionType = iota
|
|
// ctFilteringStatus is for searching by the filtering status.
|
|
//
|
|
// See (*searchCriterion).ctFilteringStatusCase for details.
|
|
ctFilteringStatus
|
|
)
|
|
|
|
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,
|
|
}
|
|
|
|
// searchCriterion is a search criterion that is used to match a record.
|
|
type searchCriterion struct {
|
|
value string
|
|
asciiVal string
|
|
criterionType criterionType
|
|
// strict, if true, means that the criterion must be applied to the
|
|
// whole value rather than the part of it. That is, equality and not
|
|
// containment.
|
|
strict bool
|
|
}
|
|
|
|
func ctDomainOrClientCaseStrict(
|
|
term string,
|
|
asciiTerm string,
|
|
clientID string,
|
|
name string,
|
|
host string,
|
|
ip string,
|
|
) (ok bool) {
|
|
return strings.EqualFold(host, term) ||
|
|
(asciiTerm != "" && strings.EqualFold(host, asciiTerm)) ||
|
|
strings.EqualFold(clientID, term) ||
|
|
strings.EqualFold(ip, term) ||
|
|
strings.EqualFold(name, term)
|
|
}
|
|
|
|
func ctDomainOrClientCaseNonStrict(
|
|
term string,
|
|
asciiTerm string,
|
|
clientID string,
|
|
name string,
|
|
host string,
|
|
ip string,
|
|
) (ok bool) {
|
|
return stringutil.ContainsFold(clientID, term) ||
|
|
stringutil.ContainsFold(host, term) ||
|
|
(asciiTerm != "" && stringutil.ContainsFold(host, asciiTerm)) ||
|
|
stringutil.ContainsFold(ip, term) ||
|
|
stringutil.ContainsFold(name, term)
|
|
}
|
|
|
|
// quickMatch quickly checks if the line matches the given search criterion.
|
|
// It returns false if the like doesn't match. This method is only here for
|
|
// optimization purposes.
|
|
func (c *searchCriterion) quickMatch(line string, findClient quickMatchClientFunc) (ok bool) {
|
|
switch c.criterionType {
|
|
case ctTerm:
|
|
host := readJSONValue(line, `"QH":"`)
|
|
ip := readJSONValue(line, `"IP":"`)
|
|
clientID := readJSONValue(line, `"CID":"`)
|
|
|
|
var name string
|
|
if cli := findClient(clientID, ip); cli != nil {
|
|
name = cli.Name
|
|
}
|
|
|
|
if c.strict {
|
|
return ctDomainOrClientCaseStrict(c.value, c.asciiVal, clientID, name, host, ip)
|
|
}
|
|
|
|
return ctDomainOrClientCaseNonStrict(c.value, c.asciiVal, clientID, name, host, ip)
|
|
case ctFilteringStatus:
|
|
// Go on, as we currently don't do quick matches against
|
|
// filtering statuses.
|
|
return true
|
|
default:
|
|
return true
|
|
}
|
|
}
|
|
|
|
// match checks if the log entry matches this search criterion.
|
|
func (c *searchCriterion) match(entry *logEntry) bool {
|
|
switch c.criterionType {
|
|
case ctTerm:
|
|
return c.ctDomainOrClientCase(entry)
|
|
case ctFilteringStatus:
|
|
return c.ctFilteringStatusCase(entry.Result)
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
func (c *searchCriterion) ctDomainOrClientCase(e *logEntry) bool {
|
|
clientID := e.ClientID
|
|
host := e.QHost
|
|
|
|
var name string
|
|
if e.client != nil {
|
|
name = e.client.Name
|
|
}
|
|
|
|
ip := e.IP.String()
|
|
if c.strict {
|
|
return ctDomainOrClientCaseStrict(c.value, c.asciiVal, clientID, name, host, ip)
|
|
}
|
|
|
|
return ctDomainOrClientCaseNonStrict(c.value, c.asciiVal, clientID, name, host, ip)
|
|
}
|
|
|
|
func (c *searchCriterion) ctFilteringStatusCase(res filtering.Result) bool {
|
|
switch c.value {
|
|
case filteringStatusAll:
|
|
return true
|
|
|
|
case filteringStatusFiltered:
|
|
return res.IsFiltered ||
|
|
res.Reason.In(
|
|
filtering.NotFilteredAllowList,
|
|
filtering.Rewritten,
|
|
filtering.RewrittenAutoHosts,
|
|
filtering.RewrittenRule,
|
|
)
|
|
|
|
case filteringStatusBlocked:
|
|
return res.IsFiltered &&
|
|
res.Reason.In(filtering.FilteredBlockList, filtering.FilteredBlockedService)
|
|
|
|
case filteringStatusBlockedService:
|
|
return res.IsFiltered && res.Reason == filtering.FilteredBlockedService
|
|
|
|
case filteringStatusBlockedParental:
|
|
return res.IsFiltered && res.Reason == filtering.FilteredParental
|
|
|
|
case filteringStatusBlockedSafebrowsing:
|
|
return res.IsFiltered && res.Reason == filtering.FilteredSafeBrowsing
|
|
|
|
case filteringStatusWhitelisted:
|
|
return res.Reason == filtering.NotFilteredAllowList
|
|
|
|
case filteringStatusRewritten:
|
|
return res.Reason.In(
|
|
filtering.Rewritten,
|
|
filtering.RewrittenAutoHosts,
|
|
filtering.RewrittenRule,
|
|
)
|
|
|
|
case filteringStatusSafeSearch:
|
|
return res.IsFiltered && res.Reason == filtering.FilteredSafeSearch
|
|
|
|
case filteringStatusProcessed:
|
|
return !res.Reason.In(
|
|
filtering.FilteredBlockList,
|
|
filtering.FilteredBlockedService,
|
|
filtering.NotFilteredAllowList,
|
|
)
|
|
|
|
default:
|
|
return false
|
|
}
|
|
}
|