df34ee5c09
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly
104 lines
2.3 KiB
Go
104 lines
2.3 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: getIP(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.FilteredBlackList:
|
|
fallthrough
|
|
case dnsfilter.FilteredInvalid:
|
|
fallthrough
|
|
case dnsfilter.FilteredBlockedService:
|
|
e.Result = stats.RFiltered
|
|
}
|
|
|
|
s.stats.Update(e)
|
|
}
|