mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-25 22:45:46 +03:00
143616ca6e
Merge in DNS/adguard-home from 4299-querylog-stats-api to master Updates #1717. Updates #4299. Squashed commit of the following: commit 5b706b7997a536bc4fd2c532fb89ca5ab3536848 Merge: 48b62b0f306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 22 13:53:09 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 48b62b0f1882f1ad120c6cdd90cd7dd8cb8a7738 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Wed Mar 22 12:25:04 2023 +0200 client: fix styles, add titles and descrs commit 97e31cff70d05b51bd0e5ea2d20e8e7a251a7e41 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Tue Mar 21 18:38:12 2023 +0200 client: add ignored domains for querylog commit 24d75c4376382205ae6b8f731b1cd23d517772c9 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Tue Mar 21 18:21:13 2023 +0200 client: add ignore domains for stats commit eefc3891d01f90af79fdac9ba8eea06d4d54a0bc Merge: 978675ea1daabb97
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 21 10:53:35 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 978675ea2c07bf248b4c8f26ebdf78cf59a12ef5 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 21 10:53:11 2023 +0300 openapi: fix chlog commit 2ed33007aade115d38b0ca582206cc10678b084c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 17:49:07 2023 +0300 home: fix tests commit 6af11520c164553ee9fce8f214ea169672188d7e Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 17:40:16 2023 +0300 home: fix typo commit 56acdfde5b1ee8d16b232c1293b91affbe319ad1 Merge: 319da34d48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 17:32:58 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 319da34de41ec84310b23bba2ad79c8a3a4c14ff Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Mar 3 17:34:38 2023 +0300 querylog: fix docs commit d5a8f24d5b336e7bdbbca18069f6ede8c96bcc2c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Mar 3 11:42:00 2023 +0300 stats: fix docs commit e0cbfc1c4078180a05835ce7587e9f45484adc81 Merge: 4743c810012e5beb
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 18:45:17 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 4743c81038052b9e0ca29ae5f1565021d36ca1ef Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 18:14:16 2023 +0300 all: imp code; fix time conversion commit 34310cffd7e331d098c535590245387051674fa8 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 12:34:11 2023 +0300 chlog: restore order commit cadd864a66655242948f1cb16e6d4945c0235d7e Merge: 2f3e25bebb226434
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 12:26:06 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 2f3e25bee56d2c6ddcf4aa2fc6a1dc51ed9b06e1 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 12:25:14 2023 +0300 all: fix fmt commit d54022baa6c8a3d0d3c308a9b6b1a6a9dc6ac7b6 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Feb 28 16:16:40 2023 +0300 all: imp code; fix chlog commit df22de91f59a51194c55e7bcbe5bc3fcc60cb8e3 Merge: e1ea4797a772212d
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Feb 27 17:24:09 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit e1ea4797af974c36f06683ffc6eaaae917921a43 Merge: d7db0a5abb80a7c2
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Feb 27 17:23:20 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit d7db0a5af1e1f49f6174c1c42e6d9306f2381d16 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Feb 27 17:12:20 2023 +0300 all: imp docs ... and 15 more commits
166 lines
4 KiB
Go
166 lines
4 KiB
Go
package querylog
|
|
|
|
import (
|
|
"fmt"
|
|
"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/stringutil"
|
|
"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)
|
|
|
|
// ShouldLog returns true if request for the host should be logged.
|
|
ShouldLog(host string, qType, qClass uint16) bool
|
|
}
|
|
|
|
// 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
|
|
|
|
// Ignored is the list of host names, which should not be written to
|
|
// log.
|
|
Ignored *stringutil.Set
|
|
}
|
|
|
|
// 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, err error) {
|
|
return newQueryLog(conf)
|
|
}
|
|
|
|
// newQueryLog crates a new queryLog.
|
|
func newQueryLog(conf Config) (l *queryLog, err error) {
|
|
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
|
|
|
|
err = validateIvl(conf.RotationIvl)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("unsupported interval: %w", err)
|
|
}
|
|
|
|
return l, nil
|
|
}
|