mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-29 02:18:51 +03:00
4293cf5945
Merge in DNS/adguard-home from 4358-fix-stats to master Updates #4358. Updates #4342. Squashed commit of the following: commit 5683cb304688ea639e5ba7f219a7bf12370211a4 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 4 18:20:54 2022 +0300 stats: rm races test commit 63dd67650ed64eaf9685b955a4fdf3c0067a7f8c Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 4 17:13:36 2022 +0300 stats: try to imp test commit 59a0f249fc00566872db62e362c87bc0c201b333 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 4 16:38:57 2022 +0300 stats: fix nil ptr deref commit 7fc3ff18a34a1d0e0fec3ca83a33f499ac752572 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Apr 7 16:02:51 2022 +0300 stats: fix races finally, imp tests commit c63f5f4e7929819fe79b3a1e392f6b91cd630846 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 4 00:56:49 2022 +0300 aghhttp: add register func commit 61adc7f0e95279c1b7f4a0c0af5ab387ee461411 Merge: edbdb2d49b3adac1
Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 4 00:36:01 2022 +0300 Merge branch 'master' into 4358-fix-stats commit edbdb2d4c6a06dcbf8107a28c4c3a61ba394e907 Merge: a91e4d7aa481ff4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 3 21:00:42 2022 +0300 Merge branch 'master' into 4358-fix-stats commit a91e4d7af13591eeef45cb7980d1ebc1650a5cb7 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 3 18:46:19 2022 +0300 stats: imp code, docs commit c5f3814c5c1a734ca8ff6726cc9ffc1177a055cf Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 3 18:16:13 2022 +0300 all: log changes commit 5e6caafc771dddc4c6be07c34658de359106fbe5 Merge: 091ba756eb8e8166
Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 3 18:09:10 2022 +0300 Merge branch 'master' into 4358-fix-stats commit 091ba75618d3689b9c04f05431283417c8cc52f9 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 3 18:07:39 2022 +0300 stats: imp docs, code commit f2b2de77ce5f0448d6df9232a614a3710f1e2e8a Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 2 17:09:30 2022 +0300 all: refactor stats & add mutexes commit b3f11c455ceaa3738ec20eefc46f866ff36ed046 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Apr 27 15:30:09 2022 +0300 WIP
162 lines
3.8 KiB
Go
162 lines
3.8 KiB
Go
package querylog
|
|
|
|
import (
|
|
"net"
|
|
"path/filepath"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
|
|
"github.com/AdguardTeam/golibs/errors"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"github.com/AdguardTeam/golibs/timeutil"
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
// QueryLog - main interface
|
|
type QueryLog interface {
|
|
Start()
|
|
|
|
// Close query log object
|
|
Close()
|
|
|
|
// Add a log entry
|
|
Add(params *AddParams)
|
|
|
|
// WriteDiskConfig - write configuration
|
|
WriteDiskConfig(c *Config)
|
|
}
|
|
|
|
// Config is the query log configuration structure.
|
|
type Config struct {
|
|
// Anonymizer processes the IP addresses to anonymize those if needed.
|
|
Anonymizer *aghnet.IPMut
|
|
|
|
// ConfigModified is called when the configuration is changed, for
|
|
// example by HTTP requests.
|
|
ConfigModified func()
|
|
|
|
// HTTPRegister registers an HTTP handler.
|
|
HTTPRegister aghhttp.RegisterFunc
|
|
|
|
// FindClient returns client information by their IDs.
|
|
FindClient func(ids []string) (c *Client, err error)
|
|
|
|
// BaseDir is the base directory for log files.
|
|
BaseDir string
|
|
|
|
// RotationIvl is the interval for log rotation. After that period, the
|
|
// old log file will be renamed, NOT deleted, so the actual log
|
|
// retention time is twice the interval. The value must be one of:
|
|
//
|
|
// 6 * time.Hour
|
|
// 1 * timeutil.Day
|
|
// 7 * timeutil.Day
|
|
// 30 * timeutil.Day
|
|
// 90 * timeutil.Day
|
|
//
|
|
RotationIvl time.Duration
|
|
|
|
// MemSize is the number of entries kept in a memory buffer before they
|
|
// are flushed to disk.
|
|
MemSize uint32
|
|
|
|
// Enabled tells if the query log is enabled.
|
|
Enabled bool
|
|
|
|
// FileEnabled tells if the query log writes logs to files.
|
|
FileEnabled bool
|
|
|
|
// AnonymizeClientIP tells if the query log should anonymize clients' IP
|
|
// addresses.
|
|
AnonymizeClientIP bool
|
|
}
|
|
|
|
// AddParams is the parameters for adding an entry.
|
|
type AddParams struct {
|
|
Question *dns.Msg
|
|
|
|
// ReqECS is the IP network extracted from EDNS Client-Subnet option of a
|
|
// request.
|
|
ReqECS *net.IPNet
|
|
|
|
// Answer is the response which is sent to the client, if any.
|
|
Answer *dns.Msg
|
|
|
|
// OrigAnswer is the response from an upstream server. It's only set if the
|
|
// answer has been modified by filtering.
|
|
OrigAnswer *dns.Msg
|
|
|
|
// Result is the filtering result (optional).
|
|
Result *filtering.Result
|
|
|
|
ClientID string
|
|
|
|
// Upstream is the URL of the upstream DNS server.
|
|
Upstream string
|
|
|
|
ClientProto ClientProto
|
|
|
|
ClientIP net.IP
|
|
|
|
// Elapsed is the time spent for processing the request.
|
|
Elapsed time.Duration
|
|
|
|
// Cached indicates if the response is served from cache.
|
|
Cached bool
|
|
|
|
// AuthenticatedData shows if the response had the AD bit set.
|
|
AuthenticatedData bool
|
|
}
|
|
|
|
// validate returns an error if the parameters aren't valid.
|
|
func (p *AddParams) validate() (err error) {
|
|
switch {
|
|
case p.Question == nil:
|
|
return errors.Error("question is nil")
|
|
case len(p.Question.Question) != 1:
|
|
return errors.Error("more than one question")
|
|
case len(p.Question.Question[0].Name) == 0:
|
|
return errors.Error("no host in question")
|
|
case p.ClientIP == nil:
|
|
return errors.Error("no client ip")
|
|
default:
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// New creates a new instance of the query log.
|
|
func New(conf Config) (ql QueryLog) {
|
|
return newQueryLog(conf)
|
|
}
|
|
|
|
// newQueryLog crates a new queryLog.
|
|
func newQueryLog(conf Config) (l *queryLog) {
|
|
findClient := conf.FindClient
|
|
if findClient == nil {
|
|
findClient = func(_ []string) (_ *Client, _ error) {
|
|
return nil, nil
|
|
}
|
|
}
|
|
|
|
l = &queryLog{
|
|
findClient: findClient,
|
|
|
|
logFile: filepath.Join(conf.BaseDir, queryLogFileName),
|
|
anonymizer: conf.Anonymizer,
|
|
}
|
|
|
|
l.conf = &Config{}
|
|
*l.conf = conf
|
|
|
|
if !checkInterval(conf.RotationIvl) {
|
|
log.Info(
|
|
"querylog: warning: unsupported rotation interval %s, setting to 1 day",
|
|
conf.RotationIvl,
|
|
)
|
|
l.conf.RotationIvl = timeutil.Day
|
|
}
|
|
|
|
return l
|
|
}
|