mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-15 11:22:49 +03:00
371261b2c6
Merge in DNS/adguard-home from 5910-stats-malformed-entry to master
Squashed commit of the following:
commit ea6718daf0d65dc4b13cd08430da7fdeb6f7fd5b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 19 17:34:50 2023 +0400
all: imp docs
commit 5341c5b351c87556b91a7f692960edc76f44b21a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 19 16:47:13 2023 +0400
all: docs
commit 1703c421f501484a80ddcf4ca1ba24f71fa5d225
Merge: f56b62490 d26c480d0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 19 16:46:13 2023 +0400
Merge remote-tracking branch 'origin/master' into 5910-stats-malformed-entry
# Conflicts:
# CHANGELOG.md
commit f56b62490c7033e1d0b620a9cb4ba8de64862de0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 19 14:49:43 2023 +0400
all: docs
commit be954a8cab950d038c8cf08b95158069fa0747ba
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 19 14:44:05 2023 +0400
querylog: empty queries
commit 0cda309d402156e750c7387e471da6795aa43bd6
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 19 14:26:41 2023 +0400
dnsforward: stat empty queries
155 lines
3.8 KiB
Go
155 lines
3.8 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"net"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/querylog"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/stats"
|
|
"github.com/AdguardTeam/dnsproxy/proxy"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"github.com/AdguardTeam/golibs/netutil"
|
|
"github.com/miekg/dns"
|
|
"golang.org/x/exp/slices"
|
|
)
|
|
|
|
// Write Stats data and logs
|
|
func (s *Server) processQueryLogsAndStats(dctx *dnsContext) (rc resultCode) {
|
|
elapsed := time.Since(dctx.startTime)
|
|
pctx := dctx.proxyCtx
|
|
|
|
shouldLog := true
|
|
msg := pctx.Req
|
|
q := msg.Question[0]
|
|
host := strings.ToLower(strings.TrimSuffix(q.Name, "."))
|
|
|
|
// don't log ANY request if refuseAny is enabled
|
|
if q.Qtype == dns.TypeANY && s.conf.RefuseAny {
|
|
shouldLog = false
|
|
}
|
|
|
|
ip, _ := netutil.IPAndPortFromAddr(pctx.Addr)
|
|
ip = slices.Clone(ip)
|
|
|
|
s.serverLock.RLock()
|
|
defer s.serverLock.RUnlock()
|
|
|
|
s.anonymizer.Load()(ip)
|
|
|
|
log.Debug("client ip: %s", ip)
|
|
|
|
ipStr := ip.String()
|
|
ids := []string{ipStr, dctx.clientID}
|
|
|
|
// Synchronize access to s.queryLog and s.stats so they won't be suddenly
|
|
// uninitialized while in use. This can happen after proxy server has been
|
|
// stopped, but its workers haven't yet exited.
|
|
if shouldLog &&
|
|
s.queryLog != nil &&
|
|
// TODO(s.chzhen): Use dnsforward.dnsContext when it will start
|
|
// containing persistent client.
|
|
s.queryLog.ShouldLog(host, q.Qtype, q.Qclass, ids) {
|
|
s.logQuery(dctx, pctx, elapsed, ip)
|
|
} else {
|
|
log.Debug(
|
|
"dnsforward: request %s %s from %s ignored; not logging",
|
|
dns.Type(q.Qtype),
|
|
host,
|
|
ip,
|
|
)
|
|
}
|
|
|
|
if s.stats != nil &&
|
|
// TODO(s.chzhen): Use dnsforward.dnsContext when it will start
|
|
// containing persistent client.
|
|
s.stats.ShouldCount(host, q.Qtype, q.Qclass, ids) {
|
|
s.updateStats(dctx, elapsed, *dctx.result, ipStr)
|
|
}
|
|
|
|
return resultCodeSuccess
|
|
}
|
|
|
|
// logQuery pushes the request details into the query log.
|
|
func (s *Server) logQuery(
|
|
dctx *dnsContext,
|
|
pctx *proxy.DNSContext,
|
|
elapsed time.Duration,
|
|
ip net.IP,
|
|
) {
|
|
p := &querylog.AddParams{
|
|
Question: pctx.Req,
|
|
ReqECS: pctx.ReqECS,
|
|
Answer: pctx.Res,
|
|
OrigAnswer: dctx.origResp,
|
|
Result: dctx.result,
|
|
ClientID: dctx.clientID,
|
|
ClientIP: ip,
|
|
Elapsed: elapsed,
|
|
AuthenticatedData: dctx.responseAD,
|
|
}
|
|
|
|
switch pctx.Proto {
|
|
case proxy.ProtoHTTPS:
|
|
p.ClientProto = querylog.ClientProtoDoH
|
|
case proxy.ProtoQUIC:
|
|
p.ClientProto = querylog.ClientProtoDoQ
|
|
case proxy.ProtoTLS:
|
|
p.ClientProto = querylog.ClientProtoDoT
|
|
case proxy.ProtoDNSCrypt:
|
|
p.ClientProto = querylog.ClientProtoDNSCrypt
|
|
default:
|
|
// Consider this a plain DNS-over-UDP or DNS-over-TCP request.
|
|
}
|
|
|
|
if pctx.Upstream != nil {
|
|
p.Upstream = pctx.Upstream.Address()
|
|
} else if cachedUps := pctx.CachedUpstreamAddr; cachedUps != "" {
|
|
p.Upstream = pctx.CachedUpstreamAddr
|
|
p.Cached = true
|
|
}
|
|
|
|
s.queryLog.Add(p)
|
|
}
|
|
|
|
// updatesStats writes the request into statistics.
|
|
func (s *Server) updateStats(
|
|
ctx *dnsContext,
|
|
elapsed time.Duration,
|
|
res filtering.Result,
|
|
clientIP string,
|
|
) {
|
|
pctx := ctx.proxyCtx
|
|
e := stats.Entry{}
|
|
e.Domain = strings.ToLower(pctx.Req.Question[0].Name)
|
|
if e.Domain != "." {
|
|
// Remove last ".", but save the domain as is for "." queries.
|
|
e.Domain = e.Domain[:len(e.Domain)-1]
|
|
}
|
|
|
|
if clientID := ctx.clientID; clientID != "" {
|
|
e.Client = clientID
|
|
} else {
|
|
e.Client = clientIP
|
|
}
|
|
|
|
e.Time = uint32(elapsed / 1000)
|
|
e.Result = stats.RNotFiltered
|
|
|
|
switch res.Reason {
|
|
case filtering.FilteredSafeBrowsing:
|
|
e.Result = stats.RSafeBrowsing
|
|
case filtering.FilteredParental:
|
|
e.Result = stats.RParental
|
|
case filtering.FilteredSafeSearch:
|
|
e.Result = stats.RSafeSearch
|
|
case filtering.FilteredBlockList,
|
|
filtering.FilteredInvalid,
|
|
filtering.FilteredBlockedService:
|
|
e.Result = stats.RFiltered
|
|
}
|
|
|
|
s.stats.Update(e)
|
|
}
|