mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-26 23:28:08 +03:00
e8c1f5c8d3
Merge in DNS/adguard-home from 2508-ip-conversion to master Updates #2508. Squashed commit of the following: commit 3f64709fbc73ef74c11b910997be1e9bc337193c Merge: 5ac7faaaa0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Jan 13 16:21:34 2021 +0300 Merge branch 'master' into 2508-ip-conversion commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Jan 13 12:00:11 2021 +0300 all: replace conditions with appropriate functions in tests commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71 Merge: db992a42abba74859e
Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Jan 13 10:47:10 2021 +0300 Merge branch 'master' into 2508-ip-conversion commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Jan 12 18:55:53 2021 +0300 sysutil: fix linux tests commit f629b15d62349323ce2da05e68dc9cc0b5f6e194 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Jan 12 18:41:20 2021 +0300 all: improve code quality commit 3bf03a75524040738562298bd1de6db536af130f Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Jan 12 17:33:26 2021 +0300 sysutil: fix linux net.IP conversion commit 5d5b6994916923636e635588631b63b7e7b74e5f Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Jan 12 14:57:26 2021 +0300 dnsforward: remove redundant net.IP <-> string conversion commit 0b955d99b7fad40942f21d1dd8734adb99126195 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Jan 11 18:04:25 2021 +0300 dhcpd: remove net.IP <-> string conversion
103 lines
2.4 KiB
Go
103 lines
2.4 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"net"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
|
|
"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 processQueryLogsAndStats(ctx *dnsContext) int {
|
|
elapsed := time.Since(ctx.startTime)
|
|
s := ctx.srv
|
|
d := ctx.proxyCtx
|
|
|
|
shouldLog := true
|
|
msg := d.Req
|
|
|
|
// don't log ANY request if refuseAny is enabled
|
|
if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.conf.RefuseAny {
|
|
shouldLog = false
|
|
}
|
|
|
|
s.RLock()
|
|
// 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 {
|
|
p := querylog.AddParams{
|
|
Question: msg,
|
|
Answer: d.Res,
|
|
OrigAnswer: ctx.origResp,
|
|
Result: ctx.result,
|
|
Elapsed: elapsed,
|
|
ClientIP: ipFromAddr(d.Addr),
|
|
}
|
|
|
|
switch d.Proto {
|
|
case proxy.ProtoHTTPS:
|
|
p.ClientProto = querylog.ClientProtoDOH
|
|
case proxy.ProtoQUIC:
|
|
p.ClientProto = querylog.ClientProtoDOQ
|
|
case proxy.ProtoTLS:
|
|
p.ClientProto = querylog.ClientProtoDOT
|
|
default:
|
|
// Consider this a plain DNS-over-UDP or DNS-over-TCL
|
|
// request.
|
|
}
|
|
|
|
if d.Upstream != nil {
|
|
p.Upstream = d.Upstream.Address()
|
|
}
|
|
s.queryLog.Add(p)
|
|
}
|
|
|
|
s.updateStats(d, elapsed, *ctx.result)
|
|
s.RUnlock()
|
|
|
|
return resultDone
|
|
}
|
|
|
|
func (s *Server) updateStats(d *proxy.DNSContext, elapsed time.Duration, res dnsfilter.Result) {
|
|
if s.stats == nil {
|
|
return
|
|
}
|
|
|
|
e := stats.Entry{}
|
|
e.Domain = strings.ToLower(d.Req.Question[0].Name)
|
|
e.Domain = e.Domain[:len(e.Domain)-1] // remove last "."
|
|
switch addr := d.Addr.(type) {
|
|
case *net.UDPAddr:
|
|
e.Client = addr.IP
|
|
case *net.TCPAddr:
|
|
e.Client = addr.IP
|
|
}
|
|
e.Time = uint32(elapsed / 1000)
|
|
e.Result = stats.RNotFiltered
|
|
|
|
switch res.Reason {
|
|
|
|
case dnsfilter.FilteredSafeBrowsing:
|
|
e.Result = stats.RSafeBrowsing
|
|
|
|
case dnsfilter.FilteredParental:
|
|
e.Result = stats.RParental
|
|
|
|
case dnsfilter.FilteredSafeSearch:
|
|
e.Result = stats.RSafeSearch
|
|
|
|
case dnsfilter.FilteredBlockList:
|
|
fallthrough
|
|
case dnsfilter.FilteredInvalid:
|
|
fallthrough
|
|
case dnsfilter.FilteredBlockedService:
|
|
e.Result = stats.RFiltered
|
|
}
|
|
|
|
s.stats.Update(e)
|
|
}
|