mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-17 21:31:43 +03:00
fc9ddcf941
Merge in DNS/adguard-home from 1383-client-id to master Updates #1383. Squashed commit of the following: commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:51:59 2021 +0300 - client: check if IP is valid commit 0c330585a170ea149ee75e43dfa65211e057299c Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:07:50 2021 +0300 - client: find clients by client_id commit 71c9593ee35d996846f061e114b7867c3aa3c978 Merge: 9104f1613e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 16:09:45 2021 +0300 Merge branch 'master' into 1383-client-id commit 9104f1615d2d462606c52017df25a422df872cea Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 13:28:50 2021 +0300 dnsforward: imp tests commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 12:39:52 2021 +0300 dnsforward: fix address commit 98b222ba69a5d265f620c180c960d01c84a1fb3b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:50:31 2021 +0300 home: imp code commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20 Merge: 199fdc05c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:45:13 2021 +0300 Merge branch 'master' into 1383-client-id commit 199fdc056f8a8be5500584f3aaee32865188aedc Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:20:37 2021 +0300 all: imp tests, logging, etc commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:55:19 2021 +0300 + client: remove block button from clients with client_id commit 32991a0b4c56583a02fb5e00bba95d96000bce20 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:54:25 2021 +0300 + client: add requests count for client_id commit 2d68df4d2eac4a296d7469923e601dad4575c1a1 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 15:49:50 2021 +0300 stats: handle client ids commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:45:25 2021 +0300 openapi: fix example commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:37:10 2021 +0300 openapi: improve clients find api docs commit f79876e550c424558b704bc316a4cd04f25db011 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:18:52 2021 +0300 home: accept ids in clients find commit 5b72595122aa0bd64debadfd753ed8a0e0840629 Merge: 607e241fabf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:34:56 2021 +0300 Merge branch 'master' into 1383-client-id commit 607e241f1c339dd6397218f70b8301e3de6a1ee0 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:30:39 2021 +0300 dnsforward: fix quic commit f046352fef93e46234c2bbe8ae316d21034260e5 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 16:53:09 2021 +0300 all: remove wildcard requirement commit 3b679489bae82c54177372be453fe184d8f0bab6 Author: Andrey Meshkov <am@adguard.com> Date: Mon Jan 25 16:02:28 2021 +0300 workDir now supports symlinks commit 0647ab4f113de2223f6949df001f42ecab05c995 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:59:46 2021 +0300 - client: remove wildcard from domain validation commit b1aec04a4ecadc9d65648ed6d284188fecce01c3 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:55:39 2021 +0300 + client: add form to download mobileconfig ... and 12 more commits
172 lines
5.0 KiB
Go
172 lines
5.0 KiB
Go
package querylog
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
|
|
)
|
|
|
|
type criteriaType int
|
|
|
|
const (
|
|
// ctDomainOrClient is for searching by the domain name, the client's IP
|
|
// address, or the clinet's ID.
|
|
ctDomainOrClient criteriaType = iota
|
|
// ctFilteringStatus is for searching by the filtering status.
|
|
//
|
|
// See (*searchCriteria).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,
|
|
}
|
|
|
|
// searchCriteria - every search request may contain a list of different search criteria
|
|
// we use each of them to match the query
|
|
type searchCriteria struct {
|
|
value string // search criteria value
|
|
criteriaType criteriaType // type of the criteria
|
|
strict bool // should we strictly match (equality) or not (indexOf)
|
|
}
|
|
|
|
// 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") ||
|
|
c.quickMatchJSONValue(line, "ID")
|
|
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 {
|
|
clientID := strings.ToLower(entry.ClientID)
|
|
qhost := strings.ToLower(entry.QHost)
|
|
searchVal := strings.ToLower(c.value)
|
|
if c.strict && (qhost == searchVal || clientID == searchVal) {
|
|
return true
|
|
}
|
|
|
|
if !c.strict && (strings.Contains(qhost, searchVal) || strings.Contains(clientID, searchVal)) {
|
|
return true
|
|
}
|
|
|
|
ipStr := entry.IP.String()
|
|
if c.strict && ipStr == c.value {
|
|
return true
|
|
}
|
|
|
|
if !c.strict && strings.Contains(ipStr, 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
|
|
}
|
|
}
|