mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-22 21:15:35 +03:00
6a4a9a0239
Merge in DNS/adguard-home from 3978-ecs-ip to master
Updates #3978.
Squashed commit of the following:
commit 915b94afa4b6d90169f73d4fa171bc81bcc267a7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 3 17:46:40 2022 +0300
all: rm dot
commit 2dd2ed081b199de7e5d8269dae5d08d53b5eea6d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 3 17:42:45 2022 +0300
client: imp txt
commit 8d5a23df739f0b650f9f3870141fd83e8fa0c1e0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 3 14:36:04 2022 +0300
client: imp text
commit 69c856749a20144822ef3f1f67c5f3e3c24f5374
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 3 14:24:56 2022 +0300
client: imp description
commit cd0150128ad29d1874492735a5d621c0803ad0bd
Merge: 28181fbc e0b557ed
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 2 21:02:16 2022 +0300
Merge branch 'master' into 3978-ecs-ip
commit 28181fbc79eb22e7fd13cbd1d5a3c040af9fa2a4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 2 20:45:50 2022 +0300
client: show ecs
commit cdc5e7f8c4155b798426d815eed0da547ef6efb7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 17 20:15:56 2022 +0300
openapi: fix milestone
commit 404d6d822fa1ba4ed4cd41d92d4c1b805342fe55
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 17 20:08:21 2022 +0300
all: fix deps, docs
commit 8fb80526f1e251d3b7b193c53a4a6dee0e22c145
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 17 19:39:34 2022 +0300
all: add querylog ecs backend
214 lines
5.4 KiB
Go
214 lines
5.4 KiB
Go
package querylog
|
|
|
|
import (
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"github.com/AdguardTeam/golibs/netutil"
|
|
"github.com/miekg/dns"
|
|
"golang.org/x/net/idna"
|
|
)
|
|
|
|
// TODO(a.garipov): Use a proper structured approach here.
|
|
|
|
// jobject is a JSON object alias.
|
|
type jobject = map[string]interface{}
|
|
|
|
// entriesToJSON converts query log entries to JSON.
|
|
func (l *queryLog) entriesToJSON(entries []*logEntry, oldest time.Time) (res jobject) {
|
|
data := make([]jobject, 0, len(entries))
|
|
|
|
// The elements order is already reversed to be from newer to older.
|
|
for _, entry := range entries {
|
|
jsonEntry := l.entryToJSON(entry, l.anonymizer.Load())
|
|
data = append(data, jsonEntry)
|
|
}
|
|
|
|
res = jobject{
|
|
"data": data,
|
|
"oldest": "",
|
|
}
|
|
if !oldest.IsZero() {
|
|
res["oldest"] = oldest.Format(time.RFC3339Nano)
|
|
}
|
|
|
|
return res
|
|
}
|
|
|
|
// entryToJSON converts a log entry's data into an entry for the JSON API.
|
|
func (l *queryLog) entryToJSON(entry *logEntry, anonFunc aghnet.IPMutFunc) (jsonEntry jobject) {
|
|
hostname := entry.QHost
|
|
question := jobject{
|
|
"type": entry.QType,
|
|
"class": entry.QClass,
|
|
"name": hostname,
|
|
}
|
|
|
|
if qhost, err := idna.ToUnicode(hostname); err != nil {
|
|
log.Debug("querylog: translating %q into unicode: %s", hostname, err)
|
|
} else if qhost != hostname && qhost != "" {
|
|
question["unicode_name"] = qhost
|
|
}
|
|
|
|
eip := netutil.CloneIP(entry.IP)
|
|
anonFunc(eip)
|
|
|
|
jsonEntry = jobject{
|
|
"reason": entry.Result.Reason.String(),
|
|
"elapsedMs": strconv.FormatFloat(entry.Elapsed.Seconds()*1000, 'f', -1, 64),
|
|
"time": entry.Time.Format(time.RFC3339Nano),
|
|
"client": eip,
|
|
"client_proto": entry.ClientProto,
|
|
"cached": entry.Cached,
|
|
"upstream": entry.Upstream,
|
|
"question": question,
|
|
"rules": resultRulesToJSONRules(entry.Result.Rules),
|
|
}
|
|
|
|
if eip.Equal(entry.IP) {
|
|
jsonEntry["client_info"] = entry.client
|
|
}
|
|
|
|
if entry.ClientID != "" {
|
|
jsonEntry["client_id"] = entry.ClientID
|
|
}
|
|
|
|
if entry.ReqECS != "" {
|
|
jsonEntry["ecs"] = entry.ReqECS
|
|
}
|
|
|
|
if len(entry.Result.Rules) > 0 {
|
|
if r := entry.Result.Rules[0]; len(r.Text) > 0 {
|
|
jsonEntry["rule"] = r.Text
|
|
jsonEntry["filterId"] = r.FilterListID
|
|
}
|
|
}
|
|
|
|
if len(entry.Result.ServiceName) != 0 {
|
|
jsonEntry["service_name"] = entry.Result.ServiceName
|
|
}
|
|
|
|
l.setMsgData(entry, jsonEntry)
|
|
l.setOrigAns(entry, jsonEntry)
|
|
|
|
return jsonEntry
|
|
}
|
|
|
|
// setMsgData sets the message data in jsonEntry.
|
|
func (l *queryLog) setMsgData(entry *logEntry, jsonEntry jobject) {
|
|
if len(entry.Answer) == 0 {
|
|
return
|
|
}
|
|
|
|
msg := &dns.Msg{}
|
|
if err := msg.Unpack(entry.Answer); err != nil {
|
|
log.Debug("querylog: failed to unpack dns msg answer: %v: %s", entry.Answer, err)
|
|
|
|
return
|
|
}
|
|
|
|
jsonEntry["status"] = dns.RcodeToString[msg.Rcode]
|
|
// Old query logs may still keep AD flag value in the message. Try to get
|
|
// it from there as well.
|
|
jsonEntry["answer_dnssec"] = entry.AuthenticatedData || msg.AuthenticatedData
|
|
|
|
if a := answerToMap(msg); a != nil {
|
|
jsonEntry["answer"] = a
|
|
}
|
|
}
|
|
|
|
// setOrigAns sets the original answer data in jsonEntry.
|
|
func (l *queryLog) setOrigAns(entry *logEntry, jsonEntry jobject) {
|
|
if len(entry.OrigAnswer) == 0 {
|
|
return
|
|
}
|
|
|
|
orig := &dns.Msg{}
|
|
err := orig.Unpack(entry.OrigAnswer)
|
|
if err != nil {
|
|
log.Debug("querylog: orig.Unpack(entry.OrigAnswer): %v: %s", entry.OrigAnswer, err)
|
|
|
|
return
|
|
}
|
|
|
|
if a := answerToMap(orig); a != nil {
|
|
jsonEntry["original_answer"] = a
|
|
}
|
|
}
|
|
|
|
func resultRulesToJSONRules(rules []*filtering.ResultRule) (jsonRules []jobject) {
|
|
jsonRules = make([]jobject, len(rules))
|
|
for i, r := range rules {
|
|
jsonRules[i] = jobject{
|
|
"filter_list_id": r.FilterListID,
|
|
"text": r.Text,
|
|
}
|
|
}
|
|
|
|
return jsonRules
|
|
}
|
|
|
|
type dnsAnswer struct {
|
|
Type string `json:"type"`
|
|
Value string `json:"value"`
|
|
TTL uint32 `json:"ttl"`
|
|
}
|
|
|
|
func answerToMap(a *dns.Msg) (answers []*dnsAnswer) {
|
|
if a == nil || len(a.Answer) == 0 {
|
|
return nil
|
|
}
|
|
|
|
answers = make([]*dnsAnswer, 0, len(a.Answer))
|
|
for _, k := range a.Answer {
|
|
header := k.Header()
|
|
answer := &dnsAnswer{
|
|
Type: dns.TypeToString[header.Rrtype],
|
|
TTL: header.Ttl,
|
|
}
|
|
|
|
// Some special treatment for some well-known types.
|
|
//
|
|
// TODO(a.garipov): Consider just calling String() for everyone
|
|
// instead.
|
|
switch v := k.(type) {
|
|
case nil:
|
|
// Probably unlikely, but go on.
|
|
case *dns.A:
|
|
answer.Value = v.A.String()
|
|
case *dns.AAAA:
|
|
answer.Value = v.AAAA.String()
|
|
case *dns.MX:
|
|
answer.Value = fmt.Sprintf("%v %v", v.Preference, v.Mx)
|
|
case *dns.CNAME:
|
|
answer.Value = v.Target
|
|
case *dns.NS:
|
|
answer.Value = v.Ns
|
|
case *dns.SPF:
|
|
answer.Value = strings.Join(v.Txt, "\n")
|
|
case *dns.TXT:
|
|
answer.Value = strings.Join(v.Txt, "\n")
|
|
case *dns.PTR:
|
|
answer.Value = v.Ptr
|
|
case *dns.SOA:
|
|
answer.Value = fmt.Sprintf("%v %v %v %v %v %v %v", v.Ns, v.Mbox, v.Serial, v.Refresh, v.Retry, v.Expire, v.Minttl)
|
|
case *dns.CAA:
|
|
answer.Value = fmt.Sprintf("%v %v \"%v\"", v.Flag, v.Tag, v.Value)
|
|
case *dns.HINFO:
|
|
answer.Value = fmt.Sprintf("\"%v\" \"%v\"", v.Cpu, v.Os)
|
|
case *dns.RRSIG:
|
|
answer.Value = fmt.Sprintf("%v %v %v %v %v %v %v %v %v", dns.TypeToString[v.TypeCovered], v.Algorithm, v.Labels, v.OrigTtl, v.Expiration, v.Inception, v.KeyTag, v.SignerName, v.Signature)
|
|
default:
|
|
answer.Value = v.String()
|
|
}
|
|
|
|
answers = append(answers, answer)
|
|
}
|
|
|
|
return answers
|
|
}
|