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 |
|---|---|---|---|---|
// Anonymizer proccesses the IP addresses to anonymize those if needed.
Anonymizer *aghnet.IPMut | <mask> // AnonymizeClientIP tells if the query log should anonymize clients' IP
<mask> // addresses.
<mask> AnonymizeClientIP bool
<mask> }
<mask>
<mask> // AddParams - parameters for Add()
<mask> type AddParams struct {
<mask> Question *dns.Msg
<mask> Answer *dns.Msg // The response we sent to the client (optional)
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed commit of the following:
commit a77a6204bc8a58f62a4fac70efdcae4267a64810
Merge: 834493a2 90e65b66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:22:16 2021 +0300
Merge branch 'master' into 3890-fix-stats
commit 834493a22ae79199efcc44e0715e2ac6f6272963
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:09:30 2021 +0300
querylog: load once
commit b8000e7ba7a998fcd4553230ec5e5f9c90106e31
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:54:41 2021 +0300
querylog: fix docs
commit 7db99ccfa19b58100950c11d67b23bca7af3e5cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:51:31 2021 +0300
querylog: imp docs
commit 2a84650bd7ac5195730a7ab47b9562a83f721499
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 15:48:09 2021 +0300
querylog: imp anonyization
commit 0f63feb1ff5f006fc528c3b681ef3b9d2199581e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:44:37 2021 +0300
all: imp code & docs
commit c4ccdcbb7248897edd178fd5cb77127e39ada73d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:24:30 2021 +0300
all: log changes
commit 60bb777a5aff36bba129a078fa11ae566298178a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:08:41 2021 +0300
all: use atomic value
commit c45886bd20eee2212b42686ff369830d8c08fe36
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 30 18:50:02 2021 +0300
all: anonymize separately </s> remove Filename string // database file name
LimitDays uint32 // time limit (in days)
UnitID unitIDCallback // user function to get the current unit ID. If nil, the current time hour is used.
AnonymizeClientIP bool // anonymize clients' IP addresses
</s> add Filename string // database file name
LimitDays uint32 // time limit (in days)
UnitID unitIDCallback // user function to get the current unit ID. If nil, the current time hour is used. </s> remove func initDNSServer() error {
var err error
</s> add func initDNSServer() (err error) { </s> remove
unit *unit // the current unit
unitLock sync.Mutex // protect 'unit'
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/querylog.go |
logFile: filepath.Join(conf.BaseDir, queryLogFileName),
anonymizer: conf.Anonymizer, | <mask>
<mask> l = &queryLog{
<mask> findClient: findClient,
<mask>
<mask> logFile: filepath.Join(conf.BaseDir, queryLogFileName),
<mask> }
<mask>
<mask> l.conf = &Config{}
<mask> *l.conf = conf
<mask>
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed commit of the following:
commit a77a6204bc8a58f62a4fac70efdcae4267a64810
Merge: 834493a2 90e65b66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:22:16 2021 +0300
Merge branch 'master' into 3890-fix-stats
commit 834493a22ae79199efcc44e0715e2ac6f6272963
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:09:30 2021 +0300
querylog: load once
commit b8000e7ba7a998fcd4553230ec5e5f9c90106e31
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:54:41 2021 +0300
querylog: fix docs
commit 7db99ccfa19b58100950c11d67b23bca7af3e5cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:51:31 2021 +0300
querylog: imp docs
commit 2a84650bd7ac5195730a7ab47b9562a83f721499
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 15:48:09 2021 +0300
querylog: imp anonyization
commit 0f63feb1ff5f006fc528c3b681ef3b9d2199581e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:44:37 2021 +0300
all: imp code & docs
commit c4ccdcbb7248897edd178fd5cb77127e39ada73d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:24:30 2021 +0300
all: log changes
commit 60bb777a5aff36bba129a078fa11ae566298178a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:08:41 2021 +0300
all: use atomic value
commit c45886bd20eee2212b42686ff369830d8c08fe36
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 30 18:50:02 2021 +0300
all: anonymize separately </s> remove // copy data, modify it, then activate. Other threads (readers) don't need to use this lock.
</s> add defer l.lock.Unlock()
// Copy data, modify it, then activate. Other threads (readers) don't need
// to use this lock. </s> remove s = &statsCtx{}
</s> add s = &statsCtx{
mu: &sync.Mutex{},
} </s> remove conf.AnonymizeClientIP = d.AnonymizeClientIP
</s> add if conf.AnonymizeClientIP = d.AnonymizeClientIP; conf.AnonymizeClientIP {
l.anonymizer.Store(AnonymizeIP)
} else {
l.anonymizer.Store(nil)
} </s> remove l.lock.Unlock()
l.conf.ConfigModified()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/querylog.go |
Filename string // database file name
LimitDays uint32 // time limit (in days)
UnitID unitIDCallback // user function to get the current unit ID. If nil, the current time hour is used. | <mask> }
<mask>
<mask> // Config - module configuration
<mask> type Config struct {
<mask> Filename string // database file name
<mask> LimitDays uint32 // time limit (in days)
<mask> UnitID unitIDCallback // user function to get the current unit ID. If nil, the current time hour is used.
<mask> AnonymizeClientIP bool // anonymize clients' IP addresses
<mask>
<mask> // Called when the configuration is changed by HTTP request
<mask> ConfigModified func()
<mask>
<mask> // Register an HTTP handler
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed commit of the following:
commit a77a6204bc8a58f62a4fac70efdcae4267a64810
Merge: 834493a2 90e65b66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:22:16 2021 +0300
Merge branch 'master' into 3890-fix-stats
commit 834493a22ae79199efcc44e0715e2ac6f6272963
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:09:30 2021 +0300
querylog: load once
commit b8000e7ba7a998fcd4553230ec5e5f9c90106e31
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:54:41 2021 +0300
querylog: fix docs
commit 7db99ccfa19b58100950c11d67b23bca7af3e5cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:51:31 2021 +0300
querylog: imp docs
commit 2a84650bd7ac5195730a7ab47b9562a83f721499
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 15:48:09 2021 +0300
querylog: imp anonyization
commit 0f63feb1ff5f006fc528c3b681ef3b9d2199581e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:44:37 2021 +0300
all: imp code & docs
commit c4ccdcbb7248897edd178fd5cb77127e39ada73d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:24:30 2021 +0300
all: log changes
commit 60bb777a5aff36bba129a078fa11ae566298178a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:08:41 2021 +0300
all: use atomic value
commit c45886bd20eee2212b42686ff369830d8c08fe36
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 30 18:50:02 2021 +0300
all: anonymize separately </s> remove
unit *unit // the current unit
unitLock sync.Mutex // protect 'unit'
</s> add </s> remove // TODO(e.burkov): Inspect special cases when user want to apply
// some rules handled by other processors to the hosts with TLD.
</s> add // TODO(e.burkov): Inspect special cases when user want to apply some
// rules handled by other processors to the hosts with TLD. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/stats/stats.go |
// mu protects unit.
mu *sync.Mutex
// current is the actual statistics collection result.
current *unit
| <mask> )
<mask>
<mask> // statsCtx - global context
<mask> type statsCtx struct {
<mask> db *bolt.DB
<mask> conf *Config
<mask> }
<mask>
<mask> // data for 1 time unit
<mask> type unit struct {
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed commit of the following:
commit a77a6204bc8a58f62a4fac70efdcae4267a64810
Merge: 834493a2 90e65b66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:22:16 2021 +0300
Merge branch 'master' into 3890-fix-stats
commit 834493a22ae79199efcc44e0715e2ac6f6272963
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:09:30 2021 +0300
querylog: load once
commit b8000e7ba7a998fcd4553230ec5e5f9c90106e31
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:54:41 2021 +0300
querylog: fix docs
commit 7db99ccfa19b58100950c11d67b23bca7af3e5cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:51:31 2021 +0300
querylog: imp docs
commit 2a84650bd7ac5195730a7ab47b9562a83f721499
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 15:48:09 2021 +0300
querylog: imp anonyization
commit 0f63feb1ff5f006fc528c3b681ef3b9d2199581e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:44:37 2021 +0300
all: imp code & docs
commit c4ccdcbb7248897edd178fd5cb77127e39ada73d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:24:30 2021 +0300
all: log changes
commit 60bb777a5aff36bba129a078fa11ae566298178a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:08:41 2021 +0300
all: use atomic value
commit c45886bd20eee2212b42686ff369830d8c08fe36
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 30 18:50:02 2021 +0300
all: anonymize separately </s> remove
unit *unit // the current unit
unitLock sync.Mutex // protect 'unit'
</s> add </s> remove Filename string // database file name
LimitDays uint32 // time limit (in days)
UnitID unitIDCallback // user function to get the current unit ID. If nil, the current time hour is used.
AnonymizeClientIP bool // anonymize clients' IP addresses
</s> add Filename string // database file name
LimitDays uint32 // time limit (in days)
UnitID unitIDCallback // user function to get the current unit ID. If nil, the current time hour is used. </s> remove func (s *statsCtx) swapUnit(new *unit) *unit {
s.unitLock.Lock()
u := s.unit
s.unit = new
s.unitLock.Unlock()
</s> add func (s *statsCtx) swapUnit(new *unit) (u *unit) {
s.mu.Lock()
defer s.mu.Unlock()
u = s.current
s.current = new
| [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/stats/unit.go |
<mask> // statsCtx - global context
<mask> type statsCtx struct {
<mask> db *bolt.DB
<mask> conf *Config
<mask>
<mask> unit *unit // the current unit
<mask> unitLock sync.Mutex // protect 'unit'
<mask> }
<mask>
<mask> // data for 1 time unit
<mask> type unit struct {
<mask> id uint32 // unit ID. Default: absolute hour since Jan 1, 1970
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed commit of the following:
commit a77a6204bc8a58f62a4fac70efdcae4267a64810
Merge: 834493a2 90e65b66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:22:16 2021 +0300
Merge branch 'master' into 3890-fix-stats
commit 834493a22ae79199efcc44e0715e2ac6f6272963
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:09:30 2021 +0300
querylog: load once
commit b8000e7ba7a998fcd4553230ec5e5f9c90106e31
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:54:41 2021 +0300
querylog: fix docs
commit 7db99ccfa19b58100950c11d67b23bca7af3e5cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:51:31 2021 +0300
querylog: imp docs
commit 2a84650bd7ac5195730a7ab47b9562a83f721499
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 15:48:09 2021 +0300
querylog: imp anonyization
commit 0f63feb1ff5f006fc528c3b681ef3b9d2199581e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:44:37 2021 +0300
all: imp code & docs
commit c4ccdcbb7248897edd178fd5cb77127e39ada73d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:24:30 2021 +0300
all: log changes
commit 60bb777a5aff36bba129a078fa11ae566298178a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:08:41 2021 +0300
all: use atomic value
commit c45886bd20eee2212b42686ff369830d8c08fe36
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 30 18:50:02 2021 +0300
all: anonymize separately </s> remove Filename string // database file name
LimitDays uint32 // time limit (in days)
UnitID unitIDCallback // user function to get the current unit ID. If nil, the current time hour is used.
AnonymizeClientIP bool // anonymize clients' IP addresses
</s> add Filename string // database file name
LimitDays uint32 // time limit (in days)
UnitID unitIDCallback // user function to get the current unit ID. If nil, the current time hour is used. </s> remove func (s *statsCtx) swapUnit(new *unit) *unit {
s.unitLock.Lock()
u := s.unit
s.unit = new
s.unitLock.Unlock()
</s> add func (s *statsCtx) swapUnit(new *unit) (u *unit) {
s.mu.Lock()
defer s.mu.Unlock()
u = s.current
s.current = new
</s> remove s.unitLock.Lock()
ptr := s.unit
s.unitLock.Unlock()
</s> add ptr := s.ongoing() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/stats/unit.go | |
s = &statsCtx{
mu: &sync.Mutex{},
} | <mask> TimeAvg uint32 // usec
<mask> }
<mask>
<mask> func createObject(conf Config) (s *statsCtx, err error) {
<mask> s = &statsCtx{}
<mask> if !checkInterval(conf.LimitDays) {
<mask> conf.LimitDays = 1
<mask> }
<mask>
<mask> s.conf = &Config{}
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed commit of the following:
commit a77a6204bc8a58f62a4fac70efdcae4267a64810
Merge: 834493a2 90e65b66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:22:16 2021 +0300
Merge branch 'master' into 3890-fix-stats
commit 834493a22ae79199efcc44e0715e2ac6f6272963
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:09:30 2021 +0300
querylog: load once
commit b8000e7ba7a998fcd4553230ec5e5f9c90106e31
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:54:41 2021 +0300
querylog: fix docs
commit 7db99ccfa19b58100950c11d67b23bca7af3e5cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:51:31 2021 +0300
querylog: imp docs
commit 2a84650bd7ac5195730a7ab47b9562a83f721499
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 15:48:09 2021 +0300
querylog: imp anonyization
commit 0f63feb1ff5f006fc528c3b681ef3b9d2199581e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:44:37 2021 +0300
all: imp code & docs
commit c4ccdcbb7248897edd178fd5cb77127e39ada73d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:24:30 2021 +0300
all: log changes
commit 60bb777a5aff36bba129a078fa11ae566298178a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:08:41 2021 +0300
all: use atomic value
commit c45886bd20eee2212b42686ff369830d8c08fe36
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 30 18:50:02 2021 +0300
all: anonymize separately </s> remove func (s *statsCtx) swapUnit(new *unit) *unit {
s.unitLock.Lock()
u := s.unit
s.unit = new
s.unitLock.Unlock()
</s> add func (s *statsCtx) swapUnit(new *unit) (u *unit) {
s.mu.Lock()
defer s.mu.Unlock()
u = s.current
s.current = new
</s> remove // Get Client IP address
func (s *statsCtx) getClientIP(ip net.IP) (clientIP net.IP) {
if s.conf.AnonymizeClientIP && ip != nil {
const AnonymizeClientIP4Mask = 16
const AnonymizeClientIP6Mask = 112
if ip.To4() != nil {
return ip.Mask(net.CIDRMask(AnonymizeClientIP4Mask, 32))
}
return ip.Mask(net.CIDRMask(AnonymizeClientIP6Mask, 128))
}
return ip
}
</s> add </s> remove func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res filtering.Result) {
</s> add func (s *Server) updateStats(
ctx *dnsContext,
elapsed time.Duration,
res filtering.Result,
clientIP net.IP,
) { </s> remove d := qlogConfig{}
req, err := jsonutil.DecodeObject(&d, r.Body)
</s> add d := &qlogConfig{}
req, err := jsonutil.DecodeObject(d, r.Body) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/stats/unit.go |
s.current = &u | <mask> s.initUnit(&u, id)
<mask> if udb != nil {
<mask> deserialize(&u, udb)
<mask> }
<mask> s.unit = &u
<mask>
<mask> log.Debug("stats: initialized")
<mask>
<mask> return s, nil
<mask> }
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed commit of the following:
commit a77a6204bc8a58f62a4fac70efdcae4267a64810
Merge: 834493a2 90e65b66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:22:16 2021 +0300
Merge branch 'master' into 3890-fix-stats
commit 834493a22ae79199efcc44e0715e2ac6f6272963
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:09:30 2021 +0300
querylog: load once
commit b8000e7ba7a998fcd4553230ec5e5f9c90106e31
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:54:41 2021 +0300
querylog: fix docs
commit 7db99ccfa19b58100950c11d67b23bca7af3e5cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:51:31 2021 +0300
querylog: imp docs
commit 2a84650bd7ac5195730a7ab47b9562a83f721499
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 15:48:09 2021 +0300
querylog: imp anonyization
commit 0f63feb1ff5f006fc528c3b681ef3b9d2199581e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:44:37 2021 +0300
all: imp code & docs
commit c4ccdcbb7248897edd178fd5cb77127e39ada73d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:24:30 2021 +0300
all: log changes
commit 60bb777a5aff36bba129a078fa11ae566298178a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:08:41 2021 +0300
all: use atomic value
commit c45886bd20eee2212b42686ff369830d8c08fe36
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 30 18:50:02 2021 +0300
all: anonymize separately </s> remove // Get Client IP address
func (s *statsCtx) getClientIP(ip net.IP) (clientIP net.IP) {
if s.conf.AnonymizeClientIP && ip != nil {
const AnonymizeClientIP4Mask = 16
const AnonymizeClientIP6Mask = 112
if ip.To4() != nil {
return ip.Mask(net.CIDRMask(AnonymizeClientIP4Mask, 32))
}
return ip.Mask(net.CIDRMask(AnonymizeClientIP6Mask, 128))
}
return ip
}
</s> add </s> remove defer cancel()
</s> add </s> remove dnsConfig, err := generateServerConfig()
</s> add var dnsConfig dnsforward.ServerConfig
dnsConfig, err = generateServerConfig() </s> remove } else if ip, _ := netutil.IPAndPortFromAddr(pctx.Addr); ip != nil {
e.Client = ip.String()
</s> add } else if clientIP != nil {
e.Client = clientIP.String() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/stats/unit.go |
func (s *statsCtx) swapUnit(new *unit) (u *unit) {
s.mu.Lock()
defer s.mu.Unlock()
u = s.current
s.current = new
| <mask> }
<mask>
<mask> // Atomically swap the currently active unit with a new value
<mask> // Return old value
<mask> func (s *statsCtx) swapUnit(new *unit) *unit {
<mask> s.unitLock.Lock()
<mask> u := s.unit
<mask> s.unit = new
<mask> s.unitLock.Unlock()
<mask> return u
<mask> }
<mask>
<mask> // Get unit ID for the current hour
<mask> func newUnitID() uint32 {
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed commit of the following:
commit a77a6204bc8a58f62a4fac70efdcae4267a64810
Merge: 834493a2 90e65b66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:22:16 2021 +0300
Merge branch 'master' into 3890-fix-stats
commit 834493a22ae79199efcc44e0715e2ac6f6272963
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:09:30 2021 +0300
querylog: load once
commit b8000e7ba7a998fcd4553230ec5e5f9c90106e31
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:54:41 2021 +0300
querylog: fix docs
commit 7db99ccfa19b58100950c11d67b23bca7af3e5cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:51:31 2021 +0300
querylog: imp docs
commit 2a84650bd7ac5195730a7ab47b9562a83f721499
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 15:48:09 2021 +0300
querylog: imp anonyization
commit 0f63feb1ff5f006fc528c3b681ef3b9d2199581e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:44:37 2021 +0300
all: imp code & docs
commit c4ccdcbb7248897edd178fd5cb77127e39ada73d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:24:30 2021 +0300
all: log changes
commit 60bb777a5aff36bba129a078fa11ae566298178a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:08:41 2021 +0300
all: use atomic value
commit c45886bd20eee2212b42686ff369830d8c08fe36
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 30 18:50:02 2021 +0300
all: anonymize separately </s> remove s.unitLock.Lock()
ptr := s.unit
s.unitLock.Unlock()
</s> add ptr := s.ongoing() </s> remove
unit *unit // the current unit
unitLock sync.Mutex // protect 'unit'
</s> add </s> remove u := s.unit
</s> add u := s.current </s> remove s.unitLock.Lock()
defer s.unitLock.Unlock()
</s> add s.mu.Lock()
defer s.mu.Unlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/stats/unit.go |
func (s *statsCtx) ongoing() (u *unit) {
s.mu.Lock()
defer s.mu.Unlock()
return s.current
}
| <mask> }
<mask>
<mask> // Flush the current unit to DB and delete an old unit when a new hour is started
<mask> // If a unit must be flushed:
<mask> // . lock DB
<mask> // . atomically set a new empty unit as the current one and get the old unit
<mask> // This is important to do it inside DB lock, so the reader won't get inconsistent results.
<mask> // . write the unit to DB
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed commit of the following:
commit a77a6204bc8a58f62a4fac70efdcae4267a64810
Merge: 834493a2 90e65b66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:22:16 2021 +0300
Merge branch 'master' into 3890-fix-stats
commit 834493a22ae79199efcc44e0715e2ac6f6272963
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:09:30 2021 +0300
querylog: load once
commit b8000e7ba7a998fcd4553230ec5e5f9c90106e31
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:54:41 2021 +0300
querylog: fix docs
commit 7db99ccfa19b58100950c11d67b23bca7af3e5cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:51:31 2021 +0300
querylog: imp docs
commit 2a84650bd7ac5195730a7ab47b9562a83f721499
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 15:48:09 2021 +0300
querylog: imp anonyization
commit 0f63feb1ff5f006fc528c3b681ef3b9d2199581e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:44:37 2021 +0300
all: imp code & docs
commit c4ccdcbb7248897edd178fd5cb77127e39ada73d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:24:30 2021 +0300
all: log changes
commit 60bb777a5aff36bba129a078fa11ae566298178a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:08:41 2021 +0300
all: use atomic value
commit c45886bd20eee2212b42686ff369830d8c08fe36
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 30 18:50:02 2021 +0300
all: anonymize separately </s> remove s.unitLock.Lock()
ptr := s.unit
s.unitLock.Unlock()
</s> add ptr := s.ongoing() </s> remove Filename string // database file name
LimitDays uint32 // time limit (in days)
UnitID unitIDCallback // user function to get the current unit ID. If nil, the current time hour is used.
AnonymizeClientIP bool // anonymize clients' IP addresses
</s> add Filename string // database file name
LimitDays uint32 // time limit (in days)
UnitID unitIDCallback // user function to get the current unit ID. If nil, the current time hour is used. </s> remove func (s *statsCtx) swapUnit(new *unit) *unit {
s.unitLock.Lock()
u := s.unit
s.unit = new
s.unitLock.Unlock()
</s> add func (s *statsCtx) swapUnit(new *unit) (u *unit) {
s.mu.Lock()
defer s.mu.Unlock()
u = s.current
s.current = new
</s> remove
unit *unit // the current unit
unitLock sync.Mutex // protect 'unit'
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/stats/unit.go |
ptr := s.ongoing() | <mask> // . remove the stale unit from DB
<mask> // . unlock DB
<mask> func (s *statsCtx) periodicFlush() {
<mask> for {
<mask> s.unitLock.Lock()
<mask> ptr := s.unit
<mask> s.unitLock.Unlock()
<mask>
<mask> if ptr == nil {
<mask> break
<mask> }
<mask>
<mask> id := s.conf.UnitID()
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed commit of the following:
commit a77a6204bc8a58f62a4fac70efdcae4267a64810
Merge: 834493a2 90e65b66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:22:16 2021 +0300
Merge branch 'master' into 3890-fix-stats
commit 834493a22ae79199efcc44e0715e2ac6f6272963
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:09:30 2021 +0300
querylog: load once
commit b8000e7ba7a998fcd4553230ec5e5f9c90106e31
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:54:41 2021 +0300
querylog: fix docs
commit 7db99ccfa19b58100950c11d67b23bca7af3e5cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:51:31 2021 +0300
querylog: imp docs
commit 2a84650bd7ac5195730a7ab47b9562a83f721499
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 15:48:09 2021 +0300
querylog: imp anonyization
commit 0f63feb1ff5f006fc528c3b681ef3b9d2199581e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:44:37 2021 +0300
all: imp code & docs
commit c4ccdcbb7248897edd178fd5cb77127e39ada73d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:24:30 2021 +0300
all: log changes
commit 60bb777a5aff36bba129a078fa11ae566298178a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:08:41 2021 +0300
all: use atomic value
commit c45886bd20eee2212b42686ff369830d8c08fe36
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 30 18:50:02 2021 +0300
all: anonymize separately </s> remove func (s *statsCtx) swapUnit(new *unit) *unit {
s.unitLock.Lock()
u := s.unit
s.unit = new
s.unitLock.Unlock()
</s> add func (s *statsCtx) swapUnit(new *unit) (u *unit) {
s.mu.Lock()
defer s.mu.Unlock()
u = s.current
s.current = new
</s> remove u := s.unit
</s> add u := s.current </s> remove // Get Client IP address
func (s *statsCtx) getClientIP(ip net.IP) (clientIP net.IP) {
if s.conf.AnonymizeClientIP && ip != nil {
const AnonymizeClientIP4Mask = 16
const AnonymizeClientIP6Mask = 112
if ip.To4() != nil {
return ip.Mask(net.CIDRMask(AnonymizeClientIP4Mask, 32))
}
return ip.Mask(net.CIDRMask(AnonymizeClientIP6Mask, 128))
}
return ip
}
</s> add </s> remove
unit *unit // the current unit
unitLock sync.Mutex // protect 'unit'
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/stats/unit.go |
<mask>
<mask> log.Debug("stats: cleared")
<mask> }
<mask>
<mask> // Get Client IP address
<mask> func (s *statsCtx) getClientIP(ip net.IP) (clientIP net.IP) {
<mask> if s.conf.AnonymizeClientIP && ip != nil {
<mask> const AnonymizeClientIP4Mask = 16
<mask> const AnonymizeClientIP6Mask = 112
<mask>
<mask> if ip.To4() != nil {
<mask> return ip.Mask(net.CIDRMask(AnonymizeClientIP4Mask, 32))
<mask> }
<mask>
<mask> return ip.Mask(net.CIDRMask(AnonymizeClientIP6Mask, 128))
<mask> }
<mask>
<mask> return ip
<mask> }
<mask>
<mask> func (s *statsCtx) Update(e Entry) {
<mask> if s.conf.limit == 0 {
<mask> return
<mask> }
<mask>
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed commit of the following:
commit a77a6204bc8a58f62a4fac70efdcae4267a64810
Merge: 834493a2 90e65b66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:22:16 2021 +0300
Merge branch 'master' into 3890-fix-stats
commit 834493a22ae79199efcc44e0715e2ac6f6272963
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:09:30 2021 +0300
querylog: load once
commit b8000e7ba7a998fcd4553230ec5e5f9c90106e31
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:54:41 2021 +0300
querylog: fix docs
commit 7db99ccfa19b58100950c11d67b23bca7af3e5cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:51:31 2021 +0300
querylog: imp docs
commit 2a84650bd7ac5195730a7ab47b9562a83f721499
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 15:48:09 2021 +0300
querylog: imp anonyization
commit 0f63feb1ff5f006fc528c3b681ef3b9d2199581e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:44:37 2021 +0300
all: imp code & docs
commit c4ccdcbb7248897edd178fd5cb77127e39ada73d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:24:30 2021 +0300
all: log changes
commit 60bb777a5aff36bba129a078fa11ae566298178a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:08:41 2021 +0300
all: use atomic value
commit c45886bd20eee2212b42686ff369830d8c08fe36
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 30 18:50:02 2021 +0300
all: anonymize separately </s> remove // Get Client IP address
func (l *queryLog) getClientIP(ip net.IP) (clientIP net.IP) {
if l.conf.AnonymizeClientIP && ip != nil {
const AnonymizeClientIPv4Mask = 16
const AnonymizeClientIPv6Mask = 112
if ip.To4() != nil {
return ip.Mask(net.CIDRMask(AnonymizeClientIPv4Mask, 32))
}
return ip.Mask(net.CIDRMask(AnonymizeClientIPv6Mask, 128))
}
return ip
}
</s> add </s> remove func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res filtering.Result) {
</s> add func (s *Server) updateStats(
ctx *dnsContext,
elapsed time.Duration,
res filtering.Result,
clientIP net.IP,
) { </s> remove func (s *statsCtx) swapUnit(new *unit) *unit {
s.unitLock.Lock()
u := s.unit
s.unit = new
s.unitLock.Unlock()
</s> add func (s *statsCtx) swapUnit(new *unit) (u *unit) {
s.mu.Lock()
defer s.mu.Unlock()
u = s.current
s.current = new
</s> remove s.unitLock.Lock()
ptr := s.unit
s.unitLock.Unlock()
</s> add ptr := s.ongoing() </s> remove func shutdownSrv(ctx context.Context, cancel context.CancelFunc, srv *http.Server) {
</s> add func shutdownSrv(ctx context.Context, srv *http.Server) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"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/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/stats/unit.go | |
<mask> }
<mask>
<mask> clientID := e.Client
<mask> if ip := net.ParseIP(clientID); ip != nil {
<mask> ip = s.getClientIP(ip)
<mask> clientID = ip.String()
<mask> }
<mask>
<mask> s.unitLock.Lock()
<mask> defer s.unitLock.Unlock()
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed commit of the following:
commit a77a6204bc8a58f62a4fac70efdcae4267a64810
Merge: 834493a2 90e65b66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:22:16 2021 +0300
Merge branch 'master' into 3890-fix-stats
commit 834493a22ae79199efcc44e0715e2ac6f6272963
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:09:30 2021 +0300
querylog: load once
commit b8000e7ba7a998fcd4553230ec5e5f9c90106e31
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:54:41 2021 +0300
querylog: fix docs
commit 7db99ccfa19b58100950c11d67b23bca7af3e5cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:51:31 2021 +0300
querylog: imp docs
commit 2a84650bd7ac5195730a7ab47b9562a83f721499
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 15:48:09 2021 +0300
querylog: imp anonyization
commit 0f63feb1ff5f006fc528c3b681ef3b9d2199581e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:44:37 2021 +0300
all: imp code & docs
commit c4ccdcbb7248897edd178fd5cb77127e39ada73d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:24:30 2021 +0300
all: log changes
commit 60bb777a5aff36bba129a078fa11ae566298178a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:08:41 2021 +0300
all: use atomic value
commit c45886bd20eee2212b42686ff369830d8c08fe36
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 30 18:50:02 2021 +0300
all: anonymize separately </s> remove s.unitLock.Lock()
defer s.unitLock.Unlock()
</s> add s.mu.Lock()
defer s.mu.Unlock() </s> remove } else if ip, _ := netutil.IPAndPortFromAddr(pctx.Addr); ip != nil {
e.Client = ip.String()
</s> add } else if clientIP != nil {
e.Client = clientIP.String() </s> remove // Get Client IP address
func (s *statsCtx) getClientIP(ip net.IP) (clientIP net.IP) {
if s.conf.AnonymizeClientIP && ip != nil {
const AnonymizeClientIP4Mask = 16
const AnonymizeClientIP6Mask = 112
if ip.To4() != nil {
return ip.Mask(net.CIDRMask(AnonymizeClientIP4Mask, 32))
}
return ip.Mask(net.CIDRMask(AnonymizeClientIP6Mask, 128))
}
return ip
}
</s> add </s> remove // Get Client IP address
func (l *queryLog) getClientIP(ip net.IP) (clientIP net.IP) {
if l.conf.AnonymizeClientIP && ip != nil {
const AnonymizeClientIPv4Mask = 16
const AnonymizeClientIPv6Mask = 112
if ip.To4() != nil {
return ip.Mask(net.CIDRMask(AnonymizeClientIPv4Mask, 32))
}
return ip.Mask(net.CIDRMask(AnonymizeClientIPv6Mask, 128))
}
return ip
}
</s> add </s> remove u := s.unit
</s> add u := s.current | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/stats/unit.go | |
s.mu.Lock()
defer s.mu.Unlock() | <mask> ip = s.getClientIP(ip)
<mask> clientID = ip.String()
<mask> }
<mask>
<mask> s.unitLock.Lock()
<mask> defer s.unitLock.Unlock()
<mask>
<mask> u := s.unit
<mask>
<mask> u.nResult[e.Result]++
<mask>
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed commit of the following:
commit a77a6204bc8a58f62a4fac70efdcae4267a64810
Merge: 834493a2 90e65b66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:22:16 2021 +0300
Merge branch 'master' into 3890-fix-stats
commit 834493a22ae79199efcc44e0715e2ac6f6272963
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:09:30 2021 +0300
querylog: load once
commit b8000e7ba7a998fcd4553230ec5e5f9c90106e31
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:54:41 2021 +0300
querylog: fix docs
commit 7db99ccfa19b58100950c11d67b23bca7af3e5cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:51:31 2021 +0300
querylog: imp docs
commit 2a84650bd7ac5195730a7ab47b9562a83f721499
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 15:48:09 2021 +0300
querylog: imp anonyization
commit 0f63feb1ff5f006fc528c3b681ef3b9d2199581e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:44:37 2021 +0300
all: imp code & docs
commit c4ccdcbb7248897edd178fd5cb77127e39ada73d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:24:30 2021 +0300
all: log changes
commit 60bb777a5aff36bba129a078fa11ae566298178a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:08:41 2021 +0300
all: use atomic value
commit c45886bd20eee2212b42686ff369830d8c08fe36
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 30 18:50:02 2021 +0300
all: anonymize separately </s> remove ip = s.getClientIP(ip)
</s> add </s> remove u := s.unit
</s> add u := s.current </s> remove func (s *statsCtx) swapUnit(new *unit) *unit {
s.unitLock.Lock()
u := s.unit
s.unit = new
s.unitLock.Unlock()
</s> add func (s *statsCtx) swapUnit(new *unit) (u *unit) {
s.mu.Lock()
defer s.mu.Unlock()
u = s.current
s.current = new
</s> remove } else if ip, _ := netutil.IPAndPortFromAddr(pctx.Addr); ip != nil {
e.Client = ip.String()
</s> add } else if clientIP != nil {
e.Client = clientIP.String() </s> remove s.unitLock.Lock()
ptr := s.unit
s.unitLock.Unlock()
</s> add ptr := s.ongoing() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/stats/unit.go |
u := s.current | <mask>
<mask> s.unitLock.Lock()
<mask> defer s.unitLock.Unlock()
<mask>
<mask> u := s.unit
<mask>
<mask> u.nResult[e.Result]++
<mask>
<mask> if e.Result == RNotFiltered {
<mask> u.domains[e.Domain]++
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed commit of the following:
commit a77a6204bc8a58f62a4fac70efdcae4267a64810
Merge: 834493a2 90e65b66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:22:16 2021 +0300
Merge branch 'master' into 3890-fix-stats
commit 834493a22ae79199efcc44e0715e2ac6f6272963
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:09:30 2021 +0300
querylog: load once
commit b8000e7ba7a998fcd4553230ec5e5f9c90106e31
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:54:41 2021 +0300
querylog: fix docs
commit 7db99ccfa19b58100950c11d67b23bca7af3e5cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:51:31 2021 +0300
querylog: imp docs
commit 2a84650bd7ac5195730a7ab47b9562a83f721499
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 15:48:09 2021 +0300
querylog: imp anonyization
commit 0f63feb1ff5f006fc528c3b681ef3b9d2199581e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:44:37 2021 +0300
all: imp code & docs
commit c4ccdcbb7248897edd178fd5cb77127e39ada73d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:24:30 2021 +0300
all: log changes
commit 60bb777a5aff36bba129a078fa11ae566298178a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:08:41 2021 +0300
all: use atomic value
commit c45886bd20eee2212b42686ff369830d8c08fe36
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 30 18:50:02 2021 +0300
all: anonymize separately </s> remove s.unitLock.Lock()
defer s.unitLock.Unlock()
</s> add s.mu.Lock()
defer s.mu.Unlock() </s> remove func (s *statsCtx) swapUnit(new *unit) *unit {
s.unitLock.Lock()
u := s.unit
s.unit = new
s.unitLock.Unlock()
</s> add func (s *statsCtx) swapUnit(new *unit) (u *unit) {
s.mu.Lock()
defer s.mu.Unlock()
u = s.current
s.current = new
</s> remove s.unitLock.Lock()
ptr := s.unit
s.unitLock.Unlock()
</s> add ptr := s.ongoing() </s> remove ip = s.getClientIP(ip)
</s> add </s> remove s.unitLock.Lock()
curUnit := serialize(s.unit)
curID := s.unit.id
s.unitLock.Unlock()
</s> add cur := s.ongoing()
curID := cur.id | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/stats/unit.go |
cur := s.ongoing()
curID := cur.id | <mask> if tx == nil {
<mask> return nil, 0
<mask> }
<mask>
<mask> s.unitLock.Lock()
<mask> curUnit := serialize(s.unit)
<mask> curID := s.unit.id
<mask> s.unitLock.Unlock()
<mask>
<mask> // Per-hour units.
<mask> units := []*unitDB{}
<mask> firstID := curID - limit + 1
<mask> for i := firstID; i != curID; i++ {
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed commit of the following:
commit a77a6204bc8a58f62a4fac70efdcae4267a64810
Merge: 834493a2 90e65b66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:22:16 2021 +0300
Merge branch 'master' into 3890-fix-stats
commit 834493a22ae79199efcc44e0715e2ac6f6272963
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:09:30 2021 +0300
querylog: load once
commit b8000e7ba7a998fcd4553230ec5e5f9c90106e31
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:54:41 2021 +0300
querylog: fix docs
commit 7db99ccfa19b58100950c11d67b23bca7af3e5cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:51:31 2021 +0300
querylog: imp docs
commit 2a84650bd7ac5195730a7ab47b9562a83f721499
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 15:48:09 2021 +0300
querylog: imp anonyization
commit 0f63feb1ff5f006fc528c3b681ef3b9d2199581e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:44:37 2021 +0300
all: imp code & docs
commit c4ccdcbb7248897edd178fd5cb77127e39ada73d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:24:30 2021 +0300
all: log changes
commit 60bb777a5aff36bba129a078fa11ae566298178a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:08:41 2021 +0300
all: use atomic value
commit c45886bd20eee2212b42686ff369830d8c08fe36
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 30 18:50:02 2021 +0300
all: anonymize separately </s> remove data := []jobject{}
</s> add data := make([]jobject, 0, len(entries)) </s> remove s.unitLock.Lock()
ptr := s.unit
s.unitLock.Unlock()
</s> add ptr := s.ongoing() </s> remove // the elements order is already reversed (from newer to older)
for i := 0; i < len(entries); i++ {
entry := entries[i]
jsonEntry := l.logEntryToJSONEntry(entry)
</s> add // The elements order is already reversed to be from newer to older.
for _, entry := range entries {
jsonEntry := l.entryToJSON(entry, l.anonymizer.Load()) </s> remove ip = s.getClientIP(ip)
</s> add </s> remove u := s.unit
</s> add u := s.current | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/stats/unit.go |
units = append(units, serialize(cur)) | <mask> }
<mask>
<mask> _ = tx.Rollback()
<mask>
<mask> units = append(units, curUnit)
<mask>
<mask> if len(units) != int(limit) {
<mask> log.Fatalf("len(units) != limit: %d %d", len(units), limit)
<mask> }
<mask>
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed commit of the following:
commit a77a6204bc8a58f62a4fac70efdcae4267a64810
Merge: 834493a2 90e65b66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:22:16 2021 +0300
Merge branch 'master' into 3890-fix-stats
commit 834493a22ae79199efcc44e0715e2ac6f6272963
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 17:09:30 2021 +0300
querylog: load once
commit b8000e7ba7a998fcd4553230ec5e5f9c90106e31
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:54:41 2021 +0300
querylog: fix docs
commit 7db99ccfa19b58100950c11d67b23bca7af3e5cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 16:51:31 2021 +0300
querylog: imp docs
commit 2a84650bd7ac5195730a7ab47b9562a83f721499
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 15:48:09 2021 +0300
querylog: imp anonyization
commit 0f63feb1ff5f006fc528c3b681ef3b9d2199581e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:44:37 2021 +0300
all: imp code & docs
commit c4ccdcbb7248897edd178fd5cb77127e39ada73d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:24:30 2021 +0300
all: log changes
commit 60bb777a5aff36bba129a078fa11ae566298178a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 6 14:08:41 2021 +0300
all: use atomic value
commit c45886bd20eee2212b42686ff369830d8c08fe36
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 30 18:50:02 2021 +0300
all: anonymize separately </s> remove } else if ip, _ := netutil.IPAndPortFromAddr(pctx.Addr); ip != nil {
e.Client = ip.String()
</s> add } else if clientIP != nil {
e.Client = clientIP.String() </s> remove s.unitLock.Lock()
curUnit := serialize(s.unit)
curID := s.unit.id
s.unitLock.Unlock()
</s> add cur := s.ongoing()
curID := cur.id </s> remove // Get Client IP address
func (s *statsCtx) getClientIP(ip net.IP) (clientIP net.IP) {
if s.conf.AnonymizeClientIP && ip != nil {
const AnonymizeClientIP4Mask = 16
const AnonymizeClientIP6Mask = 112
if ip.To4() != nil {
return ip.Mask(net.CIDRMask(AnonymizeClientIP4Mask, 32))
}
return ip.Mask(net.CIDRMask(AnonymizeClientIP6Mask, 128))
}
return ip
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/stats/unit.go |
setts := s.dnsFilter.Settings() | <mask>
<mask> // getClientRequestFilteringSettings looks up client filtering settings using
<mask> // the client's IP address and ID, if any, from dctx.
<mask> func (s *Server) getClientRequestFilteringSettings(dctx *dnsContext) *filtering.Settings {
<mask> setts := s.dnsFilter.GetConfig()
<mask> setts.ProtectionEnabled = dctx.protectionEnabled
<mask> if s.conf.FilterHandler != nil {
<mask> ip, _ := netutil.IPAndPortFromAddr(dctx.proxyCtx.Addr)
<mask> s.conf.FilterHandler(ip, dctx.clientID, &setts)
<mask> }
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove s.conf.FilterHandler(ip, dctx.clientID, &setts)
</s> add s.conf.FilterHandler(ip, dctx.clientID, setts) </s> remove return &setts
</s> add return setts </s> remove d.ApplyBlockedServices(&setts, nil)
result, err := d.CheckHost(host, dns.TypeA, &setts)
</s> add d.ApplyBlockedServices(setts)
result, err := d.CheckHost(host, dns.TypeA, setts) </s> remove Context.filters.ApplyBlockedServices(setts, nil)
</s> add Context.filters.ApplyBlockedServices(setts) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/dnsforward/filter.go |
s.conf.FilterHandler(ip, dctx.clientID, setts) | <mask> setts := s.dnsFilter.GetConfig()
<mask> setts.ProtectionEnabled = dctx.protectionEnabled
<mask> if s.conf.FilterHandler != nil {
<mask> ip, _ := netutil.IPAndPortFromAddr(dctx.proxyCtx.Addr)
<mask> s.conf.FilterHandler(ip, dctx.clientID, &setts)
<mask> }
<mask>
<mask> return &setts
<mask> }
<mask>
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove setts := s.dnsFilter.GetConfig()
</s> add setts := s.dnsFilter.Settings() </s> remove return &setts
</s> add return setts </s> remove d.ApplyBlockedServices(&setts, nil)
result, err := d.CheckHost(host, dns.TypeA, &setts)
</s> add d.ApplyBlockedServices(setts)
result, err := d.CheckHost(host, dns.TypeA, setts) </s> remove d.BlockedServices = bsvcs
</s> add </s> remove setts := d.GetConfig()
</s> add setts := d.Settings() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/dnsforward/filter.go |
return setts | <mask> ip, _ := netutil.IPAndPortFromAddr(dctx.proxyCtx.Addr)
<mask> s.conf.FilterHandler(ip, dctx.clientID, &setts)
<mask> }
<mask>
<mask> return &setts
<mask> }
<mask>
<mask> // filterDNSRequest applies the dnsFilter and sets dctx.proxyCtx.Res if the
<mask> // request was filtered.
<mask> func (s *Server) filterDNSRequest(dctx *dnsContext) (res *filtering.Result, err error) {
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove s.conf.FilterHandler(ip, dctx.clientID, &setts)
</s> add s.conf.FilterHandler(ip, dctx.clientID, setts) </s> remove setts := s.dnsFilter.GetConfig()
</s> add setts := s.dnsFilter.Settings() </s> remove // GetConfig - get configuration
func (d *DNSFilter) GetConfig() (s Settings) {
</s> add // Settings returns filtering settings.
func (d *DNSFilter) Settings() (s *Settings) { </s> remove func (d *DNSFilter) ApplyBlockedServices(setts *Settings, list []string) {
</s> add func (d *DNSFilter) ApplyBlockedServices(setts *Settings) {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> remove d.BlockedServices = bsvcs
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/dnsforward/filter.go |
"time" | <mask>
<mask> import (
<mask> "encoding/json"
<mask> "net/http"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/schedule"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/urlfilter/rules"
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove const currentSchemaVersion = 20
</s> add const currentSchemaVersion = 21 </s> remove d.Config.BlockedServices = list
</s> add d.Config.BlockedServices.IDs = list | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/blocked.go |
"github.com/AdguardTeam/AdGuardHome/internal/schedule" | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/urlfilter/rules"
<mask> "golang.org/x/exp/slices"
<mask> )
<mask>
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove const currentSchemaVersion = 20
</s> add const currentSchemaVersion = 21 </s> remove d.Config.BlockedServices = list
</s> add d.Config.BlockedServices.IDs = list | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/blocked.go |
// BlockedServices is the configuration of blocked services.
type BlockedServices struct {
// Schedule is blocked services schedule for every day of the week.
Schedule *schedule.Weekly `yaml:"schedule"`
// IDs is the names of blocked services.
IDs []string `yaml:"ids"`
}
| <mask> log.Debug("filtering: initialized %d services", l)
<mask> }
<mask>
<mask> // BlockedSvcKnown returns true if a blocked service ID is known.
<mask> func BlockedSvcKnown(s string) (ok bool) {
<mask> _, ok = serviceRules[s]
<mask>
<mask> return ok
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove func (d *DNSFilter) ApplyBlockedServices(setts *Settings, list []string) {
</s> add func (d *DNSFilter) ApplyBlockedServices(setts *Settings) {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> remove // GetConfig - get configuration
func (d *DNSFilter) GetConfig() (s Settings) {
</s> add // Settings returns filtering settings.
func (d *DNSFilter) Settings() (s *Settings) { </s> remove list = d.Config.BlockedServices
</s> add bsvc := d.BlockedServices
// TODO(s.chzhen): Use startTime from [dnsforward.dnsContext].
if !bsvc.Schedule.Contains(time.Now()) {
d.ApplyBlockedServicesList(setts, bsvc.IDs) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/blocked.go |
func (d *DNSFilter) ApplyBlockedServices(setts *Settings) {
d.confLock.RLock()
defer d.confLock.RUnlock()
| <mask> return ok
<mask> }
<mask>
<mask> // ApplyBlockedServices - set blocked services settings for this DNS request
<mask> func (d *DNSFilter) ApplyBlockedServices(setts *Settings, list []string) {
<mask> setts.ServicesRules = []ServiceEntry{}
<mask> if list == nil {
<mask> d.confLock.RLock()
<mask> defer d.confLock.RUnlock()
<mask>
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove if list == nil {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> add </s> remove list = d.Config.BlockedServices
</s> add bsvc := d.BlockedServices
// TODO(s.chzhen): Use startTime from [dnsforward.dnsContext].
if !bsvc.Schedule.Contains(time.Now()) {
d.ApplyBlockedServicesList(setts, bsvc.IDs) </s> remove // GetConfig - get configuration
func (d *DNSFilter) GetConfig() (s Settings) {
</s> add // Settings returns filtering settings.
func (d *DNSFilter) Settings() (s *Settings) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/blocked.go |
<mask>
<mask> // ApplyBlockedServices - set blocked services settings for this DNS request
<mask> func (d *DNSFilter) ApplyBlockedServices(setts *Settings, list []string) {
<mask> setts.ServicesRules = []ServiceEntry{}
<mask> if list == nil {
<mask> d.confLock.RLock()
<mask> defer d.confLock.RUnlock()
<mask>
<mask> list = d.Config.BlockedServices
<mask> }
<mask>
<mask> for _, name := range list {
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove func (d *DNSFilter) ApplyBlockedServices(setts *Settings, list []string) {
</s> add func (d *DNSFilter) ApplyBlockedServices(setts *Settings) {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> remove list = d.Config.BlockedServices
</s> add bsvc := d.BlockedServices
// TODO(s.chzhen): Use startTime from [dnsforward.dnsContext].
if !bsvc.Schedule.Contains(time.Now()) {
d.ApplyBlockedServicesList(setts, bsvc.IDs) </s> remove list := d.Config.BlockedServices
</s> add list := d.Config.BlockedServices.IDs | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/blocked.go | |
bsvc := d.BlockedServices
// TODO(s.chzhen): Use startTime from [dnsforward.dnsContext].
if !bsvc.Schedule.Contains(time.Now()) {
d.ApplyBlockedServicesList(setts, bsvc.IDs) | <mask> if list == nil {
<mask> d.confLock.RLock()
<mask> defer d.confLock.RUnlock()
<mask>
<mask> list = d.Config.BlockedServices
<mask> }
<mask>
<mask> for _, name := range list {
<mask> rules, ok := serviceRules[name]
<mask> if !ok {
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove if list == nil {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> add </s> remove func (d *DNSFilter) ApplyBlockedServices(setts *Settings, list []string) {
</s> add func (d *DNSFilter) ApplyBlockedServices(setts *Settings) {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> remove list := d.Config.BlockedServices
</s> add list := d.Config.BlockedServices.IDs | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/blocked.go |
} | <mask> // TODO(s.chzhen): Use startTime from [dnsforward.dnsContext].
<mask> if !bsvc.Schedule.Contains(time.Now()) {
<mask> d.ApplyBlockedServicesList(setts, bsvc.IDs)
<mask> }
<mask>
<mask> // ApplyBlockedServicesList appends filtering rules to the settings.
<mask> func (d *DNSFilter) ApplyBlockedServicesList(setts *Settings, list []string) {
<mask> for _, name := range list {
<mask> rules, ok := serviceRules[name]
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove list = d.Config.BlockedServices
</s> add bsvc := d.BlockedServices
// TODO(s.chzhen): Use startTime from [dnsforward.dnsContext].
if !bsvc.Schedule.Contains(time.Now()) {
d.ApplyBlockedServicesList(setts, bsvc.IDs) </s> remove if list == nil {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> add </s> remove func (d *DNSFilter) ApplyBlockedServices(setts *Settings, list []string) {
</s> add func (d *DNSFilter) ApplyBlockedServices(setts *Settings) {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> remove // GetConfig - get configuration
func (d *DNSFilter) GetConfig() (s Settings) {
</s> add // Settings returns filtering settings.
func (d *DNSFilter) Settings() (s *Settings) { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/blocked.go |
// ApplyBlockedServicesList appends filtering rules to the settings.
func (d *DNSFilter) ApplyBlockedServicesList(setts *Settings, list []string) { | <mask> d.ApplyBlockedServicesList(setts, bsvc.IDs)
<mask> }
<mask> }
<mask>
<mask> for _, name := range list {
<mask> rules, ok := serviceRules[name]
<mask> if !ok {
<mask> log.Error("unknown service name: %s", name)
<mask>
<mask> continue
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove list = d.Config.BlockedServices
</s> add bsvc := d.BlockedServices
// TODO(s.chzhen): Use startTime from [dnsforward.dnsContext].
if !bsvc.Schedule.Contains(time.Now()) {
d.ApplyBlockedServicesList(setts, bsvc.IDs) </s> remove bsvcs := []string{}
for _, s := range d.BlockedServices {
if !BlockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service %q", s)
</s> add if d.BlockedServices != nil {
bsvcs := []string{}
for _, s := range d.BlockedServices.IDs {
if !BlockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service %q", s) </s> remove if list == nil {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> add </s> remove continue
</s> add continue
}
bsvcs = append(bsvcs, s) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/blocked.go |
list := d.Config.BlockedServices.IDs | <mask> }
<mask>
<mask> func (d *DNSFilter) handleBlockedServicesList(w http.ResponseWriter, r *http.Request) {
<mask> d.confLock.RLock()
<mask> list := d.Config.BlockedServices
<mask> d.confLock.RUnlock()
<mask>
<mask> _ = aghhttp.WriteJSONResponse(w, r, list)
<mask> }
<mask>
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove setts := d.GetConfig()
</s> add setts := d.Settings() </s> remove if list == nil {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> add </s> remove func (d *DNSFilter) ApplyBlockedServices(setts *Settings, list []string) {
</s> add func (d *DNSFilter) ApplyBlockedServices(setts *Settings) {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> remove list = d.Config.BlockedServices
</s> add bsvc := d.BlockedServices
// TODO(s.chzhen): Use startTime from [dnsforward.dnsContext].
if !bsvc.Schedule.Contains(time.Now()) {
d.ApplyBlockedServicesList(setts, bsvc.IDs) </s> remove // GetConfig - get configuration
func (d *DNSFilter) GetConfig() (s Settings) {
</s> add // Settings returns filtering settings.
func (d *DNSFilter) Settings() (s *Settings) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/blocked.go |
d.Config.BlockedServices.IDs = list | <mask> return
<mask> }
<mask>
<mask> d.confLock.Lock()
<mask> d.Config.BlockedServices = list
<mask> d.confLock.Unlock()
<mask>
<mask> log.Debug("Updated blocked services list: %d", len(list))
<mask>
<mask> d.Config.ConfigModified()
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove if list == nil {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> add </s> remove func (d *DNSFilter) ApplyBlockedServices(setts *Settings, list []string) {
</s> add func (d *DNSFilter) ApplyBlockedServices(setts *Settings) {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> remove list := d.Config.BlockedServices
</s> add list := d.Config.BlockedServices.IDs </s> remove list = d.Config.BlockedServices
</s> add bsvc := d.BlockedServices
// TODO(s.chzhen): Use startTime from [dnsforward.dnsContext].
if !bsvc.Schedule.Contains(time.Now()) {
d.ApplyBlockedServicesList(setts, bsvc.IDs) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/blocked.go |
// BlockedServices is the configuration of blocked services. | <mask> SafeSearch SafeSearch `yaml:"-"`
<mask>
<mask> Rewrites []*LegacyRewrite `yaml:"rewrites"`
<mask>
<mask> // Names of services to block (globally).
<mask> // Per-client settings can override this configuration.
<mask> BlockedServices []string `yaml:"blocked_services"`
<mask>
<mask> // EtcHosts is a container of IP-hostname pairs taken from the operating
<mask> // system configuration files (e.g. /etc/hosts).
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove BlockedServices []string `yaml:"blocked_services"`
</s> add BlockedServices *BlockedServices `yaml:"blocked_services"` </s> remove if list == nil {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> add </s> remove func (d *DNSFilter) ApplyBlockedServices(setts *Settings, list []string) {
</s> add func (d *DNSFilter) ApplyBlockedServices(setts *Settings) {
d.confLock.RLock()
defer d.confLock.RUnlock()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/filtering.go |
BlockedServices *BlockedServices `yaml:"blocked_services"` | <mask> Rewrites []*LegacyRewrite `yaml:"rewrites"`
<mask>
<mask> // Names of services to block (globally).
<mask> // Per-client settings can override this configuration.
<mask> BlockedServices []string `yaml:"blocked_services"`
<mask>
<mask> // EtcHosts is a container of IP-hostname pairs taken from the operating
<mask> // system configuration files (e.g. /etc/hosts).
<mask> EtcHosts *aghnet.HostsContainer `yaml:"-"`
<mask>
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove // Names of services to block (globally).
</s> add // BlockedServices is the configuration of blocked services. </s> remove if list == nil {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> add </s> remove func (d *DNSFilter) ApplyBlockedServices(setts *Settings, list []string) {
</s> add func (d *DNSFilter) ApplyBlockedServices(setts *Settings) {
d.confLock.RLock()
defer d.confLock.RUnlock()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/filtering.go |
// Settings returns filtering settings.
func (d *DNSFilter) Settings() (s *Settings) { | <mask> func (d *DNSFilter) SetEnabled(enabled bool) {
<mask> atomic.StoreUint32(&d.enabled, mathutil.BoolToNumber[uint32](enabled))
<mask> }
<mask>
<mask> // GetConfig - get configuration
<mask> func (d *DNSFilter) GetConfig() (s Settings) {
<mask> d.confLock.RLock()
<mask> defer d.confLock.RUnlock()
<mask>
<mask> return Settings{
<mask> FilteringEnabled: atomic.LoadUint32(&d.Config.enabled) != 0,
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove return Settings{
</s> add return &Settings{ </s> remove func (d *DNSFilter) ApplyBlockedServices(setts *Settings, list []string) {
</s> add func (d *DNSFilter) ApplyBlockedServices(setts *Settings) {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> remove if list == nil {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> add </s> remove list := d.Config.BlockedServices
</s> add list := d.Config.BlockedServices.IDs | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/filtering.go |
return &Settings{ | <mask> func (d *DNSFilter) GetConfig() (s Settings) {
<mask> d.confLock.RLock()
<mask> defer d.confLock.RUnlock()
<mask>
<mask> return Settings{
<mask> FilteringEnabled: atomic.LoadUint32(&d.Config.enabled) != 0,
<mask> SafeSearchEnabled: d.Config.SafeSearchConf.Enabled,
<mask> SafeBrowsingEnabled: d.Config.SafeBrowsingEnabled,
<mask> ParentalEnabled: d.Config.ParentalEnabled,
<mask> }
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove // GetConfig - get configuration
func (d *DNSFilter) GetConfig() (s Settings) {
</s> add // Settings returns filtering settings.
func (d *DNSFilter) Settings() (s *Settings) { </s> remove func (d *DNSFilter) ApplyBlockedServices(setts *Settings, list []string) {
</s> add func (d *DNSFilter) ApplyBlockedServices(setts *Settings) {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> remove list := d.Config.BlockedServices
</s> add list := d.Config.BlockedServices.IDs </s> remove if list == nil {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> add </s> remove list = d.Config.BlockedServices
</s> add bsvc := d.BlockedServices
// TODO(s.chzhen): Use startTime from [dnsforward.dnsContext].
if !bsvc.Schedule.Contains(time.Now()) {
d.ApplyBlockedServicesList(setts, bsvc.IDs) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/filtering.go |
if d.BlockedServices != nil {
bsvcs := []string{}
for _, s := range d.BlockedServices.IDs {
if !BlockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service %q", s) | <mask> if err != nil {
<mask> return nil, fmt.Errorf("rewrites: preparing: %s", err)
<mask> }
<mask>
<mask> bsvcs := []string{}
<mask> for _, s := range d.BlockedServices {
<mask> if !BlockedSvcKnown(s) {
<mask> log.Debug("skipping unknown blocked-service %q", s)
<mask>
<mask> continue
<mask> }
<mask> bsvcs = append(bsvcs, s)
<mask> }
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove continue
</s> add continue
}
bsvcs = append(bsvcs, s) </s> remove bsvcs = append(bsvcs, s)
</s> add d.BlockedServices.IDs = bsvcs </s> remove d.BlockedServices = bsvcs
</s> add </s> remove Context.filters.ApplyBlockedServices(setts, svcs)
</s> add Context.filters.ApplyBlockedServicesList(setts, svcs) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/filtering.go |
continue
}
bsvcs = append(bsvcs, s) | <mask> for _, s := range d.BlockedServices {
<mask> if !BlockedSvcKnown(s) {
<mask> log.Debug("skipping unknown blocked-service %q", s)
<mask>
<mask> continue
<mask> }
<mask> bsvcs = append(bsvcs, s)
<mask> }
<mask> d.BlockedServices = bsvcs
<mask>
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove bsvcs := []string{}
for _, s := range d.BlockedServices {
if !BlockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service %q", s)
</s> add if d.BlockedServices != nil {
bsvcs := []string{}
for _, s := range d.BlockedServices.IDs {
if !BlockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service %q", s) </s> remove bsvcs = append(bsvcs, s)
</s> add d.BlockedServices.IDs = bsvcs </s> remove d.BlockedServices = bsvcs
</s> add </s> remove list = d.Config.BlockedServices
</s> add bsvc := d.BlockedServices
// TODO(s.chzhen): Use startTime from [dnsforward.dnsContext].
if !bsvc.Schedule.Contains(time.Now()) {
d.ApplyBlockedServicesList(setts, bsvc.IDs) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/filtering.go |
d.BlockedServices.IDs = bsvcs | <mask> log.Debug("skipping unknown blocked-service %q", s)
<mask>
<mask> continue
<mask> }
<mask> bsvcs = append(bsvcs, s)
<mask> }
<mask> d.BlockedServices = bsvcs
<mask>
<mask> if blockFilters != nil {
<mask> err = d.initFiltering(nil, blockFilters)
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove d.BlockedServices = bsvcs
</s> add </s> remove continue
</s> add continue
}
bsvcs = append(bsvcs, s) </s> remove bsvcs := []string{}
for _, s := range d.BlockedServices {
if !BlockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service %q", s)
</s> add if d.BlockedServices != nil {
bsvcs := []string{}
for _, s := range d.BlockedServices.IDs {
if !BlockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service %q", s) </s> remove d.ApplyBlockedServices(&setts, nil)
result, err := d.CheckHost(host, dns.TypeA, &setts)
</s> add d.ApplyBlockedServices(setts)
result, err := d.CheckHost(host, dns.TypeA, setts) </s> remove s.conf.FilterHandler(ip, dctx.clientID, &setts)
</s> add s.conf.FilterHandler(ip, dctx.clientID, setts) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/filtering.go |
<mask> continue
<mask> }
<mask> bsvcs = append(bsvcs, s)
<mask> }
<mask> d.BlockedServices = bsvcs
<mask>
<mask> if blockFilters != nil {
<mask> err = d.initFiltering(nil, blockFilters)
<mask> if err != nil {
<mask> d.Close()
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove bsvcs = append(bsvcs, s)
</s> add d.BlockedServices.IDs = bsvcs </s> remove continue
</s> add continue
}
bsvcs = append(bsvcs, s) </s> remove bsvcs := []string{}
for _, s := range d.BlockedServices {
if !BlockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service %q", s)
</s> add if d.BlockedServices != nil {
bsvcs := []string{}
for _, s := range d.BlockedServices.IDs {
if !BlockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service %q", s) </s> remove d.ApplyBlockedServices(&setts, nil)
result, err := d.CheckHost(host, dns.TypeA, &setts)
</s> add d.ApplyBlockedServices(setts)
result, err := d.CheckHost(host, dns.TypeA, setts) </s> remove s.conf.FilterHandler(ip, dctx.clientID, &setts)
</s> add s.conf.FilterHandler(ip, dctx.clientID, setts) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/filtering.go | |
setts := d.Settings() | <mask>
<mask> func (d *DNSFilter) handleCheckHost(w http.ResponseWriter, r *http.Request) {
<mask> host := r.URL.Query().Get("name")
<mask>
<mask> setts := d.GetConfig()
<mask> setts.FilteringEnabled = true
<mask> setts.ProtectionEnabled = true
<mask>
<mask> d.ApplyBlockedServices(&setts, nil)
<mask> result, err := d.CheckHost(host, dns.TypeA, &setts)
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove d.ApplyBlockedServices(&setts, nil)
result, err := d.CheckHost(host, dns.TypeA, &setts)
</s> add d.ApplyBlockedServices(setts)
result, err := d.CheckHost(host, dns.TypeA, setts) </s> remove list := d.Config.BlockedServices
</s> add list := d.Config.BlockedServices.IDs </s> remove s.conf.FilterHandler(ip, dctx.clientID, &setts)
</s> add s.conf.FilterHandler(ip, dctx.clientID, setts) </s> remove setts := s.dnsFilter.GetConfig()
</s> add setts := s.dnsFilter.Settings() </s> remove d.BlockedServices = bsvcs
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/http.go |
d.ApplyBlockedServices(setts)
result, err := d.CheckHost(host, dns.TypeA, setts) | <mask> setts := d.GetConfig()
<mask> setts.FilteringEnabled = true
<mask> setts.ProtectionEnabled = true
<mask>
<mask> d.ApplyBlockedServices(&setts, nil)
<mask> result, err := d.CheckHost(host, dns.TypeA, &setts)
<mask> if err != nil {
<mask> aghhttp.Error(
<mask> r,
<mask> w,
<mask> http.StatusInternalServerError,
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove setts := d.GetConfig()
</s> add setts := d.Settings() </s> remove d.BlockedServices = bsvcs
</s> add </s> remove s.conf.FilterHandler(ip, dctx.clientID, &setts)
</s> add s.conf.FilterHandler(ip, dctx.clientID, setts) </s> remove setts := s.dnsFilter.GetConfig()
</s> add setts := s.dnsFilter.Settings() </s> remove bsvcs = append(bsvcs, s)
</s> add d.BlockedServices.IDs = bsvcs | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/filtering/http.go |
"github.com/AdguardTeam/AdGuardHome/internal/schedule" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/dnsproxy/fastip"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove // Names of services to block (globally).
</s> add // BlockedServices is the configuration of blocked services. </s> remove s.conf.FilterHandler(ip, dctx.clientID, &setts)
</s> add s.conf.FilterHandler(ip, dctx.clientID, setts) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/home/config.go |
BlockedServices: &filtering.BlockedServices{
Schedule: schedule.EmptyWeekly(),
IDs: []string{},
}, | <mask> Pixabay: true,
<mask> Yandex: true,
<mask> YouTube: true,
<mask> },
<mask> },
<mask> UpstreamTimeout: timeutil.Duration{Duration: dnsforward.DefaultTimeout},
<mask> UsePrivateRDNS: true,
<mask> },
<mask> TLS: tlsConfigSettings{
<mask> PortHTTPS: defaultPortHTTPS,
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove // Names of services to block (globally).
</s> add // BlockedServices is the configuration of blocked services. </s> remove s.conf.FilterHandler(ip, dctx.clientID, &setts)
</s> add s.conf.FilterHandler(ip, dctx.clientID, setts) </s> remove return &setts
</s> add return setts | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/home/config.go |
Context.filters.ApplyBlockedServices(setts) | <mask> func applyAdditionalFiltering(clientIP net.IP, clientID string, setts *filtering.Settings) {
<mask> // pref is a prefix for logging messages around the scope.
<mask> const pref = "applying filters"
<mask>
<mask> Context.filters.ApplyBlockedServices(setts, nil)
<mask>
<mask> log.Debug("%s: looking for client with ip %s and clientid %q", pref, clientIP, clientID)
<mask>
<mask> if clientIP == nil {
<mask> return
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove Context.filters.ApplyBlockedServices(setts, svcs)
</s> add Context.filters.ApplyBlockedServicesList(setts, svcs) </s> remove setts := s.dnsFilter.GetConfig()
</s> add setts := s.dnsFilter.Settings() </s> remove const currentSchemaVersion = 20
</s> add const currentSchemaVersion = 21 </s> remove return &setts
</s> add return setts | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/home/dns.go |
Context.filters.ApplyBlockedServicesList(setts, svcs) | <mask> svcs := c.BlockedServices
<mask> if svcs == nil {
<mask> svcs = []string{}
<mask> }
<mask> Context.filters.ApplyBlockedServices(setts, svcs)
<mask> log.Debug("%s: services for client %q set: %s", pref, c.Name, svcs)
<mask> }
<mask>
<mask> setts.ClientName = c.Name
<mask> setts.ClientTags = c.Tags
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove Context.filters.ApplyBlockedServices(setts, nil)
</s> add Context.filters.ApplyBlockedServices(setts) </s> remove bsvcs := []string{}
for _, s := range d.BlockedServices {
if !BlockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service %q", s)
</s> add if d.BlockedServices != nil {
bsvcs := []string{}
for _, s := range d.BlockedServices.IDs {
if !BlockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service %q", s) </s> remove if list == nil {
d.confLock.RLock()
defer d.confLock.RUnlock()
</s> add </s> remove d.BlockedServices = bsvcs
</s> add </s> remove func (d *DNSFilter) ApplyBlockedServices(setts *Settings, list []string) {
</s> add func (d *DNSFilter) ApplyBlockedServices(setts *Settings) {
d.confLock.RLock()
defer d.confLock.RUnlock()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/home/dns.go |
const currentSchemaVersion = 21 | <mask> yaml "gopkg.in/yaml.v3"
<mask> )
<mask>
<mask> // currentSchemaVersion is the current schema version.
<mask> const currentSchemaVersion = 20
<mask>
<mask> // These aliases are provided for convenience.
<mask> type (
<mask> yarr = []any
<mask> yobj = map[string]any
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove Context.filters.ApplyBlockedServices(setts, nil)
</s> add Context.filters.ApplyBlockedServices(setts) </s> remove bsvcs = append(bsvcs, s)
</s> add d.BlockedServices.IDs = bsvcs | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/home/upgrade.go |
upgradeSchema20to21, | <mask> upgradeSchema18to19,
<mask> upgradeSchema19to20,
<mask> }
<mask>
<mask> n := 0
<mask> for i, u := range upgrades {
</s> Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits </s> remove bsvcs := []string{}
for _, s := range d.BlockedServices {
if !BlockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service %q", s)
</s> add if d.BlockedServices != nil {
bsvcs := []string{}
for _, s := range d.BlockedServices.IDs {
if !BlockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service %q", s) </s> remove continue
</s> add continue
}
bsvcs = append(bsvcs, s) </s> remove list = d.Config.BlockedServices
</s> add bsvc := d.BlockedServices
// TODO(s.chzhen): Use startTime from [dnsforward.dnsContext].
if !bsvc.Schedule.Contains(time.Now()) {
d.ApplyBlockedServicesList(setts, bsvc.IDs) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ada9881ac0333deeaa13a77a78d6c4d891d14b | internal/home/upgrade.go |
// cached version.json to avoid hammering github.io for each page reload
versionCheckJSON []byte
versionCheckLastTime time.Time
| <mask> client *http.Client
<mask>
<mask> BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
<mask> BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
<mask> AuthName string `yaml:"auth_name"` // AuthName is the basic auth username
<mask> AuthPass string `yaml:"auth_pass"` // AuthPass is the basic auth password
</s> * move "versionCheckJSON" to "config" </s> remove if len(versionCheckJSON) == 0 {
</s> add if len(config.versionCheckJSON) == 0 { </s> remove u, err := getUpdateInfo(versionCheckJSON)
</s> add u, err := getUpdateInfo(config.versionCheckJSON) </s> remove versionCheckLastTime = now
versionCheckJSON = body
</s> add config.versionCheckLastTime = now
config.versionCheckJSON = body </s> remove cached := now.Sub(versionCheckLastTime) <= versionCheckPeriod && len(versionCheckJSON) != 0
data := versionCheckJSON
</s> add cached := now.Sub(config.versionCheckLastTime) <= versionCheckPeriod && len(config.versionCheckJSON) != 0
data := config.versionCheckJSON </s> remove // cached version.json to avoid hammering github.io for each page reload
var versionCheckJSON []byte
var versionCheckLastTime time.Time
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ddfc81a6d64f9f0802014d32f18f5a5c5a3ba1 | home/config.go |
<mask> )
<mask>
<mask> const updatePeriod = time.Minute * 30
<mask>
<mask> // cached version.json to avoid hammering github.io for each page reload
<mask> var versionCheckJSON []byte
<mask> var versionCheckLastTime time.Time
<mask>
<mask> var protocols = []string{"tls://", "https://", "tcp://", "sdns://"}
<mask>
<mask> // ----------------
<mask> // helper functions
<mask> // ----------------
</s> * move "versionCheckJSON" to "config" </s> remove versionCheckLastTime = now
versionCheckJSON = body
</s> add config.versionCheckLastTime = now
config.versionCheckJSON = body </s> remove cached := now.Sub(versionCheckLastTime) <= versionCheckPeriod && len(versionCheckJSON) != 0
data := versionCheckJSON
</s> add cached := now.Sub(config.versionCheckLastTime) <= versionCheckPeriod && len(config.versionCheckJSON) != 0
data := config.versionCheckJSON </s> remove u, err := getUpdateInfo(versionCheckJSON)
</s> add u, err := getUpdateInfo(config.versionCheckJSON) </s> remove if len(versionCheckJSON) == 0 {
</s> add if len(config.versionCheckJSON) == 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ddfc81a6d64f9f0802014d32f18f5a5c5a3ba1 | home/control.go | |
cached := now.Sub(config.versionCheckLastTime) <= versionCheckPeriod && len(config.versionCheckJSON) != 0
data := config.versionCheckJSON | <mask>
<mask> now := time.Now()
<mask> if !req.RecheckNow {
<mask> config.controlLock.Lock()
<mask> cached := now.Sub(versionCheckLastTime) <= versionCheckPeriod && len(versionCheckJSON) != 0
<mask> data := versionCheckJSON
<mask> config.controlLock.Unlock()
<mask>
<mask> if cached {
<mask> log.Tracef("Returning cached data")
<mask> w.Header().Set("Content-Type", "application/json")
</s> * move "versionCheckJSON" to "config" </s> remove versionCheckLastTime = now
versionCheckJSON = body
</s> add config.versionCheckLastTime = now
config.versionCheckJSON = body </s> remove if len(versionCheckJSON) == 0 {
</s> add if len(config.versionCheckJSON) == 0 { </s> remove u, err := getUpdateInfo(versionCheckJSON)
</s> add u, err := getUpdateInfo(config.versionCheckJSON) </s> remove // cached version.json to avoid hammering github.io for each page reload
var versionCheckJSON []byte
var versionCheckLastTime time.Time
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ddfc81a6d64f9f0802014d32f18f5a5c5a3ba1 | home/control_update.go |
config.versionCheckLastTime = now
config.versionCheckJSON = body | <mask> return
<mask> }
<mask>
<mask> config.controlLock.Lock()
<mask> versionCheckLastTime = now
<mask> versionCheckJSON = body
<mask> config.controlLock.Unlock()
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> _, err = w.Write(getVersionResp(body))
<mask> if err != nil {
</s> * move "versionCheckJSON" to "config" </s> remove cached := now.Sub(versionCheckLastTime) <= versionCheckPeriod && len(versionCheckJSON) != 0
data := versionCheckJSON
</s> add cached := now.Sub(config.versionCheckLastTime) <= versionCheckPeriod && len(config.versionCheckJSON) != 0
data := config.versionCheckJSON </s> remove // cached version.json to avoid hammering github.io for each page reload
var versionCheckJSON []byte
var versionCheckLastTime time.Time
</s> add </s> remove u, err := getUpdateInfo(versionCheckJSON)
</s> add u, err := getUpdateInfo(config.versionCheckJSON) </s> remove if len(versionCheckJSON) == 0 {
</s> add if len(config.versionCheckJSON) == 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ddfc81a6d64f9f0802014d32f18f5a5c5a3ba1 | home/control_update.go |
if len(config.versionCheckJSON) == 0 { | <mask> // Perform an update procedure to the latest available version
<mask> func handleUpdate(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
<mask>
<mask> if len(versionCheckJSON) == 0 {
<mask> httpError(w, http.StatusBadRequest, "/update request isn't allowed now")
<mask> return
<mask> }
<mask>
<mask> u, err := getUpdateInfo(versionCheckJSON)
</s> * move "versionCheckJSON" to "config" </s> remove u, err := getUpdateInfo(versionCheckJSON)
</s> add u, err := getUpdateInfo(config.versionCheckJSON) </s> remove cached := now.Sub(versionCheckLastTime) <= versionCheckPeriod && len(versionCheckJSON) != 0
data := versionCheckJSON
</s> add cached := now.Sub(config.versionCheckLastTime) <= versionCheckPeriod && len(config.versionCheckJSON) != 0
data := config.versionCheckJSON </s> remove versionCheckLastTime = now
versionCheckJSON = body
</s> add config.versionCheckLastTime = now
config.versionCheckJSON = body </s> remove // cached version.json to avoid hammering github.io for each page reload
var versionCheckJSON []byte
var versionCheckLastTime time.Time
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ddfc81a6d64f9f0802014d32f18f5a5c5a3ba1 | home/control_update.go |
u, err := getUpdateInfo(config.versionCheckJSON) | <mask> httpError(w, http.StatusBadRequest, "/update request isn't allowed now")
<mask> return
<mask> }
<mask>
<mask> u, err := getUpdateInfo(versionCheckJSON)
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "%s", err)
<mask> return
<mask> }
<mask>
</s> * move "versionCheckJSON" to "config" </s> remove if len(versionCheckJSON) == 0 {
</s> add if len(config.versionCheckJSON) == 0 { </s> remove versionCheckLastTime = now
versionCheckJSON = body
</s> add config.versionCheckLastTime = now
config.versionCheckJSON = body </s> remove cached := now.Sub(versionCheckLastTime) <= versionCheckPeriod && len(versionCheckJSON) != 0
data := versionCheckJSON
</s> add cached := now.Sub(config.versionCheckLastTime) <= versionCheckPeriod && len(config.versionCheckJSON) != 0
data := config.versionCheckJSON </s> remove // cached version.json to avoid hammering github.io for each page reload
var versionCheckJSON []byte
var versionCheckLastTime time.Time
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3ddfc81a6d64f9f0802014d32f18f5a5c5a3ba1 | home/control_update.go |
sortable: false,
resizable: false, | <mask> accessor: 'actions',
<mask> maxWidth: 100,
<mask> Cell: (value) => (
<mask> <div className="logs__row logs__row--center">
<mask> <button
<mask> type="button"
<mask> className="btn btn-icon btn-icon--green btn-outline-secondary btn-sm"
</s> Pull request: 4637 fix blocked services icons and actions highlight
Updates #4637
Squashed commit of the following:
commit d69887586d15582406fab642e576a46f8984107b
Merge: 65453371 e738508d
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Jun 10 12:07:29 2022 +0300
Merge branch 'master' into 4637-table
commit 65453371fc7309e772a12fb9f522247e1392a64a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Jun 9 18:43:44 2022 +0300
client: fix blocked services icons and actions highlight </s> remove <div key={tag} title={tag} className="small">
</s> add <div key={tag} title={tag} className="logs__tag small"> </s> remove accessor: 'url',
</s> add accessor: 'actions', | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3f39b0aa168ddf89755e769a1477ae3c91ece3a | client/src/components/Filters/Rewrites/Table.js |
resizable: false, | <mask> accessor: 'enabled',
<mask> Cell: this.renderCheckbox,
<mask> width: 90,
<mask> className: 'text-center',
<mask> },
<mask> {
<mask> Header: <Trans>name_table_header</Trans>,
<mask> accessor: 'name',
<mask> minWidth: 200,
</s> Pull request: 4637 fix blocked services icons and actions highlight
Updates #4637
Squashed commit of the following:
commit d69887586d15582406fab642e576a46f8984107b
Merge: 65453371 e738508d
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Jun 10 12:07:29 2022 +0300
Merge branch 'master' into 4637-table
commit 65453371fc7309e772a12fb9f522247e1392a64a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Jun 9 18:43:44 2022 +0300
client: fix blocked services icons and actions highlight </s> remove accessor: 'url',
</s> add accessor: 'actions', | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3f39b0aa168ddf89755e769a1477ae3c91ece3a | client/src/components/Filters/Table.js |
accessor: 'actions', | <mask> Cell: this.getDateCell,
<mask> },
<mask> {
<mask> Header: <Trans>actions_table_header</Trans>,
<mask> accessor: 'url',
<mask> className: 'text-center',
<mask> width: 100,
<mask> sortable: false,
<mask> Cell: (row) => {
<mask> const { value } = row;
</s> Pull request: 4637 fix blocked services icons and actions highlight
Updates #4637
Squashed commit of the following:
commit d69887586d15582406fab642e576a46f8984107b
Merge: 65453371 e738508d
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Jun 10 12:07:29 2022 +0300
Merge branch 'master' into 4637-table
commit 65453371fc7309e772a12fb9f522247e1392a64a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Jun 9 18:43:44 2022 +0300
client: fix blocked services icons and actions highlight | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3f39b0aa168ddf89755e769a1477ae3c91ece3a | client/src/components/Filters/Table.js |
resizable: false, | <mask> accessor: 'actions',
<mask> className: 'text-center',
<mask> width: 100,
<mask> sortable: false,
<mask> Cell: (row) => {
<mask> const { value } = row;
<mask> const { t, toggleFilteringModal, handleDelete } = this.props;
<mask>
</s> Pull request: 4637 fix blocked services icons and actions highlight
Updates #4637
Squashed commit of the following:
commit d69887586d15582406fab642e576a46f8984107b
Merge: 65453371 e738508d
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Jun 10 12:07:29 2022 +0300
Merge branch 'master' into 4637-table
commit 65453371fc7309e772a12fb9f522247e1392a64a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Jun 9 18:43:44 2022 +0300
client: fix blocked services icons and actions highlight </s> remove accessor: 'url',
</s> add accessor: 'actions', | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3f39b0aa168ddf89755e769a1477ae3c91ece3a | client/src/components/Filters/Table.js |
.logs__row--icons {
flex-wrap: wrap;
}
| <mask> overflow: hidden;
<mask> text-overflow: ellipsis;
<mask> }
<mask>
<mask> .logs__table .logs__row {
<mask> border-bottom: 2px solid var(--gray-216);
<mask> }
<mask>
<mask> .logs__tag {
</s> Pull request: 4637 fix blocked services icons and actions highlight
Updates #4637
Squashed commit of the following:
commit d69887586d15582406fab642e576a46f8984107b
Merge: 65453371 e738508d
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Jun 10 12:07:29 2022 +0300
Merge branch 'master' into 4637-table
commit 65453371fc7309e772a12fb9f522247e1392a64a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Jun 9 18:43:44 2022 +0300
client: fix blocked services icons and actions highlight </s> remove accessor: 'url',
</s> add accessor: 'actions', | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3f39b0aa168ddf89755e769a1477ae3c91ece3a | client/src/components/Logs/Logs.css |
.logs__tag {
text-overflow: ellipsis;
overflow: hidden;
}
| <mask> border-bottom: 2px solid var(--gray-216);
<mask> }
<mask>
<mask> /* QUERY_STATUS_COLORS */
<mask> .logs__row--blue {
<mask> background-color: var(--blue);
<mask> }
<mask>
<mask> .logs__row--green {
</s> Pull request: 4637 fix blocked services icons and actions highlight
Updates #4637
Squashed commit of the following:
commit d69887586d15582406fab642e576a46f8984107b
Merge: 65453371 e738508d
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Jun 10 12:07:29 2022 +0300
Merge branch 'master' into 4637-table
commit 65453371fc7309e772a12fb9f522247e1392a64a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Jun 9 18:43:44 2022 +0300
client: fix blocked services icons and actions highlight </s> remove accessor: 'url',
</s> add accessor: 'actions', | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3f39b0aa168ddf89755e769a1477ae3c91ece3a | client/src/components/Logs/Logs.css |
<div key={tag} title={tag} className="logs__tag small"> | <mask> return (
<mask> <div className="logs__row o-hidden">
<mask> <span className="logs__text">
<mask> {value.map((tag) => (
<mask> <div key={tag} title={tag} className="small">
<mask> {tag}
<mask> </div>
<mask> ))}
<mask> </span>
<mask> </div>
</s> Pull request: 4637 fix blocked services icons and actions highlight
Updates #4637
Squashed commit of the following:
commit d69887586d15582406fab642e576a46f8984107b
Merge: 65453371 e738508d
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Jun 10 12:07:29 2022 +0300
Merge branch 'master' into 4637-table
commit 65453371fc7309e772a12fb9f522247e1392a64a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Jun 9 18:43:44 2022 +0300
client: fix blocked services icons and actions highlight </s> remove accessor: 'url',
</s> add accessor: 'actions', | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3f39b0aa168ddf89755e769a1477ae3c91ece3a | client/src/components/Settings/Clients/ClientsTable.js |
sortable: false,
resizable: false, | <mask> accessor: 'actions',
<mask> maxWidth: 100,
<mask> Cell: (row) => {
<mask> const clientName = row.original.name;
<mask> const {
<mask> toggleClientModal, processingDeleting, processingUpdating, t,
<mask> } = this.props;
</s> Pull request: 4637 fix blocked services icons and actions highlight
Updates #4637
Squashed commit of the following:
commit d69887586d15582406fab642e576a46f8984107b
Merge: 65453371 e738508d
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Jun 10 12:07:29 2022 +0300
Merge branch 'master' into 4637-table
commit 65453371fc7309e772a12fb9f522247e1392a64a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Jun 9 18:43:44 2022 +0300
client: fix blocked services icons and actions highlight </s> remove accessor: 'url',
</s> add accessor: 'actions', | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3f39b0aa168ddf89755e769a1477ae3c91ece3a | client/src/components/Settings/Clients/ClientsTable.js |
sortable: false,
resizable: false, | <mask> accessor: 'actions',
<mask> maxWidth: 150,
<mask> // eslint-disable-next-line react/display-name
<mask> Cell: (row) => {
<mask> const { ip, mac, hostname } = row.original;
<mask>
<mask> return <div className="logs__row logs__row--center">
</s> Pull request: 4637 fix blocked services icons and actions highlight
Updates #4637
Squashed commit of the following:
commit d69887586d15582406fab642e576a46f8984107b
Merge: 65453371 e738508d
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Jun 10 12:07:29 2022 +0300
Merge branch 'master' into 4637-table
commit 65453371fc7309e772a12fb9f522247e1392a64a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Jun 9 18:43:44 2022 +0300
client: fix blocked services icons and actions highlight </s> remove accessor: 'url',
</s> add accessor: 'actions', </s> remove <div key={tag} title={tag} className="small">
</s> add <div key={tag} title={tag} className="logs__tag small"> | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d3f39b0aa168ddf89755e769a1477ae3c91ece3a | client/src/components/Settings/Dhcp/StaticLeases/index.js |
"encoding/base64" | <mask> "bytes"
<mask> "context"
<mask> "crypto/tls"
<mask> "crypto/x509"
<mask> "encoding/json"
<mask> "encoding/pem"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "net"
</s> /tls/configure -- certificates/keys are now transferred encoded with base64 </s> remove pemblock := []byte(data.CertificateChain)
</s> add pemblock := []byte(certPEM) </s> remove _, err = tls.X509KeyPair([]byte(data.CertificateChain), []byte(data.PrivateKey))
</s> add certPEM, err := base64.StdEncoding.DecodeString(data.CertificateChain)
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to base64-decode certificate chain: %s", err)
return
}
keyPEM, err := base64.StdEncoding.DecodeString(data.PrivateKey)
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to base64-decode private key: %s", err)
return
}
log.Printf("got certificate: %s", certPEM)
_, err = tls.X509KeyPair(certPEM, keyPEM) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d42718465da849a76569332fc2fe97d2fc47e5cf | control.go |
certPEM, err := base64.StdEncoding.DecodeString(data.CertificateChain)
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to base64-decode certificate chain: %s", err)
return
}
keyPEM, err := base64.StdEncoding.DecodeString(data.PrivateKey)
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to base64-decode private key: %s", err)
return
}
log.Printf("got certificate: %s", certPEM)
_, err = tls.X509KeyPair(certPEM, keyPEM) | <mask> httpError(w, http.StatusBadRequest, "Failed to parse new TLS config json: %s", err)
<mask> return
<mask> }
<mask>
<mask> _, err = tls.X509KeyPair([]byte(data.CertificateChain), []byte(data.PrivateKey))
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Invalid certificate or key: %s", err)
<mask> return
<mask> }
<mask>
</s> /tls/configure -- certificates/keys are now transferred encoded with base64 </s> remove pemblock := []byte(data.CertificateChain)
</s> add pemblock := []byte(certPEM) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d42718465da849a76569332fc2fe97d2fc47e5cf | control.go |
pemblock := []byte(certPEM) | <mask> // now do a more extended validation
<mask> var certs []*pem.Block // PEM-encoded certificates
<mask> var skippedBytes []string // skipped bytes
<mask>
<mask> pemblock := []byte(data.CertificateChain)
<mask> for {
<mask> var decoded *pem.Block
<mask> decoded, pemblock = pem.Decode(pemblock)
<mask> if decoded == nil {
<mask> break
</s> /tls/configure -- certificates/keys are now transferred encoded with base64 </s> remove _, err = tls.X509KeyPair([]byte(data.CertificateChain), []byte(data.PrivateKey))
</s> add certPEM, err := base64.StdEncoding.DecodeString(data.CertificateChain)
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to base64-decode certificate chain: %s", err)
return
}
keyPEM, err := base64.StdEncoding.DecodeString(data.PrivateKey)
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to base64-decode private key: %s", err)
return
}
log.Printf("got certificate: %s", certPEM)
_, err = tls.X509KeyPair(certPEM, keyPEM) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d42718465da849a76569332fc2fe97d2fc47e5cf | control.go |
// TODO: let self-signed certs through | <mask> _, err = mainCert.Verify(opts)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Your certificate does not verify: %s", err)
<mask> return
<mask> }
<mask> // spew.Dump(chains)
<mask>
<mask> config.TLS = data
</s> /tls/configure -- certificates/keys are now transferred encoded with base64 </s> remove _, err = tls.X509KeyPair([]byte(data.CertificateChain), []byte(data.PrivateKey))
</s> add certPEM, err := base64.StdEncoding.DecodeString(data.CertificateChain)
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to base64-decode certificate chain: %s", err)
return
}
keyPEM, err := base64.StdEncoding.DecodeString(data.PrivateKey)
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to base64-decode private key: %s", err)
return
}
log.Printf("got certificate: %s", certPEM)
_, err = tls.X509KeyPair(certPEM, keyPEM) </s> remove pemblock := []byte(data.CertificateChain)
</s> add pemblock := []byte(certPEM) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d42718465da849a76569332fc2fe97d2fc47e5cf | control.go |
data := validateCertificates(config.TLS)
if data.WarningValidation != "" {
log.Fatal(data.WarningValidation) | <mask> httpsServer.cond.Wait()
<mask> }
<mask> address := net.JoinHostPort(config.BindHost, strconv.Itoa(config.TLS.PortHTTPS))
<mask> // validate current TLS config and update warnings (it could have been loaded from file)
<mask> data, err := validateCertificates(config.TLS)
<mask> if err != nil {
<mask> log.Fatal(err)
<mask> os.Exit(1)
<mask> }
<mask> config.TLS = data // update warnings
<mask>
<mask> // prepare cert for HTTPS server
</s> /tls/configure and /tls/validate -- make validation failures non-fatal </s> remove data := config.TLS
if data.CertificateChain != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.CertificateChain))
data.CertificateChain = string(encoded)
}
if data.PrivateKey != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.PrivateKey))
data.PrivateKey = string(encoded)
}
err := json.NewEncoder(w).Encode(&data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Failed to marshal json with TLS status: %s", err)
return
}
</s> add marshalTLS(w, config.TLS) </s> remove restartHTTPS := false
if !reflect.DeepEqual(config.TLS.tlsConfigSettings, data.tlsConfigSettings) {
log.Printf("tls config settings have changed, will restart HTTPS server")
restartHTTPS = true
}
config.TLS = data
httpUpdateConfigReloadDNSReturnOK(w, r)
</s> add marshalTLS(w, data) </s> remove data, err = validateCertificates(data)
</s> add restartHTTPS := false
data = validateCertificates(data)
if data.WarningValidation == "" {
if !reflect.DeepEqual(config.TLS.tlsConfigSettings, data.tlsConfigSettings) {
log.Printf("tls config settings have changed, will restart HTTPS server")
restartHTTPS = true
}
config.TLS = data
}
err = writeAllConfigsAndReloadDNS() </s> remove return data, errorx.Decorate(err, "Failed to parse certificate")
</s> add data.WarningValidation = fmt.Sprintf("Failed to parse certificate: %s", err)
return data </s> remove return data, errorx.Decorate(err, "Invalid certificate or key")
</s> add data.WarningValidation = fmt.Sprintf("Invalid certificate or key: %s", err)
return data | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d44f68e844591efa64f5912d71c20bed366e5510 | app.go |
httpError(w, http.StatusInternalServerError, "Couldn't write config file: %s", err) | <mask>
<mask> func httpUpdateConfigReloadDNSReturnOK(w http.ResponseWriter, r *http.Request) {
<mask> err := writeAllConfigsAndReloadDNS()
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Couldn't write config file: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> returnOK(w)
<mask> }
<mask>
</s> /tls/configure and /tls/validate -- make validation failures non-fatal </s> remove data := config.TLS
if data.CertificateChain != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.CertificateChain))
data.CertificateChain = string(encoded)
}
if data.PrivateKey != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.PrivateKey))
data.PrivateKey = string(encoded)
}
err := json.NewEncoder(w).Encode(&data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Failed to marshal json with TLS status: %s", err)
return
}
</s> add marshalTLS(w, config.TLS) </s> remove data, err = validateCertificates(data)
if err != nil {
httpError(w, http.StatusBadRequest, "New TLS configuration does not validate: %s", err)
return
}
</s> add data = validateCertificates(data)
marshalTLS(w, data) </s> remove httpError(w, http.StatusBadRequest, "New TLS configuration does not validate: %s", err)
</s> add httpError(w, http.StatusInternalServerError, "Couldn't write config file: %s", err) </s> remove data, err = validateCertificates(data)
</s> add restartHTTPS := false
data = validateCertificates(data)
if data.WarningValidation == "" {
if !reflect.DeepEqual(config.TLS.tlsConfigSettings, data.tlsConfigSettings) {
log.Printf("tls config settings have changed, will restart HTTPS server")
restartHTTPS = true
}
config.TLS = data
}
err = writeAllConfigsAndReloadDNS() </s> remove return data, errorx.Decorate(err, "Failed to parse certificate")
</s> add data.WarningValidation = fmt.Sprintf("Failed to parse certificate: %s", err)
return data | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d44f68e844591efa64f5912d71c20bed366e5510 | control.go |
marshalTLS(w, config.TLS) | <mask> // ---
<mask> // TLS
<mask> // ---
<mask> func handleTLSStatus(w http.ResponseWriter, r *http.Request) {
<mask> data := config.TLS
<mask> if data.CertificateChain != "" {
<mask> encoded := base64.StdEncoding.EncodeToString([]byte(data.CertificateChain))
<mask> data.CertificateChain = string(encoded)
<mask> }
<mask> if data.PrivateKey != "" {
<mask> encoded := base64.StdEncoding.EncodeToString([]byte(data.PrivateKey))
<mask> data.PrivateKey = string(encoded)
<mask> }
<mask> err := json.NewEncoder(w).Encode(&data)
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "Failed to marshal json with TLS status: %s", err)
<mask> return
<mask> }
<mask> }
<mask>
<mask> func handleTLSValidate(w http.ResponseWriter, r *http.Request) {
<mask> data, err := unmarshalTLS(r)
<mask> if err != nil {
</s> /tls/configure and /tls/validate -- make validation failures non-fatal </s> remove data, err = validateCertificates(data)
if err != nil {
httpError(w, http.StatusBadRequest, "New TLS configuration does not validate: %s", err)
return
}
</s> add data = validateCertificates(data)
marshalTLS(w, data) </s> remove errorText := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errorText)
http.Error(w, errorText, http.StatusInternalServerError)
</s> add httpError(w, http.StatusInternalServerError, "Couldn't write config file: %s", err) </s> remove return data, errorx.Decorate(err, "Invalid certificate or key")
</s> add data.WarningValidation = fmt.Sprintf("Invalid certificate or key: %s", err)
return data </s> remove data, err = validateCertificates(data)
</s> add restartHTTPS := false
data = validateCertificates(data)
if data.WarningValidation == "" {
if !reflect.DeepEqual(config.TLS.tlsConfigSettings, data.tlsConfigSettings) {
log.Printf("tls config settings have changed, will restart HTTPS server")
restartHTTPS = true
}
config.TLS = data
}
err = writeAllConfigsAndReloadDNS() </s> remove data, err := validateCertificates(config.TLS)
if err != nil {
log.Fatal(err)
</s> add data := validateCertificates(config.TLS)
if data.WarningValidation != "" {
log.Fatal(data.WarningValidation) | [
"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/d44f68e844591efa64f5912d71c20bed366e5510 | control.go |
data = validateCertificates(data)
marshalTLS(w, data) | <mask> httpError(w, http.StatusBadRequest, "Failed to unmarshal TLS config: %s", err)
<mask> return
<mask> }
<mask>
<mask> data, err = validateCertificates(data)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "New TLS configuration does not validate: %s", err)
<mask> return
<mask> }
<mask> }
<mask>
<mask> func handleTLSConfigure(w http.ResponseWriter, r *http.Request) {
<mask> data, err := unmarshalTLS(r)
<mask> if err != nil {
</s> /tls/configure and /tls/validate -- make validation failures non-fatal </s> remove data, err = validateCertificates(data)
</s> add restartHTTPS := false
data = validateCertificates(data)
if data.WarningValidation == "" {
if !reflect.DeepEqual(config.TLS.tlsConfigSettings, data.tlsConfigSettings) {
log.Printf("tls config settings have changed, will restart HTTPS server")
restartHTTPS = true
}
config.TLS = data
}
err = writeAllConfigsAndReloadDNS() </s> remove data := config.TLS
if data.CertificateChain != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.CertificateChain))
data.CertificateChain = string(encoded)
}
if data.PrivateKey != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.PrivateKey))
data.PrivateKey = string(encoded)
}
err := json.NewEncoder(w).Encode(&data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Failed to marshal json with TLS status: %s", err)
return
}
</s> add marshalTLS(w, config.TLS) </s> remove httpError(w, http.StatusBadRequest, "New TLS configuration does not validate: %s", err)
</s> add httpError(w, http.StatusInternalServerError, "Couldn't write config file: %s", err) </s> remove errorText := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errorText)
http.Error(w, errorText, http.StatusInternalServerError)
</s> add httpError(w, http.StatusInternalServerError, "Couldn't write config file: %s", err) </s> remove restartHTTPS := false
if !reflect.DeepEqual(config.TLS.tlsConfigSettings, data.tlsConfigSettings) {
log.Printf("tls config settings have changed, will restart HTTPS server")
restartHTTPS = true
}
config.TLS = data
httpUpdateConfigReloadDNSReturnOK(w, r)
</s> add marshalTLS(w, data) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d44f68e844591efa64f5912d71c20bed366e5510 | control.go |
restartHTTPS := false
data = validateCertificates(data)
if data.WarningValidation == "" {
if !reflect.DeepEqual(config.TLS.tlsConfigSettings, data.tlsConfigSettings) {
log.Printf("tls config settings have changed, will restart HTTPS server")
restartHTTPS = true
}
config.TLS = data
}
err = writeAllConfigsAndReloadDNS() | <mask> httpError(w, http.StatusBadRequest, "Failed to unmarshal TLS config: %s", err)
<mask> return
<mask> }
<mask>
<mask> data, err = validateCertificates(data)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "New TLS configuration does not validate: %s", err)
<mask> return
<mask> }
<mask> restartHTTPS := false
</s> /tls/configure and /tls/validate -- make validation failures non-fatal </s> remove data, err = validateCertificates(data)
if err != nil {
httpError(w, http.StatusBadRequest, "New TLS configuration does not validate: %s", err)
return
}
</s> add data = validateCertificates(data)
marshalTLS(w, data) </s> remove httpError(w, http.StatusBadRequest, "New TLS configuration does not validate: %s", err)
</s> add httpError(w, http.StatusInternalServerError, "Couldn't write config file: %s", err) </s> remove restartHTTPS := false
if !reflect.DeepEqual(config.TLS.tlsConfigSettings, data.tlsConfigSettings) {
log.Printf("tls config settings have changed, will restart HTTPS server")
restartHTTPS = true
}
config.TLS = data
httpUpdateConfigReloadDNSReturnOK(w, r)
</s> add marshalTLS(w, data) </s> remove data := config.TLS
if data.CertificateChain != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.CertificateChain))
data.CertificateChain = string(encoded)
}
if data.PrivateKey != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.PrivateKey))
data.PrivateKey = string(encoded)
}
err := json.NewEncoder(w).Encode(&data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Failed to marshal json with TLS status: %s", err)
return
}
</s> add marshalTLS(w, config.TLS) </s> remove return data, errorx.Decorate(err, "Failed to parse certificate")
</s> add data.WarningValidation = fmt.Sprintf("Failed to parse certificate: %s", err)
return data | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d44f68e844591efa64f5912d71c20bed366e5510 | control.go |
httpError(w, http.StatusInternalServerError, "Couldn't write config file: %s", err) | <mask> }
<mask>
<mask> data, err = validateCertificates(data)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "New TLS configuration does not validate: %s", err)
<mask> return
<mask> }
<mask> restartHTTPS := false
<mask> if !reflect.DeepEqual(config.TLS.tlsConfigSettings, data.tlsConfigSettings) {
<mask> log.Printf("tls config settings have changed, will restart HTTPS server")
</s> /tls/configure and /tls/validate -- make validation failures non-fatal </s> remove data, err = validateCertificates(data)
</s> add restartHTTPS := false
data = validateCertificates(data)
if data.WarningValidation == "" {
if !reflect.DeepEqual(config.TLS.tlsConfigSettings, data.tlsConfigSettings) {
log.Printf("tls config settings have changed, will restart HTTPS server")
restartHTTPS = true
}
config.TLS = data
}
err = writeAllConfigsAndReloadDNS() </s> remove restartHTTPS := false
if !reflect.DeepEqual(config.TLS.tlsConfigSettings, data.tlsConfigSettings) {
log.Printf("tls config settings have changed, will restart HTTPS server")
restartHTTPS = true
}
config.TLS = data
httpUpdateConfigReloadDNSReturnOK(w, r)
</s> add marshalTLS(w, data) </s> remove data, err = validateCertificates(data)
if err != nil {
httpError(w, http.StatusBadRequest, "New TLS configuration does not validate: %s", err)
return
}
</s> add data = validateCertificates(data)
marshalTLS(w, data) </s> remove data := config.TLS
if data.CertificateChain != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.CertificateChain))
data.CertificateChain = string(encoded)
}
if data.PrivateKey != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.PrivateKey))
data.PrivateKey = string(encoded)
}
err := json.NewEncoder(w).Encode(&data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Failed to marshal json with TLS status: %s", err)
return
}
</s> add marshalTLS(w, config.TLS) </s> remove errorText := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errorText)
http.Error(w, errorText, http.StatusInternalServerError)
</s> add httpError(w, http.StatusInternalServerError, "Couldn't write config file: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d44f68e844591efa64f5912d71c20bed366e5510 | control.go |
marshalTLS(w, data) | <mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "New TLS configuration does not validate: %s", err)
<mask> return
<mask> }
<mask> restartHTTPS := false
<mask> if !reflect.DeepEqual(config.TLS.tlsConfigSettings, data.tlsConfigSettings) {
<mask> log.Printf("tls config settings have changed, will restart HTTPS server")
<mask> restartHTTPS = true
<mask> }
<mask> config.TLS = data
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
<mask> // until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
<mask> if restartHTTPS && httpsServer.server != nil {
<mask> go func() {
<mask> httpsServer.cond.Broadcast()
</s> /tls/configure and /tls/validate -- make validation failures non-fatal </s> remove data, err = validateCertificates(data)
</s> add restartHTTPS := false
data = validateCertificates(data)
if data.WarningValidation == "" {
if !reflect.DeepEqual(config.TLS.tlsConfigSettings, data.tlsConfigSettings) {
log.Printf("tls config settings have changed, will restart HTTPS server")
restartHTTPS = true
}
config.TLS = data
}
err = writeAllConfigsAndReloadDNS() </s> remove httpError(w, http.StatusBadRequest, "New TLS configuration does not validate: %s", err)
</s> add httpError(w, http.StatusInternalServerError, "Couldn't write config file: %s", err) </s> remove return data, errorx.Decorate(err, "Invalid certificate or key")
</s> add data.WarningValidation = fmt.Sprintf("Invalid certificate or key: %s", err)
return data </s> remove data, err = validateCertificates(data)
if err != nil {
httpError(w, http.StatusBadRequest, "New TLS configuration does not validate: %s", err)
return
}
</s> add data = validateCertificates(data)
marshalTLS(w, data) </s> remove data, err := validateCertificates(config.TLS)
if err != nil {
log.Fatal(err)
</s> add data := validateCertificates(config.TLS)
if data.WarningValidation != "" {
log.Fatal(data.WarningValidation) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d44f68e844591efa64f5912d71c20bed366e5510 | control.go |
func validateCertificates(data tlsConfig) tlsConfig { | <mask> }()
<mask> }
<mask> }
<mask>
<mask> func validateCertificates(data tlsConfig) (tlsConfig, error) {
<mask> var err error
<mask>
<mask> // clear out status for certificates
<mask> data.tlsConfigStatus = tlsConfigStatus{}
<mask>
</s> /tls/configure and /tls/validate -- make validation failures non-fatal </s> remove data := config.TLS
if data.CertificateChain != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.CertificateChain))
data.CertificateChain = string(encoded)
}
if data.PrivateKey != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.PrivateKey))
data.PrivateKey = string(encoded)
}
err := json.NewEncoder(w).Encode(&data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Failed to marshal json with TLS status: %s", err)
return
}
</s> add marshalTLS(w, config.TLS) </s> remove data, err := validateCertificates(config.TLS)
if err != nil {
log.Fatal(err)
</s> add data := validateCertificates(config.TLS)
if data.WarningValidation != "" {
log.Fatal(data.WarningValidation) </s> remove data, err = validateCertificates(data)
if err != nil {
httpError(w, http.StatusBadRequest, "New TLS configuration does not validate: %s", err)
return
}
</s> add data = validateCertificates(data)
marshalTLS(w, data) </s> remove return data, errorx.Decorate(err, "Failed to parse certificate")
</s> add data.WarningValidation = fmt.Sprintf("Failed to parse certificate: %s", err)
return data </s> remove return data, fmt.Errorf("No valid keys were found")
</s> add data.WarningValidation = "No valid keys were found"
return data | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d44f68e844591efa64f5912d71c20bed366e5510 | control.go |
data.WarningValidation = fmt.Sprintf("Failed to parse certificate: %s", err)
return data | <mask>
<mask> for _, cert := range certs {
<mask> parsed, err := x509.ParseCertificate(cert.Bytes)
<mask> if err != nil {
<mask> return data, errorx.Decorate(err, "Failed to parse certificate")
<mask> }
<mask> parsedCerts = append(parsedCerts, parsed)
<mask> }
<mask>
<mask> if len(parsedCerts) == 0 {
</s> /tls/configure and /tls/validate -- make validation failures non-fatal </s> remove return data, fmt.Errorf("You have specified an empty certificate")
</s> add data.WarningValidation = fmt.Sprintf("You have specified an empty certificate")
return data </s> remove return data, fmt.Errorf("No valid keys were found")
</s> add data.WarningValidation = "No valid keys were found"
return data </s> remove return data, errorx.Decorate(err, "Failed to parse private key")
</s> add data.WarningValidation = fmt.Sprintf("Failed to parse private key: %s", err)
return data </s> remove data, err := validateCertificates(config.TLS)
if err != nil {
log.Fatal(err)
</s> add data := validateCertificates(config.TLS)
if data.WarningValidation != "" {
log.Fatal(data.WarningValidation) </s> remove data := config.TLS
if data.CertificateChain != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.CertificateChain))
data.CertificateChain = string(encoded)
}
if data.PrivateKey != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.PrivateKey))
data.PrivateKey = string(encoded)
}
err := json.NewEncoder(w).Encode(&data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Failed to marshal json with TLS status: %s", err)
return
}
</s> add marshalTLS(w, config.TLS) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d44f68e844591efa64f5912d71c20bed366e5510 | control.go |
data.WarningValidation = fmt.Sprintf("You have specified an empty certificate")
return data | <mask> parsedCerts = append(parsedCerts, parsed)
<mask> }
<mask>
<mask> if len(parsedCerts) == 0 {
<mask> return data, fmt.Errorf("You have specified an empty certificate")
<mask> }
<mask>
<mask> // spew.Dump(parsedCerts)
<mask>
<mask> opts := x509.VerifyOptions{
</s> /tls/configure and /tls/validate -- make validation failures non-fatal </s> remove return data, errorx.Decorate(err, "Failed to parse certificate")
</s> add data.WarningValidation = fmt.Sprintf("Failed to parse certificate: %s", err)
return data </s> remove return data, fmt.Errorf("No valid keys were found")
</s> add data.WarningValidation = "No valid keys were found"
return data </s> remove data, err = validateCertificates(data)
</s> add restartHTTPS := false
data = validateCertificates(data)
if data.WarningValidation == "" {
if !reflect.DeepEqual(config.TLS.tlsConfigSettings, data.tlsConfigSettings) {
log.Printf("tls config settings have changed, will restart HTTPS server")
restartHTTPS = true
}
config.TLS = data
}
err = writeAllConfigsAndReloadDNS() </s> remove data := config.TLS
if data.CertificateChain != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.CertificateChain))
data.CertificateChain = string(encoded)
}
if data.PrivateKey != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.PrivateKey))
data.PrivateKey = string(encoded)
}
err := json.NewEncoder(w).Encode(&data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Failed to marshal json with TLS status: %s", err)
return
}
</s> add marshalTLS(w, config.TLS) </s> remove data, err := validateCertificates(config.TLS)
if err != nil {
log.Fatal(err)
</s> add data := validateCertificates(config.TLS)
if data.WarningValidation != "" {
log.Fatal(data.WarningValidation) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d44f68e844591efa64f5912d71c20bed366e5510 | control.go |
data.WarningValidation = "No valid keys were found"
return data | <mask> }
<mask> }
<mask>
<mask> if key == nil {
<mask> return data, fmt.Errorf("No valid keys were found")
<mask> }
<mask>
<mask> // parse the decoded key
<mask> _, keytype, err := parsePrivateKey(key.Bytes)
<mask> if err != nil {
</s> /tls/configure and /tls/validate -- make validation failures non-fatal </s> remove return data, errorx.Decorate(err, "Failed to parse private key")
</s> add data.WarningValidation = fmt.Sprintf("Failed to parse private key: %s", err)
return data </s> remove return data, errorx.Decorate(err, "Failed to parse certificate")
</s> add data.WarningValidation = fmt.Sprintf("Failed to parse certificate: %s", err)
return data </s> remove return data, nil
</s> add return data </s> remove return data, errorx.Decorate(err, "Invalid certificate or key")
</s> add data.WarningValidation = fmt.Sprintf("Invalid certificate or key: %s", err)
return data </s> remove data := config.TLS
if data.CertificateChain != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.CertificateChain))
data.CertificateChain = string(encoded)
}
if data.PrivateKey != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.PrivateKey))
data.PrivateKey = string(encoded)
}
err := json.NewEncoder(w).Encode(&data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Failed to marshal json with TLS status: %s", err)
return
}
</s> add marshalTLS(w, config.TLS) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d44f68e844591efa64f5912d71c20bed366e5510 | control.go |
data.WarningValidation = fmt.Sprintf("Failed to parse private key: %s", err)
return data | <mask>
<mask> // parse the decoded key
<mask> _, keytype, err := parsePrivateKey(key.Bytes)
<mask> if err != nil {
<mask> return data, errorx.Decorate(err, "Failed to parse private key")
<mask> }
<mask>
<mask> data.ValidKey = true
<mask> data.KeyType = keytype
<mask> }
</s> /tls/configure and /tls/validate -- make validation failures non-fatal </s> remove return data, fmt.Errorf("No valid keys were found")
</s> add data.WarningValidation = "No valid keys were found"
return data </s> remove return data, errorx.Decorate(err, "Failed to parse certificate")
</s> add data.WarningValidation = fmt.Sprintf("Failed to parse certificate: %s", err)
return data </s> remove return data, nil
</s> add return data </s> remove return data, errorx.Decorate(err, "Invalid certificate or key")
</s> add data.WarningValidation = fmt.Sprintf("Invalid certificate or key: %s", err)
return data </s> remove data, err = validateCertificates(data)
</s> add restartHTTPS := false
data = validateCertificates(data)
if data.WarningValidation == "" {
if !reflect.DeepEqual(config.TLS.tlsConfigSettings, data.tlsConfigSettings) {
log.Printf("tls config settings have changed, will restart HTTPS server")
restartHTTPS = true
}
config.TLS = data
}
err = writeAllConfigsAndReloadDNS() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d44f68e844591efa64f5912d71c20bed366e5510 | control.go |
data.WarningValidation = fmt.Sprintf("Invalid certificate or key: %s", err)
return data | <mask> // if both are set, validate both in unison
<mask> if data.PrivateKey != "" && data.CertificateChain != "" {
<mask> _, err = tls.X509KeyPair([]byte(data.CertificateChain), []byte(data.PrivateKey))
<mask> if err != nil {
<mask> return data, errorx.Decorate(err, "Invalid certificate or key")
<mask> }
<mask> }
<mask>
<mask> return data, nil
<mask> }
</s> /tls/configure and /tls/validate -- make validation failures non-fatal </s> remove data := config.TLS
if data.CertificateChain != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.CertificateChain))
data.CertificateChain = string(encoded)
}
if data.PrivateKey != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.PrivateKey))
data.PrivateKey = string(encoded)
}
err := json.NewEncoder(w).Encode(&data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Failed to marshal json with TLS status: %s", err)
return
}
</s> add marshalTLS(w, config.TLS) </s> remove return data, errorx.Decorate(err, "Failed to parse private key")
</s> add data.WarningValidation = fmt.Sprintf("Failed to parse private key: %s", err)
return data </s> remove data, err := validateCertificates(config.TLS)
if err != nil {
log.Fatal(err)
</s> add data := validateCertificates(config.TLS)
if data.WarningValidation != "" {
log.Fatal(data.WarningValidation) </s> remove return data, fmt.Errorf("No valid keys were found")
</s> add data.WarningValidation = "No valid keys were found"
return data </s> remove return data, errorx.Decorate(err, "Failed to parse certificate")
</s> add data.WarningValidation = fmt.Sprintf("Failed to parse certificate: %s", err)
return data | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d44f68e844591efa64f5912d71c20bed366e5510 | control.go |
return data | <mask> return data, errorx.Decorate(err, "Invalid certificate or key")
<mask> }
<mask> }
<mask>
<mask> return data, nil
<mask> }
<mask>
<mask> // Attempt to parse the given private key DER block. OpenSSL 0.9.8 generates
<mask> // PKCS#1 private keys by default, while OpenSSL 1.0.0 generates PKCS#8 keys.
<mask> // OpenSSL ecparam generates SEC1 EC private keys for ECDSA. We try all three.
</s> /tls/configure and /tls/validate -- make validation failures non-fatal </s> remove return data, errorx.Decorate(err, "Failed to parse private key")
</s> add data.WarningValidation = fmt.Sprintf("Failed to parse private key: %s", err)
return data </s> remove return data, fmt.Errorf("No valid keys were found")
</s> add data.WarningValidation = "No valid keys were found"
return data </s> remove return data, errorx.Decorate(err, "Invalid certificate or key")
</s> add data.WarningValidation = fmt.Sprintf("Invalid certificate or key: %s", err)
return data </s> remove return data, errorx.Decorate(err, "Failed to parse certificate")
</s> add data.WarningValidation = fmt.Sprintf("Failed to parse certificate: %s", err)
return data </s> remove data, err := validateCertificates(config.TLS)
if err != nil {
log.Fatal(err)
</s> add data := validateCertificates(config.TLS)
if data.WarningValidation != "" {
log.Fatal(data.WarningValidation) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d44f68e844591efa64f5912d71c20bed366e5510 | control.go |
successMessage = 'disabled_filtering_toast'; | <mask> // TODO move setting keys to constants
<mask> switch (settingKey) {
<mask> case 'filtering':
<mask> if (status) {
<mask> successMessage = 'Disabled filtering';
<mask> await apiClient.disableFiltering();
<mask> } else {
<mask> successMessage = 'Enabled filtering';
<mask> await apiClient.enableFiltering();
<mask> }
</s> Convert i18n resource to key type </s> remove successMessage = 'Enabled filtering';
</s> add successMessage = 'enabled_filtering_toast'; </s> remove successMessage = 'Disabled safebrowsing';
</s> add successMessage = 'disabled_safe_browsing_toast'; </s> remove successMessage = 'Enabled safebrowsing';
</s> add successMessage = 'enabled_safe_browsing_toast'; </s> remove successMessage = 'Disabled parental control';
</s> add successMessage = 'disabled_parental_toast'; </s> remove successMessage = 'Enabled parental control';
</s> add successMessage = 'enabled_parental_toast'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/actions/index.js |
successMessage = 'enabled_filtering_toast'; | <mask> if (status) {
<mask> successMessage = 'Disabled filtering';
<mask> await apiClient.disableFiltering();
<mask> } else {
<mask> successMessage = 'Enabled filtering';
<mask> await apiClient.enableFiltering();
<mask> }
<mask> dispatch(toggleSettingStatus({ settingKey }));
<mask> break;
<mask> case 'safebrowsing':
</s> Convert i18n resource to key type </s> remove successMessage = 'Disabled filtering';
</s> add successMessage = 'disabled_filtering_toast'; </s> remove successMessage = 'Disabled safebrowsing';
</s> add successMessage = 'disabled_safe_browsing_toast'; </s> remove successMessage = 'Enabled safebrowsing';
</s> add successMessage = 'enabled_safe_browsing_toast'; </s> remove successMessage = 'Disabled parental control';
</s> add successMessage = 'disabled_parental_toast'; </s> remove successMessage = 'Enabled parental control';
</s> add successMessage = 'enabled_parental_toast'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/actions/index.js |
successMessage = 'disabled_safe_browsing_toast'; | <mask> dispatch(toggleSettingStatus({ settingKey }));
<mask> break;
<mask> case 'safebrowsing':
<mask> if (status) {
<mask> successMessage = 'Disabled safebrowsing';
<mask> await apiClient.disableSafebrowsing();
<mask> } else {
<mask> successMessage = 'Enabled safebrowsing';
<mask> await apiClient.enableSafebrowsing();
<mask> }
</s> Convert i18n resource to key type </s> remove successMessage = 'Enabled safebrowsing';
</s> add successMessage = 'enabled_safe_browsing_toast'; </s> remove successMessage = 'Enabled filtering';
</s> add successMessage = 'enabled_filtering_toast'; </s> remove successMessage = 'Disabled parental control';
</s> add successMessage = 'disabled_parental_toast'; </s> remove successMessage = 'Enabled parental control';
</s> add successMessage = 'enabled_parental_toast'; </s> remove successMessage = 'Disabled safe search';
</s> add successMessage = 'disabled_safe_search_toast'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/actions/index.js |
successMessage = 'enabled_safe_browsing_toast'; | <mask> if (status) {
<mask> successMessage = 'Disabled safebrowsing';
<mask> await apiClient.disableSafebrowsing();
<mask> } else {
<mask> successMessage = 'Enabled safebrowsing';
<mask> await apiClient.enableSafebrowsing();
<mask> }
<mask> dispatch(toggleSettingStatus({ settingKey }));
<mask> break;
<mask> case 'parental':
</s> Convert i18n resource to key type </s> remove successMessage = 'Disabled safebrowsing';
</s> add successMessage = 'disabled_safe_browsing_toast'; </s> remove successMessage = 'Disabled parental control';
</s> add successMessage = 'disabled_parental_toast'; </s> remove successMessage = 'Enabled filtering';
</s> add successMessage = 'enabled_filtering_toast'; </s> remove successMessage = 'Enabled parental control';
</s> add successMessage = 'enabled_parental_toast'; </s> remove successMessage = 'Disabled safe search';
</s> add successMessage = 'disabled_safe_search_toast'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/actions/index.js |
successMessage = 'disabled_parental_toast'; | <mask> dispatch(toggleSettingStatus({ settingKey }));
<mask> break;
<mask> case 'parental':
<mask> if (status) {
<mask> successMessage = 'Disabled parental control';
<mask> await apiClient.disableParentalControl();
<mask> } else {
<mask> successMessage = 'Enabled parental control';
<mask> await apiClient.enableParentalControl();
<mask> }
</s> Convert i18n resource to key type </s> remove successMessage = 'Enabled parental control';
</s> add successMessage = 'enabled_parental_toast'; </s> remove successMessage = 'Enabled safebrowsing';
</s> add successMessage = 'enabled_safe_browsing_toast'; </s> remove successMessage = 'Enabled filtering';
</s> add successMessage = 'enabled_filtering_toast'; </s> remove successMessage = 'Disabled safebrowsing';
</s> add successMessage = 'disabled_safe_browsing_toast'; </s> remove successMessage = 'Disabled safe search';
</s> add successMessage = 'disabled_safe_search_toast'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/actions/index.js |
successMessage = 'enabled_parental_toast'; | <mask> if (status) {
<mask> successMessage = 'Disabled parental control';
<mask> await apiClient.disableParentalControl();
<mask> } else {
<mask> successMessage = 'Enabled parental control';
<mask> await apiClient.enableParentalControl();
<mask> }
<mask> dispatch(toggleSettingStatus({ settingKey }));
<mask> break;
<mask> case 'safesearch':
</s> Convert i18n resource to key type </s> remove successMessage = 'Disabled parental control';
</s> add successMessage = 'disabled_parental_toast'; </s> remove successMessage = 'Disabled safe search';
</s> add successMessage = 'disabled_safe_search_toast'; </s> remove successMessage = 'Enabled filtering';
</s> add successMessage = 'enabled_filtering_toast'; </s> remove successMessage = 'Disabled safebrowsing';
</s> add successMessage = 'disabled_safe_browsing_toast'; </s> remove successMessage = 'Enabled safebrowsing';
</s> add successMessage = 'enabled_safe_browsing_toast'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/actions/index.js |
successMessage = 'disabled_safe_search_toast'; | <mask> dispatch(toggleSettingStatus({ settingKey }));
<mask> break;
<mask> case 'safesearch':
<mask> if (status) {
<mask> successMessage = 'Disabled safe search';
<mask> await apiClient.disableSafesearch();
<mask> } else {
<mask> successMessage = 'Enabled safe search';
<mask> await apiClient.enableSafesearch();
<mask> }
</s> Convert i18n resource to key type </s> remove successMessage = 'Enabled safe search';
</s> add successMessage = 'enabled_save_search_toast'; </s> remove successMessage = 'Enabled parental control';
</s> add successMessage = 'enabled_parental_toast'; </s> remove successMessage = 'Enabled filtering';
</s> add successMessage = 'enabled_filtering_toast'; </s> remove successMessage = 'Disabled safebrowsing';
</s> add successMessage = 'disabled_safe_browsing_toast'; </s> remove successMessage = 'Enabled safebrowsing';
</s> add successMessage = 'enabled_safe_browsing_toast'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/actions/index.js |
successMessage = 'enabled_save_search_toast'; | <mask> if (status) {
<mask> successMessage = 'Disabled safe search';
<mask> await apiClient.disableSafesearch();
<mask> } else {
<mask> successMessage = 'Enabled safe search';
<mask> await apiClient.enableSafesearch();
<mask> }
<mask> dispatch(toggleSettingStatus({ settingKey }));
<mask> break;
<mask> default:
</s> Convert i18n resource to key type </s> remove successMessage = 'Disabled safe search';
</s> add successMessage = 'disabled_safe_search_toast'; </s> remove successMessage = 'Enabled filtering';
</s> add successMessage = 'enabled_filtering_toast'; </s> remove successMessage = 'Disabled safebrowsing';
</s> add successMessage = 'disabled_safe_browsing_toast'; </s> remove successMessage = 'Enabled safebrowsing';
</s> add successMessage = 'enabled_safe_browsing_toast'; </s> remove successMessage = 'Disabled parental control';
</s> add successMessage = 'disabled_parental_toast'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/actions/index.js |
successMessage = 'disabled_protection'; | <mask> let successMessage = '';
<mask>
<mask> try {
<mask> if (status) {
<mask> successMessage = 'Disabled protection';
<mask> await apiClient.disableGlobalProtection();
<mask> } else {
<mask> successMessage = 'Enabled protection';
<mask> await apiClient.enableGlobalProtection();
<mask> }
</s> Convert i18n resource to key type </s> remove successMessage = 'Enabled protection';
</s> add successMessage = 'enabled_protection'; </s> remove successMessage = 'Enabled filtering';
</s> add successMessage = 'enabled_filtering_toast'; </s> remove successMessage = 'Disabled safebrowsing';
</s> add successMessage = 'disabled_safe_browsing_toast'; </s> remove successMessage = 'Enabled safebrowsing';
</s> add successMessage = 'enabled_safe_browsing_toast'; </s> remove successMessage = 'Enabled safe search';
</s> add successMessage = 'enabled_save_search_toast'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/actions/index.js |
successMessage = 'enabled_protection'; | <mask> if (status) {
<mask> successMessage = 'Disabled protection';
<mask> await apiClient.disableGlobalProtection();
<mask> } else {
<mask> successMessage = 'Enabled protection';
<mask> await apiClient.enableGlobalProtection();
<mask> }
<mask>
<mask> dispatch(addSuccessToast(successMessage));
<mask> dispatch(toggleProtectionSuccess());
</s> Convert i18n resource to key type </s> remove successMessage = 'Disabled protection';
</s> add successMessage = 'disabled_protection'; </s> remove successMessage = 'Enabled filtering';
</s> add successMessage = 'enabled_filtering_toast'; </s> remove successMessage = 'Disabled safebrowsing';
</s> add successMessage = 'disabled_safe_browsing_toast'; </s> remove successMessage = 'Enabled safebrowsing';
</s> add successMessage = 'enabled_safe_browsing_toast'; </s> remove successMessage = 'Enabled safe search';
</s> add successMessage = 'enabled_save_search_toast'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/actions/index.js |
successMessage = 'query_log_disabled_toast'; | <mask> let toggleMethod;
<mask> let successMessage;
<mask> if (queryLogEnabled) {
<mask> toggleMethod = apiClient.disableQueryLog.bind(apiClient);
<mask> successMessage = 'disabled';
<mask> } else {
<mask> toggleMethod = apiClient.enableQueryLog.bind(apiClient);
<mask> successMessage = 'enabled';
<mask> }
<mask> try {
</s> Convert i18n resource to key type </s> remove successMessage = 'enabled';
</s> add successMessage = 'query_log_enabled_toast'; </s> remove successMessage = 'Disabled protection';
</s> add successMessage = 'disabled_protection'; </s> remove dispatch(addSuccessToast(`Query log ${successMessage}`));
</s> add dispatch(addSuccessToast(successMessage)); </s> remove successMessage = 'Enabled protection';
</s> add successMessage = 'enabled_protection'; </s> remove successMessage = 'Enabled filtering';
</s> add successMessage = 'enabled_filtering_toast'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/actions/index.js |
successMessage = 'query_log_enabled_toast'; | <mask> toggleMethod = apiClient.disableQueryLog.bind(apiClient);
<mask> successMessage = 'disabled';
<mask> } else {
<mask> toggleMethod = apiClient.enableQueryLog.bind(apiClient);
<mask> successMessage = 'enabled';
<mask> }
<mask> try {
<mask> await toggleMethod();
<mask> dispatch(addSuccessToast(`Query log ${successMessage}`));
<mask> dispatch(toggleLogStatusSuccess());
</s> Convert i18n resource to key type </s> remove successMessage = 'disabled';
</s> add successMessage = 'query_log_disabled_toast'; </s> remove dispatch(addSuccessToast(`Query log ${successMessage}`));
</s> add dispatch(addSuccessToast(successMessage)); </s> remove successMessage = 'Disabled protection';
</s> add successMessage = 'disabled_protection'; </s> remove successMessage = 'Enabled protection';
</s> add successMessage = 'enabled_protection'; </s> remove successMessage = 'Enabled filtering';
</s> add successMessage = 'enabled_filtering_toast'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/actions/index.js |
dispatch(addSuccessToast(successMessage)); | <mask> successMessage = 'enabled';
<mask> }
<mask> try {
<mask> await toggleMethod();
<mask> dispatch(addSuccessToast(`Query log ${successMessage}`));
<mask> dispatch(toggleLogStatusSuccess());
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(toggleLogStatusFailure());
<mask> }
</s> Convert i18n resource to key type </s> remove successMessage = 'enabled';
</s> add successMessage = 'query_log_enabled_toast'; </s> remove dispatch(addSuccessToast('Updated the upstream DNS servers'));
</s> add dispatch(addSuccessToast('updated_upstream_dns_toast')); </s> remove dispatch(addSuccessToast('Updated the custom filtering rules'));
</s> add dispatch(addSuccessToast('updated_custom_filtering_toast')); </s> remove dispatch(addSuccessToast('Specified DNS servers are working correctly'));
</s> add dispatch(addSuccessToast('dns_test_ok_toast')); </s> remove successMessage = 'disabled';
</s> add successMessage = 'query_log_disabled_toast'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/actions/index.js |
dispatch(addSuccessToast('updated_custom_filtering_toast')); | <mask> const replacedLineEndings = rules
<mask> .replace(/^\n/g, '')
<mask> .replace(/\n\s*\n/g, '\n');
<mask> await apiClient.setRules(replacedLineEndings);
<mask> dispatch(addSuccessToast('Updated the custom filtering rules'));
<mask> dispatch(setRulesSuccess());
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(setRulesFailure());
<mask> }
</s> Convert i18n resource to key type </s> remove dispatch(addSuccessToast('Updated the upstream DNS servers'));
</s> add dispatch(addSuccessToast('updated_upstream_dns_toast')); </s> remove dispatch(addSuccessToast(`Query log ${successMessage}`));
</s> add dispatch(addSuccessToast(successMessage)); </s> remove dispatch(addSuccessToast('Specified DNS servers are working correctly'));
</s> add dispatch(addSuccessToast('dns_test_ok_toast')); </s> remove this.props.addSuccessToast(`${t('Rule removed from the custom filtering rules')}: ${blockingRule}`);
</s> add this.props.addSuccessToast(`${t('rule_removed_from_custom_filtering_toast')}: ${blockingRule}`); </s> remove this.props.addSuccessToast(`${t('Rule added to the custom filtering rules')}: ${unblockingRule}`);
</s> add this.props.addSuccessToast(`${t('rule_added_to_custom_filtering_toast')}: ${unblockingRule}`); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/actions/index.js |
dispatch(addSuccessToast('all_filters_up_to_date_toast')); | <mask> dispatch(refreshFiltersSuccess);
<mask>
<mask> if (refreshText.includes('OK')) {
<mask> if (refreshText.includes('OK 0')) {
<mask> dispatch(addSuccessToast('All filters are already up-to-date'));
<mask> } else {
<mask> dispatch(addSuccessToast(refreshText.replace(/OK /g, '')));
<mask> }
<mask> } else {
<mask> dispatch(addErrorToast({ error: refreshText }));
</s> Convert i18n resource to key type </s> remove this.props.addErrorToast({ error: this.props.t('No servers specified') });
</s> add this.props.addErrorToast({ error: this.props.t('no_servers_specified') }); </s> remove dispatch(addSuccessToast('Specified DNS servers are working correctly'));
</s> add dispatch(addSuccessToast('dns_test_ok_toast')); </s> remove dispatch(addErrorToast({ error: t('Server "{{key}}": could not be used, please check that you\'ve written it correctly', { key }) }));
</s> add dispatch(addErrorToast({ error: t('dns_test_not_ok_toast', { key }) })); </s> remove successMessage = 'Enabled filtering';
</s> add successMessage = 'enabled_filtering_toast'; </s> remove successMessage = 'Disabled safebrowsing';
</s> add successMessage = 'disabled_safe_browsing_toast'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/actions/index.js |
dispatch(addSuccessToast('updated_upstream_dns_toast')); | <mask> export const setUpstream = url => async (dispatch) => {
<mask> dispatch(setUpstreamRequest());
<mask> try {
<mask> await apiClient.setUpstream(url);
<mask> dispatch(addSuccessToast('Updated the upstream DNS servers'));
<mask> dispatch(setUpstreamSuccess());
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(setUpstreamFailure());
<mask> }
</s> Convert i18n resource to key type </s> remove dispatch(addSuccessToast('Updated the custom filtering rules'));
</s> add dispatch(addSuccessToast('updated_custom_filtering_toast')); </s> remove dispatch(addSuccessToast(`Query log ${successMessage}`));
</s> add dispatch(addSuccessToast(successMessage)); </s> remove dispatch(addSuccessToast('Specified DNS servers are working correctly'));
</s> add dispatch(addSuccessToast('dns_test_ok_toast')); </s> remove dispatch(addErrorToast({ error: t('Server "{{key}}": could not be used, please check that you\'ve written it correctly', { key }) }));
</s> add dispatch(addErrorToast({ error: t('dns_test_not_ok_toast', { key }) })); </s> remove successMessage = 'Disabled protection';
</s> add successMessage = 'disabled_protection'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/actions/index.js |
dispatch(addErrorToast({ error: t('dns_test_not_ok_toast', { key }) })); | <mask>
<mask> const testMessages = Object.keys(upstreamResponse).map((key) => {
<mask> const message = upstreamResponse[key];
<mask> if (message !== 'OK') {
<mask> dispatch(addErrorToast({ error: t('Server "{{key}}": could not be used, please check that you\'ve written it correctly', { key }) }));
<mask> }
<mask> return message;
<mask> });
<mask>
<mask> if (testMessages.every(message => message === 'OK')) {
</s> Convert i18n resource to key type </s> remove dispatch(addSuccessToast('Specified DNS servers are working correctly'));
</s> add dispatch(addSuccessToast('dns_test_ok_toast')); </s> remove this.props.addErrorToast({ error: this.props.t('No servers specified') });
</s> add this.props.addErrorToast({ error: this.props.t('no_servers_specified') }); </s> remove dispatch(addSuccessToast('All filters are already up-to-date'));
</s> add dispatch(addSuccessToast('all_filters_up_to_date_toast')); </s> remove filterName = 'Custom filtering rules';
</s> add filterName = 'custom_filter_rules'; </s> remove dispatch(addSuccessToast('Updated the upstream DNS servers'));
</s> add dispatch(addSuccessToast('updated_upstream_dns_toast')); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/actions/index.js |
dispatch(addSuccessToast('dns_test_ok_toast')); | <mask> return message;
<mask> });
<mask>
<mask> if (testMessages.every(message => message === 'OK')) {
<mask> dispatch(addSuccessToast('Specified DNS servers are working correctly'));
<mask> }
<mask>
<mask> dispatch(testUpstreamSuccess());
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
</s> Convert i18n resource to key type </s> remove dispatch(addErrorToast({ error: t('Server "{{key}}": could not be used, please check that you\'ve written it correctly', { key }) }));
</s> add dispatch(addErrorToast({ error: t('dns_test_not_ok_toast', { key }) })); </s> remove dispatch(addSuccessToast('Updated the upstream DNS servers'));
</s> add dispatch(addSuccessToast('updated_upstream_dns_toast')); </s> remove dispatch(addSuccessToast(`Query log ${successMessage}`));
</s> add dispatch(addSuccessToast(successMessage)); </s> remove dispatch(addSuccessToast('Updated the custom filtering rules'));
</s> add dispatch(addSuccessToast('updated_custom_filtering_toast')); </s> remove dispatch(addSuccessToast('All filters are already up-to-date'));
</s> add dispatch(addSuccessToast('all_filters_up_to_date_toast')); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/actions/index.js |
Header: <Trans>requests_count</Trans>, | <mask> </div>
<mask> );
<mask> },
<mask> }, {
<mask> Header: <Trans>Requests count</Trans>,
<mask> accessor: 'domain',
<mask> maxWidth: 190,
<mask> Cell: ({ value }) => {
<mask> const {
<mask> blockedFiltering,
</s> Convert i18n resource to key type </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, </s> remove Header: t('Domain name'),
</s> add Header: t('domain_name_table_header'), </s> remove Header: t('Time'),
</s> add Header: t('time_table_header'), </s> remove Header: this.props.t('Filter URL'),
</s> add Header: this.props.t('filter_url_table_header'), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/BlockedDomains.js |
<Card title={ t('top_blocked_domains') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> | <mask>
<mask> render() {
<mask> const { t } = this.props;
<mask> return (
<mask> <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
<mask> <ReactTable
<mask> data={map(this.props.topBlockedDomains, (value, prop) => (
<mask> { ip: prop, domain: value }
<mask> ))}
<mask> columns={this.columns}
</s> Convert i18n resource to key type </s> remove <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('stats_query_domain') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('top_clients') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title={ props.t('General statistics') } subtitle={ props.t('for the last 24 hours') } bodyType="card-table" refresh={props.refreshButton}>
</s> add <Card title={ props.t('general_statistics') } subtitle={ props.t('for_last_24_hours') } bodyType="card-table" refresh={props.refreshButton}> </s> remove noDataText={ t('No domains found') }
</s> add noDataText={ t('no_domains_found') } </s> remove title={ t('Custom filtering rules') }
subtitle={ t('Enter one rule on a line. You can use either adblock rules or hosts files syntax.') }
</s> add title={ t('custom_filter_rules') }
subtitle={ t('custom_filter_rules_hint') } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/BlockedDomains.js |
noDataText={ t('no_domains_found') } | <mask> { ip: prop, domain: value }
<mask> ))}
<mask> columns={this.columns}
<mask> showPagination={false}
<mask> noDataText={ t('No domains found') }
<mask> minRows={6}
<mask> className="-striped -highlight card-table-overflow stats__table"
<mask> />
<mask> </Card>
<mask> );
</s> Convert i18n resource to key type </s> remove noDataText={ t('No domains found') }
</s> add noDataText={ t('no_domains_found') } </s> remove noDataText={ t('No clients found') }
</s> add noDataText={ t('no_clients_found') } </s> remove <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('top_blocked_domains') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('top_clients') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('stats_query_domain') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/BlockedDomains.js |
Header: <Trans>requests_count</Trans>, | <mask> accessor: 'ip',
<mask> Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><span className="logs__text" title={value}>{value}</span></div>),
<mask> sortMethod: (a, b) => parseInt(a.replace(/\./g, ''), 10) - parseInt(b.replace(/\./g, ''), 10),
<mask> }, {
<mask> Header: <Trans>Requests count</Trans>,
<mask> accessor: 'count',
<mask> Cell: ({ value }) => {
<mask> const percent = getPercent(this.props.dnsQueries, value);
<mask> const percentColor = this.getPercentColor(percent);
<mask>
</s> Convert i18n resource to key type </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, </s> remove Header: this.props.t('Filter URL'),
</s> add Header: this.props.t('filter_url_table_header'), </s> remove Header: this.props.t('Name'),
</s> add Header: this.props.t('name_table_header'), </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, </s> remove Header: t('Domain name'),
</s> add Header: t('domain_name_table_header'), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/Clients.js |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.