mirror of
https://git.vectorsigma.ru/public/AdGuardHome.git
synced 2026-08-01 20:39:31 +00:00
Merge in DNS/adguard-home from AGDNS-3061-config-modifier to master Squashed commit of the following: commit a0068547bd0209d12e8dbf98ddd5e4ed2545cdd0 Merge: 97b798af6451255675Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Aug 5 17:39:31 2025 +0300 Merge branch 'master' into AGDNS-3061-config-modifier commit 97b798af6a50ee27ee5ed2bcf1c4c3670f5afc5d Merge: 96d21efc9b8043e4f0Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jul 30 20:27:41 2025 +0300 Merge branch 'master' into AGDNS-3061-config-modifier commit 96d21efc984073adef5026de8a03b5bf94542648 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jul 30 20:18:43 2025 +0300 all: imp code commit 67c5608b4be3bd712a0ab5980f25ecea1ed21d65 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Jul 29 20:31:19 2025 +0300 all: imp code commit 52f45a9f70f57d8e7f7fc0e9e8291ff0dde74343 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Jul 28 20:32:13 2025 +0300 all: use config modifier commit d389ffd286460d8ff1964bd2ee8dabdafb832b9b Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jul 25 14:20:31 2025 +0300 bamboo-specs: fix ci commit 3f303ac9131a07e4af5783696b237436fd93d65c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jul 25 14:18:42 2025 +0300 home: config modifier
180 lines
4.9 KiB
Go
180 lines
4.9 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
|
|
"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/miekg/dns"
|
|
)
|
|
|
|
// Write Stats data and logs
|
|
func (s *Server) processQueryLogsAndStats(ctx context.Context, dctx *dnsContext) (rc resultCode) {
|
|
s.logger.DebugContext(ctx, "started processing querylog and stats")
|
|
defer s.logger.DebugContext(ctx, "finished processing querylog and stats")
|
|
|
|
pctx := dctx.proxyCtx
|
|
q := pctx.Req.Question[0]
|
|
host := aghnet.NormalizeDomain(q.Name)
|
|
processingTime := time.Since(dctx.startTime)
|
|
|
|
ip := pctx.Addr.Addr().AsSlice()
|
|
s.anonymizer.Load()(ip)
|
|
ipStr := net.IP(ip).String()
|
|
|
|
s.logger.DebugContext(ctx, "client ip for stats and querylog", "ip", ipStr)
|
|
|
|
ids := []string{ipStr}
|
|
if dctx.clientID != "" {
|
|
// Use the ClientID first because it has a higher priority. Filters
|
|
// have the same priority, see applyAdditionalFiltering.
|
|
ids = []string{dctx.clientID, ipStr}
|
|
}
|
|
|
|
qt, cl := q.Qtype, q.Qclass
|
|
|
|
// 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.
|
|
s.serverLock.RLock()
|
|
defer s.serverLock.RUnlock()
|
|
|
|
if s.shouldLog(host, qt, cl, ids) {
|
|
s.logQuery(dctx, ip, processingTime)
|
|
} else {
|
|
s.logger.DebugContext(
|
|
ctx,
|
|
"not adding to querylog",
|
|
"dns_class", dns.Class(cl),
|
|
"dns_type", dns.Type(qt),
|
|
"host", host,
|
|
"ip", ipStr,
|
|
)
|
|
}
|
|
|
|
if s.shouldCountStat(host, qt, cl, ids) {
|
|
s.updateStats(dctx, ipStr, processingTime)
|
|
} else {
|
|
s.logger.DebugContext(
|
|
ctx,
|
|
"not counting in stats",
|
|
"dns_class", dns.Class(cl),
|
|
"dns_type", dns.Type(qt),
|
|
"host", host,
|
|
"ip", ipStr,
|
|
)
|
|
}
|
|
|
|
return resultCodeSuccess
|
|
}
|
|
|
|
// shouldLog returns true if the query with the given data should be logged in
|
|
// the query log. s.serverLock is expected to be locked.
|
|
func (s *Server) shouldLog(host string, qt, cl uint16, ids []string) (ok bool) {
|
|
if qt == dns.TypeANY && s.conf.RefuseAny {
|
|
return false
|
|
}
|
|
|
|
// TODO(s.chzhen): Use dnsforward.dnsContext when it will start containing
|
|
// persistent client.
|
|
return s.queryLog != nil && s.queryLog.ShouldLog(host, qt, cl, ids)
|
|
}
|
|
|
|
// shouldCountStat returns true if the query with the given data should be
|
|
// counted in the statistics. s.serverLock is expected to be locked.
|
|
func (s *Server) shouldCountStat(host string, qt, cl uint16, ids []string) (ok bool) {
|
|
// TODO(s.chzhen): Use dnsforward.dnsContext when it will start containing
|
|
// persistent client.
|
|
return s.stats != nil && s.stats.ShouldCount(host, qt, cl, ids)
|
|
}
|
|
|
|
// logQuery pushes the request details into the query log.
|
|
func (s *Server) logQuery(dctx *dnsContext, ip net.IP, processingTime time.Duration) {
|
|
pctx := dctx.proxyCtx
|
|
|
|
p := &querylog.AddParams{
|
|
Question: pctx.Req,
|
|
ReqECS: pctx.ReqECS,
|
|
Answer: pctx.Res,
|
|
OrigAnswer: dctx.origResp,
|
|
Result: dctx.result,
|
|
ClientID: dctx.clientID,
|
|
ClientIP: ip,
|
|
Elapsed: processingTime,
|
|
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()
|
|
}
|
|
|
|
if qs := pctx.QueryStatistics(); qs != nil {
|
|
ms := qs.Main()
|
|
if len(ms) == 1 && ms[0].IsCached {
|
|
p.Upstream = ms[0].Address
|
|
p.Cached = true
|
|
}
|
|
}
|
|
|
|
s.queryLog.Add(p)
|
|
}
|
|
|
|
// updateStats writes the request data into statistics.
|
|
func (s *Server) updateStats(dctx *dnsContext, clientIP string, processingTime time.Duration) {
|
|
pctx := dctx.proxyCtx
|
|
|
|
var upstreamStats []*proxy.UpstreamStatistics
|
|
qs := pctx.QueryStatistics()
|
|
if qs != nil {
|
|
upstreamStats = append(upstreamStats, qs.Main()...)
|
|
upstreamStats = append(upstreamStats, qs.Fallback()...)
|
|
}
|
|
|
|
e := &stats.Entry{
|
|
UpstreamStats: upstreamStats,
|
|
Domain: aghnet.NormalizeDomain(pctx.Req.Question[0].Name),
|
|
Result: stats.RNotFiltered,
|
|
ProcessingTime: processingTime,
|
|
}
|
|
|
|
if clientID := dctx.clientID; clientID != "" {
|
|
e.Client = clientID
|
|
} else {
|
|
e.Client = clientIP
|
|
}
|
|
|
|
switch dctx.result.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)
|
|
}
|