docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
for dataKey, dataValue := range statsData {
d[dataKey] = dataValue | <mask> }
<mask> a2 = convertMapToArray(m, maxDomains)
<mask> d["top_blocked_domains"] = convertTopArray(a2)
<mask>
<mask> m = map[string]uint64{}
<mask> for _, u := range units {
<mask> for _, it := range u.Clients {
<mask> m[it.Name] += it.Count
<mask> }
<mask> }
<mask> a2 = convertMapToArray... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/stats/stats_unit.go |
<mask> for _, it := range u.Clients {
<mask> m[it.Name] += it.Count
<mask> }
<mask> }
<mask> a2 = convertMapToArray(m, maxClients)
<mask> d["top_clients"] = convertTopArray(a2)
<mask>
<mask> // total counters:
<mask>
<mask> sum := unitDB{}
<mask> sum.NResult = make([]uint64, rLast)
</s> Pull ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/stats/stats_unit.go | |
// timecnt uint64 | <mask> fseeker fileSeeker // file seeker object
<mask> fpos uint64 // current file offset
<mask> nSeekRequests uint32 // number of Seek() requests made (finding a new line doesn't count)
<mask>
<mask> timecnt uint64
<mask> }
<mask>
<mask> type fileSeeker struct {
<mask> target uin... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/305df63054852e760cce16d7ede38a01ef88be3f | querylog/querylog_file.go |
log.Debug("querylog: read %d entries in %v, %v/entry, seek-reqs:%d",
r.count, elapsed, perunit, r.nSeekRequests)
// timePercent := uint64(0)
// if elapsed.Nanoseconds() != 0 {
// timePercent = r.timecnt * 100 / uint64(elapsed.Nanoseconds())
// }
// log.Debug("querylog: read %d entries in %v, %v/entry, seek-re... | <mask> var perunit time.Duration
<mask> if r.count > 0 {
<mask> perunit = elapsed / time.Duration(r.count)
<mask> }
<mask> log.Debug("querylog: read %d entries in %v, %v/entry, seek-reqs:%d time:%dus (%d%%)",
<mask> r.count, elapsed, perunit, r.nSeekRequests, r.timecnt/1000, r.timecnt*100/uint64(elapsed.... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/305df63054852e760cce16d7ede38a01ef88be3f | querylog/querylog_file.go |
// st := time.Now() | <mask> if !r.applySearch(str) {
<mask> continue
<mask> }
<mask>
<mask> st := time.Now()
<mask> var ent logEntry
<mask> decode(&ent, str)
<mask> r.timecnt += uint64(time.Now().Sub(st).Nanoseconds())
<mask>
<mask> return &ent
</s> - querylog: remove time counter (fix zero div exception) </s>... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/305df63054852e760cce16d7ede38a01ef88be3f | querylog/querylog_file.go |
// r.timecnt += uint64(time.Now().Sub(st).Nanoseconds()) | <mask>
<mask> st := time.Now()
<mask> var ent logEntry
<mask> decode(&ent, str)
<mask> r.timecnt += uint64(time.Now().Sub(st).Nanoseconds())
<mask>
<mask> return &ent
<mask> }
<mask> }
<mask>
</s> - querylog: remove time counter (fix zero div exception) </s> remove st := time.Now()
</s> add ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/305df63054852e760cce16d7ede38a01ef88be3f | querylog/querylog_file.go |
<mask> EnableEDNSClientSubnet: s.conf.EnableEDNSClientSubnet,
<mask> MaxGoroutines: int(s.conf.MaxGoroutines),
<mask> }
<mask>
<mask> if s.conf.QUICListenAddr != nil {
<mask> proxyConfig.QUICListenAddr = []*net.UDPAddr{s.conf.QUICListenAddr}
<mask> }
<mask>
<mask> if s.conf.CacheSize != 0 ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/314867734ac60e430143a25060ee6e62e027a9cb | dnsforward/config.go | |
if len(s.conf.CertificateChainData) == 0 || len(s.conf.PrivateKeyData) == 0 {
return nil
}
if s.conf.TLSListenAddr == nil &&
s.conf.QUICListenAddr == nil {
return nil
}
if s.conf.TLSListenAddr != nil { | <mask> }
<mask>
<mask> // prepareTLS - prepares TLS configuration for the DNS proxy
<mask> func (s *Server) prepareTLS(proxyConfig *proxy.Config) error {
<mask> if s.conf.TLSListenAddr != nil && len(s.conf.CertificateChainData) != 0 && len(s.conf.PrivateKeyData) != 0 {
<mask> proxyConfig.TLSListenAddr = []*ne... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/314867734ac60e430143a25060ee6e62e027a9cb | dnsforward/config.go |
}
if s.conf.QUICListenAddr != nil {
proxyConfig.QUICListenAddr = []*net.UDPAddr{s.conf.QUICListenAddr}
}
var err error
s.conf.cert, err = tls.X509KeyPair(s.conf.CertificateChainData, s.conf.PrivateKeyData)
if err != nil {
return errorx.Decorate(err, "Failed to parse TLS keypair")
}
if s.conf.StrictSNIChe... | <mask> // prepareTLS - prepares TLS configuration for the DNS proxy
<mask> func (s *Server) prepareTLS(proxyConfig *proxy.Config) error {
<mask> if s.conf.TLSListenAddr != nil && len(s.conf.CertificateChainData) != 0 && len(s.conf.PrivateKeyData) != 0 {
<mask> proxyConfig.TLSListenAddr = []*net.TCPAddr{s.conf.TL... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/314867734ac60e430143a25060ee6e62e027a9cb | dnsforward/config.go |
return errorx.Decorate(err, "x509.ParseCertificate(): %s", err) | <mask> proxyConfig.TLSListenAddr = []*net.TCPAddr{s.conf.TLSListenAddr}
<mask> var err error
<mask> s.conf.cert, err = tls.X509KeyPair(s.conf.CertificateChainData, s.conf.PrivateKeyData)
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Failed to parse TLS keypair")
<mask> }
<mask>
<mask>... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/314867734ac60e430143a25060ee6e62e027a9cb | dnsforward/config.go |
if len(x.DNSNames) != 0 {
s.conf.dnsNames = x.DNSNames
log.Debug("DNS: using DNS names from certificate's SAN: %v", x.DNSNames)
sort.Strings(s.conf.dnsNames)
} else {
s.conf.dnsNames = append(s.conf.dnsNames, x.Subject.CommonName)
log.Debug("DNS: using DNS name from certificate's CN: %s", x.Subject.C... | <mask> s.conf.cert, err = tls.X509KeyPair(s.conf.CertificateChainData, s.conf.PrivateKeyData)
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Failed to parse TLS keypair")
<mask> }
<mask>
<mask> if s.conf.StrictSNICheck {
<mask> x, err := x509.ParseCertificate(s.conf.cert.Certificate[0]... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/314867734ac60e430143a25060ee6e62e027a9cb | dnsforward/config.go |
} | <mask> } else {
<mask> s.conf.dnsNames = append(s.conf.dnsNames, x.Subject.CommonName)
<mask> log.Debug("DNS: using DNS name from certificate's CN: %s", x.Subject.CommonName)
<mask> }
<mask>
<mask> proxyConfig.TLSConfig = &tls.Config{
<mask> GetCertificate: s.onGetCertificate,
<mask> MinVersion:... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/314867734ac60e430143a25060ee6e62e027a9cb | dnsforward/config.go |
proxyConfig.TLSConfig = &tls.Config{
GetCertificate: s.onGetCertificate,
MinVersion: tls.VersionTLS12, | <mask> log.Debug("DNS: using DNS name from certificate's CN: %s", x.Subject.CommonName)
<mask> }
<mask> }
<mask>
<mask> proxyConfig.TLSConfig = &tls.Config{
<mask> GetCertificate: s.onGetCertificate,
<mask> MinVersion: tls.VersionTLS12,
<mask> }
<mask> }
<mask> upstream.RootCAs = s.c... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/314867734ac60e430143a25060ee6e62e027a9cb | dnsforward/config.go |
"fmt" | <mask> "crypto/x509"
<mask> "crypto/x509/pkix"
<mask> "encoding/pem"
<mask> "math/big"
<mask> "net"
<mask> "sort"
<mask> "sync"
</s> - (dnsforward): fixed running only quic, added a test
QUIC was not initialized if DOT port is not set. Also, there were no
tests on DoQ functionality. </s> remove proxyC... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/314867734ac60e430143a25060ee6e62e027a9cb | dnsforward/dnsforward_test.go |
golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= | <mask> golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
<mask> golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/314867734ac60e430143a25060ee6e62e027a9cb | go.sum |
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= | <mask> gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
<mask> gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/314867734ac60e430143a25060ee6e62e027a9cb | go.sum |
<symbol id="service_qq" viewBox="0 0 32 32" >
<g fill="none" fillRule="evenodd">
<path d="M0 0h32v32H0z" />
<g fill="currentColor" fillRule="nonzero">
<path d="M11.25 32C8.342 32 6 30.74 6 29.242c0-1.497 2.342-2.757 5.25-2.757s5.25 1.26 5.25 2.757S... | <mask> </symbol>
<mask>
<mask> <symbol id="question" width="20px" height="20px">
<mask> <g transform="translate(-982.000000, -454.000000) translate(416.000000, 440.000000) translate(564.000000, 12.000000)"
<mask> fill="none" fillRule="evenodd">
<mask> <c... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32b24ce0930cbdb9b759f77f2c0773f3e61cb7b3 | client/src/components/ui/Icons.js |
{
id: 'qq',
name: 'QQ',
}, | <mask> id: 'tiktok',
<mask> name: 'TikTok',
<mask> },
<mask> ];
<mask>
<mask> export const SERVICES_ID_NAME_MAP = SERVICES.reduce((acc, { id, name }) => {
<mask> acc[id] = name;
<mask> return acc;
<mask> }, {});
</s> + dnsfilter, client: Add qq to blocked services
Squashed commit... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32b24ce0930cbdb9b759f77f2c0773f3e61cb7b3 | client/src/helpers/constants.js |
{"qq", []string{"||qq.com^", "||qqzaixian.com^"}}, | <mask> "||tiktokv.com^",
<mask> }},
<mask> }
<mask>
<mask> // convert array to map
<mask> func initBlockedServices() {
</s> + dnsfilter, client: Add qq to blocked services
Squashed commit of the following:
commit ffb2a1065fc9edd2b840cccbb96a0a2c1334bf00
Merge: 0f966d5b 3acfaa16
Author: ArtemBaskal <a.baska... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32b24ce0930cbdb9b759f77f2c0773f3e61cb7b3 | dnsfilter/blocked_services.go |
QueryLogEnabled bool `yaml:"querylog_enabled"` // if true, query log is enabled
QueryLogFileEnabled bool `yaml:"querylog_file_enabled"` // if true, query log will be written to a file
QueryLogInterval uint32 `yaml:"querylog_interval"` // time interval for query log (in days)
QueryLogMemSize ... | <mask>
<mask> // time interval for statistics (in days)
<mask> StatsInterval uint32 `yaml:"statistics_interval"`
<mask>
<mask> QueryLogEnabled bool `yaml:"querylog_enabled"` // if true, query log is enabled
<mask> QueryLogInterval uint32 `yaml:"querylog_interval"` // time interval for query log ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d1f385ff4252fdda5d81928caaa09052b62451 | home/config.go |
config.DNS.QueryLogFileEnabled = true | <mask> func initConfig() {
<mask> config.WebSessionTTLHours = 30 * 24
<mask>
<mask> config.DNS.QueryLogEnabled = true
<mask> config.DNS.QueryLogInterval = 90
<mask> config.DNS.QueryLogMemSize = 1000
<mask>
<mask> config.DNS.CacheSize = 4 * 1024 * 1024
<mask> config.DNS.DnsfilterConf.SafeBrowsingCacheSi... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d1f385ff4252fdda5d81928caaa09052b62451 | home/config.go |
dc := querylog.Config{} | <mask> config.DNS.StatsInterval = sdc.Interval
<mask> }
<mask>
<mask> if Context.queryLog != nil {
<mask> dc := querylog.DiskConfig{}
<mask> Context.queryLog.WriteDiskConfig(&dc)
<mask> config.DNS.QueryLogEnabled = dc.Enabled
<mask> config.DNS.QueryLogInterval = dc.Interval
<mask> config.DNS.Que... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d1f385ff4252fdda5d81928caaa09052b62451 | home/config.go |
config.DNS.QueryLogFileEnabled = dc.FileEnabled | <mask> dc := querylog.Config{}
<mask> Context.queryLog.WriteDiskConfig(&dc)
<mask> config.DNS.QueryLogEnabled = dc.Enabled
<mask> config.DNS.QueryLogInterval = dc.Interval
<mask> config.DNS.QueryLogMemSize = dc.MemSize
<mask> config.DNS.AnonymizeClientIP = dc.AnonymizeClientIP
<mask> }
</s> + confi... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d1f385ff4252fdda5d81928caaa09052b62451 | home/config.go |
FileEnabled: config.DNS.QueryLogFileEnabled, | <mask> }
<mask> conf := querylog.Config{
<mask> Enabled: config.DNS.QueryLogEnabled,
<mask> BaseDir: baseDir,
<mask> Interval: config.DNS.QueryLogInterval,
<mask> MemSize: config.DNS.QueryLogMemSize,
<mask> AnonymizeClientIP: config.DNS.AnonymizeClientIP,
<mask... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d1f385ff4252fdda5d81928caaa09052b62451 | home/dns.go |
func (l *queryLog) WriteDiskConfig(c *Config) {
*c = *l.conf | <mask> func checkInterval(days uint32) bool {
<mask> return days == 1 || days == 7 || days == 30 || days == 90
<mask> }
<mask>
<mask> func (l *queryLog) WriteDiskConfig(dc *DiskConfig) {
<mask> dc.Enabled = l.conf.Enabled
<mask> dc.Interval = l.conf.Interval
<mask> dc.MemSize = l.conf.MemSize
<mask> dc.A... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d1f385ff4252fdda5d81928caaa09052b62451 | querylog/qlog.go |
if !l.conf.FileEnabled {
if len(l.buffer) > int(l.conf.MemSize) {
// writing to file is disabled - just remove the oldest entry from array
l.buffer = l.buffer[1:]
}
} else if !l.flushPending { | <mask>
<mask> l.bufferLock.Lock()
<mask> l.buffer = append(l.buffer, &entry)
<mask> needFlush := false
<mask> if !l.flushPending {
<mask> needFlush = len(l.buffer) >= int(l.conf.MemSize)
<mask> if needFlush {
<mask> l.flushPending = true
<mask> }
<mask> }
</s> + config: new setting "querylog_f... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d1f385ff4252fdda5d81928caaa09052b62451 | querylog/qlog.go |
go func() {
_ = l.flushLogBuffer(false)
}() | <mask> l.bufferLock.Unlock()
<mask>
<mask> // if buffer needs to be flushed to disk, do it now
<mask> if needFlush {
<mask> // write to file
<mask> // do it in separate goroutine -- we are stalling DNS response this whole time
<mask> go l.flushLogBuffer(false) // nolint
<mask> }
<mask> }
</s> + con... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d1f385ff4252fdda5d81928caaa09052b62451 | querylog/qlog.go |
Enabled: true,
FileEnabled: true,
Interval: 1,
MemSize: 100, | <mask>
<mask> // Check adding and loading (with filtering) entries from disk and memory
<mask> func TestQueryLog(t *testing.T) {
<mask> conf := Config{
<mask> Enabled: true,
<mask> Interval: 1,
<mask> MemSize: 100,
<mask> }
<mask> conf.BaseDir = prepareTestDir()
<mask> defer func() { _ = os.Remov... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d1f385ff4252fdda5d81928caaa09052b62451 | querylog/qlog_test.go |
Enabled: true,
FileEnabled: true,
Interval: 1,
MemSize: 100, | <mask> }
<mask>
<mask> func TestQueryLogMaxFileScanEntries(t *testing.T) {
<mask> conf := Config{
<mask> Enabled: true,
<mask> Interval: 1,
<mask> MemSize: 100,
<mask> }
<mask> conf.BaseDir = prepareTestDir()
<mask> defer func() { _ = os.RemoveAll(conf.BaseDir) }()
<mask> l := newQueryLog(conf)... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d1f385ff4252fdda5d81928caaa09052b62451 | querylog/qlog_test.go |
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // DiskConfig - configuration settings that are stored on disk
<mask> type DiskConfig struct {
<mask> Enabled bool
<mask> Interval uint32
<mask> MemSize uint32
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d1f385ff4252fdda5d81928caaa09052b62451 | querylog/querylog.go | |
WriteDiskConfig(c *Config) | <mask> // Add a log entry
<mask> Add(params AddParams)
<mask>
<mask> // WriteDiskConfig - write configuration
<mask> WriteDiskConfig(dc *DiskConfig)
<mask> }
<mask>
<mask> // Config - configuration object
<mask> type Config struct {
<mask> Enabled bool
</s> + config: new setting "querylog_fi... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d1f385ff4252fdda5d81928caaa09052b62451 | querylog/querylog.go |
Enabled bool // enable the module
FileEnabled bool // write logs to file | <mask> }
<mask>
<mask> // Config - configuration object
<mask> type Config struct {
<mask> Enabled bool
<mask> BaseDir string // directory where log file is stored
<mask> Interval uint32 // interval to rotate logs (in days)
<mask> MemSize uint32 // number of entries k... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d1f385ff4252fdda5d81928caaa09052b62451 | querylog/querylog.go |
if !l.conf.FileEnabled {
return nil
}
| <mask> )
<mask>
<mask> // flushLogBuffer flushes the current buffer to file and resets the current buffer
<mask> func (l *queryLog) flushLogBuffer(fullFlush bool) error {
<mask> l.fileFlushLock.Lock()
<mask> defer l.fileFlushLock.Unlock()
<mask>
<mask> // flush remainder to file
</s> + config: new setting... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d1f385ff4252fdda5d81928caaa09052b62451 | querylog/querylog_file.go |
/data/ | <mask> /AdGuardHome
<mask> /AdGuardHome.yaml
<mask> /build/
<mask> /client/node_modules/
<mask> /coredns
<mask> /Corefile
<mask> /dnsfilter.txt
<mask> /querylog.json
</s> Fix #371 #421
Filters are now saved to a file
Also, they're loaded from the file on startup
Filter ID is not passed to the CoreDNS plugin c... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | .gitignore |
<mask> executable, err := os.Executable()
<mask> if err != nil {
<mask> panic(err)
<mask> }
<mask> config.ourBinaryDir = filepath.Dir(executable)
<mask> }
<mask>
<mask> doConfigRename := true
<mask>
<mask> // config can be specified, which reads options from there, but other command line flags... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | app.go | |
executableName := filepath.Base(executable)
if executableName == "AdGuardHome" {
// Binary build
config.ourBinaryDir = filepath.Dir(executable)
} else {
// Most likely we're debugging -- using current working directory in this case
workDir, _ := os.Getwd()
config.ourBinaryDir = workDir
}
log.Pr... | <mask> }
<mask> config.ourBinaryDir = filepath.Dir(executable)
<mask> }
<mask>
<mask> doConfigRename := true
<mask>
<mask> // config can be specified, which reads options from there, but other command line flags have to override config values
<mask> // therefore, we must do it manually instead of usin... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | app.go |
<mask> os.Exit(64)
<mask> }
<mask> }
<mask> if configFilename != nil {
<mask> // config was manually specified, don't do anything
<mask> doConfigRename = false
<mask> config.ourConfigFilename = *configFilename
<mask> }
<mask>
<mask> if doConfigRename {
<mask> err := renameOldConfi... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | app.go | |
<mask> doConfigRename = false
<mask> config.ourConfigFilename = *configFilename
<mask> }
<mask>
<mask> if doConfigRename {
<mask> err := renameOldConfigIfNeccessary()
<mask> if err != nil {
<mask> panic(err)
<mask> }
<mask> }
<mask>
<mask> err := askUsernamePasswordIfPossible()
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | app.go | |
// Eat all args so that coredns can start happily | <mask> config.BindPort = *bindPort
<mask> }
<mask> }
<mask>
<mask> // eat all args so that coredns can start happily
<mask> if len(os.Args) > 1 {
<mask> os.Args = os.Args[:1]
<mask> }
<mask>
<mask> err := writeConfig()
</s> Fix #371 #421
Filters are now saved to a file
Also, they're loaded fro... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | app.go |
// Do the upgrade if necessary
err := upgradeConfig()
if err != nil {
log.Fatal(err)
}
// Save the updated config
err = writeConfig() | <mask> if len(os.Args) > 1 {
<mask> os.Args = os.Args[:1]
<mask> }
<mask>
<mask> err := writeConfig()
<mask> if err != nil {
<mask> log.Fatal(err)
<mask> }
<mask>
<mask> address := net.JoinHostPort(config.BindHost, strconv.Itoa(config.BindPort))
</s> Fix #371 #421
Filters are now saved to a file... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | app.go |
// Load filters from the disk
for i := range config.Filters {
filter := &config.Filters[i]
err = filter.load()
if err != nil {
log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
}
}
| <mask> log.Fatal(err)
<mask> }
<mask>
<mask> address := net.JoinHostPort(config.BindHost, strconv.Itoa(config.BindPort))
<mask>
<mask> runFilterRefreshers()
<mask>
<mask> http.Handle("/", optionalAuthHandler(http.FileServer(box)))
</s> Fix #371 #421
Filters are now saved to a file
Also, they're loade... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | app.go |
// Performs necessary upgrade operations if needed
func upgradeConfig() error {
if config.SchemaVersion == SchemaVersion {
// No upgrade, do nothing | <mask> config.AuthPass = password
<mask> return nil
<mask> }
<mask>
<mask> func renameOldConfigIfNeccessary() error {
<mask> oldConfigFile := filepath.Join(config.ourBinaryDir, "AdguardDNS.yaml")
<mask> _, err := os.Stat(oldConfigFile)
<mask> if os.IsNotExist(err) {
<mask> // do nothing, file doesn't e... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | app.go |
if config.SchemaVersion > SchemaVersion {
// Unexpected -- config file is newer than the
return fmt.Errorf("configuration file is supposed to be used with a newer version of AdGuard Home, schema=%d", config.SchemaVersion) | <mask> trace("File %s doesn't exist, nothing to do", oldConfigFile)
<mask> return nil
<mask> }
<mask>
<mask> newConfigFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
<mask> _, err = os.Stat(newConfigFile)
<mask> if !os.IsNotExist(err) {
<mask> // do nothing, file doesn't exist
<... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | app.go |
// Perform upgrade operations for each consecutive version upgrade
for oldVersion, newVersion := config.SchemaVersion, config.SchemaVersion+1; newVersion <= SchemaVersion; {
err := upgradeConfigSchema(oldVersion, newVersion)
if err != nil {
log.Fatal(err)
}
// Increment old and new versions
oldVersion+... | <mask> trace("File %s already exists, will not overwrite", newConfigFile)
<mask> return nil
<mask> }
<mask>
<mask> err = os.Rename(oldConfigFile, newConfigFile)
<mask> if err != nil {
<mask> log.Printf("Failed to rename %s to %s: %s", oldConfigFile, newConfigFile, err)
<mask> return err
<mask> }
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | app.go |
"gopkg.in/yaml.v2" | <mask>
<mask> import (
<mask> "bytes"
<mask> "io/ioutil"
<mask> "log"
<mask> "os"
<mask> "path/filepath"
<mask> "regexp"
</s> Fix #371 #421
Filters are now saved to a file
Also, they're loaded from the file on startup
Filter ID is not passed to the CoreDNS plugin config (server-side AG DNS must be chan... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
<mask> "regexp"
<mask> "sync"
<mask> "text/template"
<mask> "time"
<mask>
<mask> "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> // configuration is loaded from YAML
<mask> type configuration struct {
<mask> ourConfigFilename string
</s> Fix #371 #421
Filters are now saved to a file
Also, they're loaded ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go | |
// Current schema version. We compare it with the value from
// the configuration file and perform necessary upgrade operations if needed
const SchemaVersion = 1
// Directory where we'll store all downloaded filters contents
const FiltersDir = "filters"
| <mask> "text/template"
<mask> "time"
<mask> )
<mask>
<mask> // configuration is loaded from YAML
<mask> type configuration struct {
<mask> ourConfigFilename string
<mask> ourBinaryDir string
<mask> // Directory to store data (i.e. filters contents)
</s> Fix #371 #421
Filters are now saved to a fil... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
// Directory to store data (i.e. filters contents)
ourDataDir string | <mask> // configuration is loaded from YAML
<mask> type configuration struct {
<mask> ourConfigFilename string
<mask> ourBinaryDir string
<mask>
<mask> // Schema version of the config file. This value is used when performing the app updates.
<mask> SchemaVersion int `yaml:"schema_version"`
<... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
// Schema version of the config file. This value is used when performing the app updates.
SchemaVersion int `yaml:"schema_version"`
BindHost string `yaml:"bind_host"`
BindPort int `yaml:"bind_port"`
AuthName string `yaml:"auth_name"`
AuthPass string `ya... | <mask> type configuration struct {
<mask> ourConfigFilename string
<mask> ourBinaryDir string
<mask>
<mask> BindHost string `yaml:"bind_host"`
<mask> BindPort int `yaml:"bind_port"`
<mask> AuthName string `yaml:"auth_name"`
<mask> AuthPass string `yaml:"auth_pass"`... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
type coreDnsFilter struct {
ID int `yaml:"-"`
Path string `yaml:"-"`
}
| <mask>
<mask> sync.RWMutex `yaml:"-"`
<mask> }
<mask>
<mask> type coreDNSConfig struct {
<mask> binaryFile string
<mask> coreFile string
<mask> Filters []coreDnsFilter `yaml:"-"`
<mask> Port int `yaml:"port"`
<mask> ProtectionEnabled bool ... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
Filters []coreDnsFilter `yaml:"-"`
Port int `yaml:"port"`
ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
SafeSearchEnabled bool... | <mask>
<mask> type coreDNSConfig struct {
<mask> binaryFile string
<mask> coreFile string
<mask> FilterFile string `yaml:"-"`
<mask> Port int `yaml:"port"`
<mask> ProtectionEnabled bool `yaml:"protection_enabled"`
<mask> FilteringEnabled bool ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
ID int `json:"ID"` // auto-assigned when filter is added | <mask> UpstreamDNS []string `yaml:"upstream_dns"`
<mask> }
<mask>
<mask> type filter struct {
<mask> URL string `json:"url"`
<mask> Name string `json:"name" yaml:"name"`
<mask> Enabled bool `json:"enabled"`
<mask> RulesCount int `json:"rules_count" yaml:"-"`
<mask>... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
ourDataDir: "data", | <mask> // initialize to default values, will be changed later when reading config or parsing command line
<mask> var config = configuration{
<mask> ourConfigFilename: "AdGuardHome.yaml",
<mask> BindPort: 3000,
<mask> BindHost: "127.0.0.1",
<mask> CoreDNS: coreDNSConfig{
<mask> Port: ... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
binaryFile: "coredns", // only filename, no path
coreFile: "Corefile", // only filename, no path | <mask> BindPort: 3000,
<mask> BindHost: "127.0.0.1",
<mask> CoreDNS: coreDNSConfig{
<mask> Port: 53,
<mask> binaryFile: "coredns", // only filename, no path
<mask> coreFile: "Corefile", // only filename, no path
<mask> FilterFile: ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
{ID: 1, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard Simplified Domain Names filter"},
{ID: 2, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway"},
{ID: 3, Enabled: false, URL: "https://hosts-file.net/ad_servers.txt", Name: "hpHosts - Ad... | <mask> Cache: "cache",
<mask> Prometheus: "prometheus :9153",
<mask> },
<mask> Filters: []filter{
<mask> {Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt"},
<mask> {Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway"},
<mask... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
err = writeFileSafe(configfile, yamlText) | <mask> if err != nil {
<mask> log.Printf("Couldn't generate YAML file: %s", err)
<mask> return err
<mask> }
<mask> err = ioutil.WriteFile(configfile+".tmp", yamlText, 0644)
<mask> if err != nil {
<mask> log.Printf("Couldn't write YAML config: %s", err)
<mask> return err
<mask> }
<mask> err = os.... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
log.Printf("Couldn't save YAML config: %s", err) | <mask> return err
<mask> }
<mask> err = ioutil.WriteFile(configfile+".tmp", yamlText, 0644)
<mask> if err != nil {
<mask> log.Printf("Couldn't write YAML config: %s", err)
<mask> return err
<mask> }
<mask> err = os.Rename(configfile+".tmp", configfile)
<mask> if err != nil {
<mask> log.Printf("C... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
userFilter := getUserFilter()
err = userFilter.save() | <mask> if err != nil {
<mask> log.Printf("Couldn't write YAML config: %s", err)
<mask> return err
<mask> }
<mask> err = os.Rename(configfile+".tmp", configfile)
<mask> if err != nil {
<mask> log.Printf("Couldn't rename YAML config: %s", err)
<mask> return err
<mask> }
<mask> return nil
</s> Fix... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
log.Printf("Couldn't save the user filter: %s", err) | <mask> return err
<mask> }
<mask> err = os.Rename(configfile+".tmp", configfile)
<mask> if err != nil {
<mask> log.Printf("Couldn't rename YAML config: %s", err)
<mask> return err
<mask> }
<mask> return nil
<mask> }
<mask>
</s> Fix #371 #421
Filters are now saved to a file
Also, they're loaded f... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
err = writeFileSafe(corefile, []byte(configtext)) | <mask> if err != nil {
<mask> log.Printf("Couldn't generate DNS config: %s", err)
<mask> return err
<mask> }
<mask> err = ioutil.WriteFile(corefile+".tmp", []byte(configtext), 0644)
<mask> if err != nil {
<mask> log.Printf("Couldn't write DNS config: %s", err)
<mask> }
<mask> err = os.Rename(corefi... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
log.Printf("Couldn't save DNS config: %s", err)
return err | <mask> return err
<mask> }
<mask> err = ioutil.WriteFile(corefile+".tmp", []byte(configtext), 0644)
<mask> if err != nil {
<mask> log.Printf("Couldn't write DNS config: %s", err)
<mask> }
<mask> err = os.Rename(corefile+".tmp", corefile)
<mask> if err != nil {
<mask> log.Printf("Couldn't rename DNS... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
return nil | <mask> err = os.Rename(corefile+".tmp", corefile)
<mask> if err != nil {
<mask> log.Printf("Couldn't rename DNS config: %s", err)
<mask> }
<mask> return err
<mask> }
<mask>
<mask> func writeAllConfigs() error {
<mask> err := writeConfig()
<mask> if err != nil {
</s> Fix #371 #421
Filters are now sa... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
{{if .ProtectionEnabled}}dnsfilter { | <mask> return nil
<mask> }
<mask>
<mask> const coreDNSConfigTemplate = `.:{{.Port}} {
<mask> {{if .ProtectionEnabled}}dnsfilter {{if .FilteringEnabled}}{{.FilterFile}}{{end}} {
<mask> {{if .SafeBrowsingEnabled}}safebrowsing{{end}}
<mask> {{if .ParentalEnabled}}parental {{.ParentalSensitivit... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
{{if .FilteringEnabled}}
{{range .Filters}}
filter {{.ID}} "{{.Path}}"
{{end}}
{{end}} | <mask> {{if .ParentalEnabled}}parental {{.ParentalSensitivity}}{{end}}
<mask> {{if .SafeSearchEnabled}}safesearch{{end}}
<mask> {{if .QueryLogEnabled}}querylog{{end}}
<mask> blocked_ttl {{.BlockedResponseTTL}}
<mask> }{{end}}
<mask> {{.Pprof}}
<mask> hosts {
<mask> ... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
// fill the list of filters
filters := make([]coreDnsFilter, 0)
// first of all, append the user filter
userFilter := getUserFilter()
// TODO: Don't add if empty
//if len(userFilter.contents) > 0 {
filters = append(filters, coreDnsFilter{ID: userFilter.ID, Path: userFilter.getFilterFilePath()})
//}
// then ... | <mask> }
<mask>
<mask> var configBytes bytes.Buffer
<mask> temporaryConfig := config.CoreDNS
<mask> temporaryConfig.FilterFile = filepath.Join(config.ourBinaryDir, config.CoreDNS.FilterFile)
<mask> // run the template
<mask> err = t.Execute(&configBytes, &temporaryConfig)
<mask> if err != nil {
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | config.go |
<mask> "strings"
<mask> "time"
<mask>
<mask> coredns_plugin "github.com/AdguardTeam/AdGuardHome/coredns_plugin"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/miekg/dns"
<mask> "gopkg.in/asaskevich/govalidator.v4"
<mask> )
<mask>
<mask> const updatePeriod = time.Minute * 30
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go | |
ok, err := filter.update(true) | <mask> return
<mask> }
<mask> }
<mask>
<mask> ok, err := filter.update(time.Now())
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't fetch filter from url %s: %s", filter.URL, err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusBadRequest)
<mask> retur... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> err = writeFilterFile()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write filter file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, err... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go | |
// TODO: Start using filter ID | <mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> }
<mask> }
<mask>
<mask> func handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) {
<mask> parameters, err := parseParametersFromBody(r.Body)
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("failed to parse parame... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
} else {
// Remove the filter file
err := os.Remove(filter.getFilterFilePath())
if err != nil {
errortext := fmt.Sprintf("Couldn't remove the filter file: %s", err)
http.Error(w, errortext, http.StatusInternalServerError)
return
} | <mask> for _, filter := range config.Filters {
<mask> if filter.URL != url {
<mask> newFilters = append(newFilters, filter)
<mask> }
<mask> }
<mask> // Update the configuration after removing filter files
<mask> config.Filters = newFilters
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
</... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
// Update the configuration after removing filter files | <mask> return
<mask> }
<mask> }
<mask> }
<mask> config.Filters = newFilters
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> // TODO: Start using filter ID
<mask> func handleFilteringEnableURL(w http.ResponseWriter, r *http.Request) {
</s> Fix #371 #421
Filters are now save... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
<mask> newFilters = append(newFilters, filter)
<mask> }
<mask> }
<mask> config.Filters = newFilters
<mask> err = writeFilterFile()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write filter file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.Stat... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go | |
// TODO: Start using filter ID | <mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func handleFilteringEnableURL(w http.ResponseWriter, r *http.Request) {
<mask> parameters, err := parseParametersFromBody(r.Body)
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("failed to parse parameters from body: %s", err)
<m... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
<mask> }
<mask>
<mask> // kick off refresh of rules from new URLs
<mask> refreshFiltersIfNeccessary()
<mask> err = writeFilterFile()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write filter file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.Statu... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go | |
// TODO: Start using filter ID | <mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func handleFilteringDisableURL(w http.ResponseWriter, r *http.Request) {
<mask> parameters, err := parseParametersFromBody(r.Body)
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("failed to parse parameters from body: %s", err)
<... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
<mask> http.Error(w, "URL parameter was not previously added", http.StatusBadRequest)
<mask> return
<mask> }
<mask>
<mask> err = writeFilterFile()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write filter file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, error... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go | |
<mask> return
<mask> }
<mask>
<mask> config.UserRules = strings.Split(string(body), "\n")
<mask> err = writeFilterFile()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write filter file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalSe... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go | |
<mask> }()
<mask> }
<mask>
<mask> func refreshFiltersIfNeccessary() int {
<mask> now := time.Now()
<mask> config.Lock()
<mask>
<mask> // deduplicate
<mask> // TODO: move it somewhere else
<mask> {
</s> Fix #371 #421
Filters are now saved to a file
Also, they're loaded from the file on startup
Filter... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go | |
updated, err := filter.update(false) | <mask> // fetch URLs
<mask> updateCount := 0
<mask> for i := range config.Filters {
<mask> filter := &config.Filters[i] // otherwise we will be operating on a copy
<mask> updated, err := filter.update(now)
<mask> if err != nil {
<mask> log.Printf("Failed to update filter %s: %s\n", filter.URL, err)
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
<mask> }
<mask> config.Unlock()
<mask>
<mask> if updateCount > 0 {
<mask> err := writeFilterFile()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write filter file: %s", err)
<mask> log.Println(errortext)
<mask> }
<mask> tellCoreDNSToReload()
<mask> }
<mask> return upda... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go | |
// Checks for filters updates
// If "force" is true -- does not check the filter's LastUpdated field
func (filter *filter) update(force bool) (bool, error) { | <mask> }
<mask> return updateCount
<mask> }
<mask>
<mask> func (filter *filter) update(now time.Time) (bool, error) {
<mask> if !filter.Enabled {
<mask> return false, nil
<mask> }
<mask> elapsed := time.Since(filter.LastUpdated)
<mask> if elapsed <= updatePeriod {
</s> Fix #371 #421
Filters are now... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
if !force && time.Since(filter.LastUpdated) <= updatePeriod { | <mask> func (filter *filter) update(now time.Time) (bool, error) {
<mask> if !filter.Enabled {
<mask> return false, nil
<mask> }
<mask> elapsed := time.Since(filter.LastUpdated)
<mask> if elapsed <= updatePeriod {
<mask> return false, nil
<mask> }
<mask>
<mask> // use same update period for failed ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
log.Printf("Downloading update for filter %d", filter.ID)
| <mask> }
<mask>
<mask> // use same update period for failed filter downloads to avoid flooding with requests
<mask> filter.LastUpdated = time.Now()
<mask>
<mask> resp, err := client.Get(filter.URL)
<mask> if resp != nil && resp.Body != nil {
</s> Fix #371 #421
Filters are now saved to a file
Also, they'... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
filter.LastUpdated = time.Now() | <mask> return false, nil
<mask> }
<mask>
<mask> // use same update period for failed filter downloads to avoid flooding with requests
<mask> filter.LastUpdated = now
<mask>
<mask> resp, err := client.Get(filter.URL)
<mask> if resp != nil && resp.Body != nil {
<mask> defer resp.Body.Close()
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
if resp.StatusCode != 200 { | <mask> log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
<mask> return false, err
<mask> }
<mask>
<mask> if resp.StatusCode >= 400 {
<mask> log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
<mask> return false, fmt.Errorf("Got status cod... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
contentType := strings.ToLower(resp.Header.Get("content-type"))
if !strings.HasPrefix(contentType, "text/plain") {
log.Printf("Non-text response %s from %s, skipping", contentType, filter.URL)
return false, fmt.Errorf("non-text response... | <mask> }
<mask>
<mask> if resp.StatusCode >= 400 {
<mask> log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
<mask> return false, fmt.Errorf("Got status code >= 400: %d", resp.StatusCode)
<mask> }
<mask>
<mask> body, err := ioutil.ReadAll(resp.Body)
<mask> if err != ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
// Extract filter name and count number of rules | <mask> log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
<mask> return false, err
<mask> }
<mask>
<mask> // extract filter name and count number of rules
<mask> lines := strings.Split(string(body), "\n")
<mask> rulesCount := 0
<mask> seenTitle := false
<mask> d ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
// Count lines in the filter | <mask> // extract filter name and count number of rules
<mask> lines := strings.Split(string(body), "\n")
<mask> rulesCount := 0
<mask> seenTitle := false
<mask> d := dnsfilter.New()
<mask> for _, line := range lines {
<mask> line = strings.TrimSpace(line)
<mask> if len(line) > 0 && line[0] == '!' {
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
<mask> filter.Name = m[0][1]
<mask> seenTitle = true
<mask> }
<mask> } else if len(line) != 0 {
<mask> err = d.AddRule(line, 0)
<mask> if err == dnsfilter.ErrAlreadyExists || err == dnsfilter.ErrInvalidSyntax {
<mask> continue
<mask> }
<mask> if err != nil {
<mask> log.Printf(... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go | |
// Check if the filter was really changed | <mask> } else if len(line) != 0 {
<mask> rulesCount++
<mask> }
<mask> }
<mask> if bytes.Equal(filter.contents, body) {
<mask> return false, nil
<mask> }
<mask>
<mask> log.Printf("Filter %s updated: %d bytes, %d rules", filter.URL, len(body), rulesCount)
<mask> filter.RulesCount = rulesCount
</... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
// Saving it to the filters dir now
err = filter.save()
if err != nil {
return false, nil
}
| <mask>
<mask> log.Printf("Filter %s updated: %d bytes, %d rules", filter.URL, len(body), rulesCount)
<mask> filter.RulesCount = rulesCount
<mask> filter.contents = body
<mask> return true, nil
<mask> }
<mask>
<mask> // saves filter contents to the file in config.ourDataDir
</s> Fix #371 #421
Filters are... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
// saves filter contents to the file in config.ourDataDir
func (filter *filter) save() error {
filterFilePath := filter.getFilterFilePath()
log.Printf("Saving filter %d contents to: %s", filter.ID, filterFilePath)
err := writeFileSafe(filterFilePath, filter.contents)
if err != nil {
return err | <mask> filter.contents = body
<mask> return true, nil
<mask> }
<mask>
<mask> // write filter file
<mask> func writeFilterFile() error {
<mask> filterpath := filepath.Join(config.ourBinaryDir, config.CoreDNS.FilterFile)
<mask> log.Printf("Writing filter file: %s", filterpath)
<mask> // TODO: check if file... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
return nil;
}
// loads filter contents from the file in config.ourDataDir
func (filter *filter) load() error {
if !filter.Enabled {
// No need to load a filter that is not enabled
return nil | <mask> }
<mask> data = append(data, filter.contents...)
<mask> data = append(data, '\n')
<mask> }
<mask> for _, rule := range config.UserRules {
<mask> data = append(data, []byte(rule)...)
<mask> data = append(data, '\n')
<mask> }
<mask> config.RUnlock()
<mask> err := ioutil.WriteFile(filterpat... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
filterFilePath := filter.getFilterFilePath()
log.Printf("Loading filter %d contents to: %s", filter.ID, filterFilePath)
if _, err := os.Stat(filterFilePath); os.IsNotExist(err) {
// do nothing, file doesn't exist | <mask> for _, rule := range config.UserRules {
<mask> data = append(data, []byte(rule)...)
<mask> data = append(data, '\n')
<mask> }
<mask> config.RUnlock()
<mask> err := ioutil.WriteFile(filterpath+".tmp", data, 0644)
<mask> if err != nil {
<mask> log.Printf("Couldn't write filter file: %s", err)
<... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
filterFile, err := ioutil.ReadFile(filterFilePath) | <mask> log.Printf("Couldn't write filter file: %s", err)
<mask> return err
<mask> }
<mask>
<mask> err = os.Rename(filterpath+".tmp", filterpath)
<mask> if err != nil {
<mask> log.Printf("Couldn't rename filter file: %s", err)
<mask> return err
<mask> }
<mask> return nil
</s> Fix #371 #421
Filt... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
<mask> }
<mask>
<mask> err = os.Rename(filterpath+".tmp", filterpath)
<mask> if err != nil {
<mask> log.Printf("Couldn't rename filter file: %s", err)
<mask> return err
<mask> }
<mask> return nil
<mask> }
<mask>
</s> Fix #371 #421
Filters are now saved to a file
Also, they're loaded from the file... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go | |
log.Printf("Filter %d length is %d", filter.ID, len(filterFile))
filter.contents = filterFile | <mask> if err != nil {
<mask> return err
<mask> }
<mask> return nil
<mask> }
<mask>
<mask> // Path to the filter contents
<mask> func (filter *filter) getFilterFilePath() string {
<mask> return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.Itoa(filter.ID) + ".txt")
</s> Fix ... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
// Path to the filter contents
func (filter *filter) getFilterFilePath() string {
return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.Itoa(filter.ID) + ".txt")
}
| <mask> return nil
<mask> }
<mask>
<mask> // ------------
<mask> // safebrowsing
<mask> // ------------
<mask>
<mask> func handleSafeBrowsingEnable(w http.ResponseWriter, r *http.Request) {
</s> Fix #371 #421
Filters are now saved to a file
Also, they're loaded from the file on startup
Filter ID is not pass... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | control.go |
<mask> errortext := fmt.Errorf("Unable to write coredns config: %s", err)
<mask> log.Println(errortext)
<mask> return errortext
<mask> }
<mask> err = writeFilterFile()
<mask> if err != nil {
<mask> errortext := fmt.Errorf("Couldn't write filter file: %s", err)
<mask> log.Println(errortext)
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | coredns.go | |
type plugFilter struct {
ID uint32
Path string
}
| <mask> )
<mask>
<mask> type plugSettings struct {
<mask> SafeBrowsingBlockHost string
<mask> ParentalBlockHost string
<mask> QueryLogEnabled bool
<mask> BlockedTTL uint32 // in seconds, default 3600
<mask> Filters []plugFilter
</s> Fix #371 #421
Filters are now saved t... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/32d4e80c93cba5b3ef4bb96c79f7256b5cb4d913 | coredns_plugin/coredns_plugin.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.