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 |
|---|---|---|---|---|
if (!allValues.v4) {
return undefined;
}
| <mask> * @param allValues
<mask> */
<mask> export const validateNotInRange = (value, allValues) => {
<mask> const { range_start, range_end } = allValues.v4;
<mask>
<mask> if (range_start && validateIpv4(range_start)) {
<mask> return 'form_error_ip4_range_start_format';
<mask> }
</s> Pull request: 3824 fix DHCP empty form validation
Closes #3824
Squashed commit of the following:
commit 24d5770e2f276f710c011bf94e36702881ccbf1a
Merge: 8f539900 32294407
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Nov 24 12:21:23 2021 +0300
Merge branch 'master' into 3824-empty-values
commit 8f539900489c940c6d7068d672420a553a1da299
Merge: 4be77268 51f11d2f
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 19:06:44 2021 +0300
Merge branch 'master' into 3824-empty-values
commit 4be77268ab1b3dc99b754b8002320a615db2d99e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 23 19:04:06 2021 +0300
all: use new consts
commit 701fd9a2b82d69c6b813a4a1889c65404ac3571b
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 18:58:03 2021 +0300
client: get status on reset
commit a20734cbf26a57ec96fdb6e0f868a8656751e80a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 23 18:31:59 2021 +0300
dhcpd: fix reset defaults
commit e2cb0cb0995e7b2dd3e194c5bb9fe944cf7be8f5
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 17:33:22 2021 +0300
client: fix DHCP empty form validation </s> remove config.DHCP.Conf4.LeaseDuration = 86400
config.DHCP.Conf4.ICMPTimeout = 1000
config.DHCP.Conf6.LeaseDuration = 86400
</s> add config.DHCP.Conf4.LeaseDuration = dhcpd.DefaultDHCPLeaseTTL
config.DHCP.Conf4.ICMPTimeout = dhcpd.DefaultDHCPTimeoutICMP
config.DHCP.Conf6.LeaseDuration = dhcpd.DefaultDHCPLeaseTTL </s> remove v6conf := V6ServerConf{}
v6conf.notify = s.onNotify
</s> add v6conf := V6ServerConf{
LeaseDuration: DefaultDHCPLeaseTTL,
notify: s.onNotify,
} </s> remove s.conf = ServerConfig{}
s.conf.WorkDir = oldconf.WorkDir
s.conf.HTTPRegister = oldconf.HTTPRegister
s.conf.ConfigModified = oldconf.ConfigModified
s.conf.DBFilePath = oldconf.DBFilePath
v4conf := V4ServerConf{}
v4conf.ICMPTimeout = 1000
v4conf.notify = s.onNotify
</s> add s.conf = ServerConfig{
WorkDir: oldconf.WorkDir,
HTTPRegister: oldconf.HTTPRegister,
ConfigModified: oldconf.ConfigModified,
DBFilePath: oldconf.DBFilePath,
}
v4conf := V4ServerConf{
LeaseDuration: DefaultDHCPLeaseTTL,
ICMPTimeout: DefaultDHCPTimeoutICMP,
notify: s.onNotify,
} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/936a7057fd17809bb3c8e49ec590abd48a12c0b3 | client/src/helpers/validators.js |
"time" | <mask> "os"
<mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: 3824 fix DHCP empty form validation
Closes #3824
Squashed commit of the following:
commit 24d5770e2f276f710c011bf94e36702881ccbf1a
Merge: 8f539900 32294407
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Nov 24 12:21:23 2021 +0300
Merge branch 'master' into 3824-empty-values
commit 8f539900489c940c6d7068d672420a553a1da299
Merge: 4be77268 51f11d2f
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 19:06:44 2021 +0300
Merge branch 'master' into 3824-empty-values
commit 4be77268ab1b3dc99b754b8002320a615db2d99e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 23 19:04:06 2021 +0300
all: use new consts
commit 701fd9a2b82d69c6b813a4a1889c65404ac3571b
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 18:58:03 2021 +0300
client: get status on reset
commit a20734cbf26a57ec96fdb6e0f868a8656751e80a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 23 18:31:59 2021 +0300
dhcpd: fix reset defaults
commit e2cb0cb0995e7b2dd3e194c5bb9fe944cf7be8f5
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 17:33:22 2021 +0300
client: fix DHCP empty form validation </s> remove config.DHCP.Conf4.LeaseDuration = 86400
config.DHCP.Conf4.ICMPTimeout = 1000
config.DHCP.Conf6.LeaseDuration = 86400
</s> add config.DHCP.Conf4.LeaseDuration = dhcpd.DefaultDHCPLeaseTTL
config.DHCP.Conf4.ICMPTimeout = dhcpd.DefaultDHCPTimeoutICMP
config.DHCP.Conf6.LeaseDuration = dhcpd.DefaultDHCPLeaseTTL </s> remove v6conf := V6ServerConf{}
v6conf.notify = s.onNotify
</s> add v6conf := V6ServerConf{
LeaseDuration: DefaultDHCPLeaseTTL,
notify: s.onNotify,
} </s> remove s.conf = ServerConfig{}
s.conf.WorkDir = oldconf.WorkDir
s.conf.HTTPRegister = oldconf.HTTPRegister
s.conf.ConfigModified = oldconf.ConfigModified
s.conf.DBFilePath = oldconf.DBFilePath
v4conf := V4ServerConf{}
v4conf.ICMPTimeout = 1000
v4conf.notify = s.onNotify
</s> add s.conf = ServerConfig{
WorkDir: oldconf.WorkDir,
HTTPRegister: oldconf.HTTPRegister,
ConfigModified: oldconf.ConfigModified,
DBFilePath: oldconf.DBFilePath,
}
v4conf := V4ServerConf{
LeaseDuration: DefaultDHCPLeaseTTL,
ICMPTimeout: DefaultDHCPTimeoutICMP,
notify: s.onNotify,
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/936a7057fd17809bb3c8e49ec590abd48a12c0b3 | internal/dhcpd/http.go |
"github.com/AdguardTeam/golibs/timeutil" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> func httpError(r *http.Request, w http.ResponseWriter, code int, format string, args ...interface{}) {
<mask> text := fmt.Sprintf(format, args...)
</s> Pull request: 3824 fix DHCP empty form validation
Closes #3824
Squashed commit of the following:
commit 24d5770e2f276f710c011bf94e36702881ccbf1a
Merge: 8f539900 32294407
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Nov 24 12:21:23 2021 +0300
Merge branch 'master' into 3824-empty-values
commit 8f539900489c940c6d7068d672420a553a1da299
Merge: 4be77268 51f11d2f
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 19:06:44 2021 +0300
Merge branch 'master' into 3824-empty-values
commit 4be77268ab1b3dc99b754b8002320a615db2d99e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 23 19:04:06 2021 +0300
all: use new consts
commit 701fd9a2b82d69c6b813a4a1889c65404ac3571b
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 18:58:03 2021 +0300
client: get status on reset
commit a20734cbf26a57ec96fdb6e0f868a8656751e80a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 23 18:31:59 2021 +0300
dhcpd: fix reset defaults
commit e2cb0cb0995e7b2dd3e194c5bb9fe944cf7be8f5
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 17:33:22 2021 +0300
client: fix DHCP empty form validation </s> remove config.DHCP.Conf4.LeaseDuration = 86400
config.DHCP.Conf4.ICMPTimeout = 1000
config.DHCP.Conf6.LeaseDuration = 86400
</s> add config.DHCP.Conf4.LeaseDuration = dhcpd.DefaultDHCPLeaseTTL
config.DHCP.Conf4.ICMPTimeout = dhcpd.DefaultDHCPTimeoutICMP
config.DHCP.Conf6.LeaseDuration = dhcpd.DefaultDHCPLeaseTTL </s> remove s.conf = ServerConfig{}
s.conf.WorkDir = oldconf.WorkDir
s.conf.HTTPRegister = oldconf.HTTPRegister
s.conf.ConfigModified = oldconf.ConfigModified
s.conf.DBFilePath = oldconf.DBFilePath
v4conf := V4ServerConf{}
v4conf.ICMPTimeout = 1000
v4conf.notify = s.onNotify
</s> add s.conf = ServerConfig{
WorkDir: oldconf.WorkDir,
HTTPRegister: oldconf.HTTPRegister,
ConfigModified: oldconf.ConfigModified,
DBFilePath: oldconf.DBFilePath,
}
v4conf := V4ServerConf{
LeaseDuration: DefaultDHCPLeaseTTL,
ICMPTimeout: DefaultDHCPTimeoutICMP,
notify: s.onNotify,
} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/936a7057fd17809bb3c8e49ec590abd48a12c0b3 | internal/dhcpd/http.go |
const (
// DefaultDHCPLeaseTTL is the default time-to-live for leases.
DefaultDHCPLeaseTTL = uint32(timeutil.Day / time.Second)
// DefaultDHCPTimeoutICMP is the default timeout for waiting ICMP responses.
DefaultDHCPTimeoutICMP = 1000
)
| <mask> return
<mask> }
<mask> }
<mask>
<mask> func (s *Server) handleReset(w http.ResponseWriter, r *http.Request) {
<mask> err := s.Stop()
<mask> if err != nil {
<mask> httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
</s> Pull request: 3824 fix DHCP empty form validation
Closes #3824
Squashed commit of the following:
commit 24d5770e2f276f710c011bf94e36702881ccbf1a
Merge: 8f539900 32294407
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Nov 24 12:21:23 2021 +0300
Merge branch 'master' into 3824-empty-values
commit 8f539900489c940c6d7068d672420a553a1da299
Merge: 4be77268 51f11d2f
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 19:06:44 2021 +0300
Merge branch 'master' into 3824-empty-values
commit 4be77268ab1b3dc99b754b8002320a615db2d99e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 23 19:04:06 2021 +0300
all: use new consts
commit 701fd9a2b82d69c6b813a4a1889c65404ac3571b
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 18:58:03 2021 +0300
client: get status on reset
commit a20734cbf26a57ec96fdb6e0f868a8656751e80a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 23 18:31:59 2021 +0300
dhcpd: fix reset defaults
commit e2cb0cb0995e7b2dd3e194c5bb9fe944cf7be8f5
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 17:33:22 2021 +0300
client: fix DHCP empty form validation </s> remove s.conf = ServerConfig{}
s.conf.WorkDir = oldconf.WorkDir
s.conf.HTTPRegister = oldconf.HTTPRegister
s.conf.ConfigModified = oldconf.ConfigModified
s.conf.DBFilePath = oldconf.DBFilePath
v4conf := V4ServerConf{}
v4conf.ICMPTimeout = 1000
v4conf.notify = s.onNotify
</s> add s.conf = ServerConfig{
WorkDir: oldconf.WorkDir,
HTTPRegister: oldconf.HTTPRegister,
ConfigModified: oldconf.ConfigModified,
DBFilePath: oldconf.DBFilePath,
}
v4conf := V4ServerConf{
LeaseDuration: DefaultDHCPLeaseTTL,
ICMPTimeout: DefaultDHCPTimeoutICMP,
notify: s.onNotify,
} </s> remove config.DHCP.Conf4.LeaseDuration = 86400
config.DHCP.Conf4.ICMPTimeout = 1000
config.DHCP.Conf6.LeaseDuration = 86400
</s> add config.DHCP.Conf4.LeaseDuration = dhcpd.DefaultDHCPLeaseTTL
config.DHCP.Conf4.ICMPTimeout = dhcpd.DefaultDHCPTimeoutICMP
config.DHCP.Conf6.LeaseDuration = dhcpd.DefaultDHCPLeaseTTL | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/936a7057fd17809bb3c8e49ec590abd48a12c0b3 | internal/dhcpd/http.go |
s.conf = ServerConfig{
WorkDir: oldconf.WorkDir,
HTTPRegister: oldconf.HTTPRegister,
ConfigModified: oldconf.ConfigModified,
DBFilePath: oldconf.DBFilePath,
}
v4conf := V4ServerConf{
LeaseDuration: DefaultDHCPLeaseTTL,
ICMPTimeout: DefaultDHCPTimeoutICMP,
notify: s.onNotify,
} | <mask> log.Error("dhcp: removing db: %s", err)
<mask> }
<mask>
<mask> oldconf := s.conf
<mask> s.conf = ServerConfig{}
<mask> s.conf.WorkDir = oldconf.WorkDir
<mask> s.conf.HTTPRegister = oldconf.HTTPRegister
<mask> s.conf.ConfigModified = oldconf.ConfigModified
<mask> s.conf.DBFilePath = oldconf.DBFilePath
<mask>
<mask> v4conf := V4ServerConf{}
<mask> v4conf.ICMPTimeout = 1000
<mask> v4conf.notify = s.onNotify
<mask> s.srv4, _ = v4Create(v4conf)
<mask>
<mask> v6conf := V6ServerConf{}
<mask> v6conf.notify = s.onNotify
<mask> s.srv6, _ = v6Create(v6conf)
</s> Pull request: 3824 fix DHCP empty form validation
Closes #3824
Squashed commit of the following:
commit 24d5770e2f276f710c011bf94e36702881ccbf1a
Merge: 8f539900 32294407
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Nov 24 12:21:23 2021 +0300
Merge branch 'master' into 3824-empty-values
commit 8f539900489c940c6d7068d672420a553a1da299
Merge: 4be77268 51f11d2f
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 19:06:44 2021 +0300
Merge branch 'master' into 3824-empty-values
commit 4be77268ab1b3dc99b754b8002320a615db2d99e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 23 19:04:06 2021 +0300
all: use new consts
commit 701fd9a2b82d69c6b813a4a1889c65404ac3571b
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 18:58:03 2021 +0300
client: get status on reset
commit a20734cbf26a57ec96fdb6e0f868a8656751e80a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 23 18:31:59 2021 +0300
dhcpd: fix reset defaults
commit e2cb0cb0995e7b2dd3e194c5bb9fe944cf7be8f5
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 17:33:22 2021 +0300
client: fix DHCP empty form validation </s> remove v6conf := V6ServerConf{}
v6conf.notify = s.onNotify
</s> add v6conf := V6ServerConf{
LeaseDuration: DefaultDHCPLeaseTTL,
notify: s.onNotify,
} </s> remove config.DHCP.Conf4.LeaseDuration = 86400
config.DHCP.Conf4.ICMPTimeout = 1000
config.DHCP.Conf6.LeaseDuration = 86400
</s> add config.DHCP.Conf4.LeaseDuration = dhcpd.DefaultDHCPLeaseTTL
config.DHCP.Conf4.ICMPTimeout = dhcpd.DefaultDHCPTimeoutICMP
config.DHCP.Conf6.LeaseDuration = dhcpd.DefaultDHCPLeaseTTL | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/936a7057fd17809bb3c8e49ec590abd48a12c0b3 | internal/dhcpd/http.go |
v6conf := V6ServerConf{
LeaseDuration: DefaultDHCPLeaseTTL,
notify: s.onNotify,
} | <mask> v4conf.ICMPTimeout = 1000
<mask> v4conf.notify = s.onNotify
<mask> s.srv4, _ = v4Create(v4conf)
<mask>
<mask> v6conf := V6ServerConf{}
<mask> v6conf.notify = s.onNotify
<mask> s.srv6, _ = v6Create(v6conf)
<mask>
<mask> s.conf.ConfigModified()
<mask> }
<mask>
</s> Pull request: 3824 fix DHCP empty form validation
Closes #3824
Squashed commit of the following:
commit 24d5770e2f276f710c011bf94e36702881ccbf1a
Merge: 8f539900 32294407
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Nov 24 12:21:23 2021 +0300
Merge branch 'master' into 3824-empty-values
commit 8f539900489c940c6d7068d672420a553a1da299
Merge: 4be77268 51f11d2f
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 19:06:44 2021 +0300
Merge branch 'master' into 3824-empty-values
commit 4be77268ab1b3dc99b754b8002320a615db2d99e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 23 19:04:06 2021 +0300
all: use new consts
commit 701fd9a2b82d69c6b813a4a1889c65404ac3571b
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 18:58:03 2021 +0300
client: get status on reset
commit a20734cbf26a57ec96fdb6e0f868a8656751e80a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 23 18:31:59 2021 +0300
dhcpd: fix reset defaults
commit e2cb0cb0995e7b2dd3e194c5bb9fe944cf7be8f5
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 17:33:22 2021 +0300
client: fix DHCP empty form validation </s> remove s.conf = ServerConfig{}
s.conf.WorkDir = oldconf.WorkDir
s.conf.HTTPRegister = oldconf.HTTPRegister
s.conf.ConfigModified = oldconf.ConfigModified
s.conf.DBFilePath = oldconf.DBFilePath
v4conf := V4ServerConf{}
v4conf.ICMPTimeout = 1000
v4conf.notify = s.onNotify
</s> add s.conf = ServerConfig{
WorkDir: oldconf.WorkDir,
HTTPRegister: oldconf.HTTPRegister,
ConfigModified: oldconf.ConfigModified,
DBFilePath: oldconf.DBFilePath,
}
v4conf := V4ServerConf{
LeaseDuration: DefaultDHCPLeaseTTL,
ICMPTimeout: DefaultDHCPTimeoutICMP,
notify: s.onNotify,
} </s> remove config.DHCP.Conf4.LeaseDuration = 86400
config.DHCP.Conf4.ICMPTimeout = 1000
config.DHCP.Conf6.LeaseDuration = 86400
</s> add config.DHCP.Conf4.LeaseDuration = dhcpd.DefaultDHCPLeaseTTL
config.DHCP.Conf4.ICMPTimeout = dhcpd.DefaultDHCPTimeoutICMP
config.DHCP.Conf6.LeaseDuration = dhcpd.DefaultDHCPLeaseTTL | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/936a7057fd17809bb3c8e49ec590abd48a12c0b3 | internal/dhcpd/http.go |
config.DHCP.Conf4.LeaseDuration = dhcpd.DefaultDHCPLeaseTTL
config.DHCP.Conf4.ICMPTimeout = dhcpd.DefaultDHCPTimeoutICMP
config.DHCP.Conf6.LeaseDuration = dhcpd.DefaultDHCPLeaseTTL | <mask> config.DNS.DnsfilterConf.ParentalCacheSize = 1 * 1024 * 1024
<mask> config.DNS.DnsfilterConf.CacheTime = 30
<mask> config.Filters = defaultFilters()
<mask>
<mask> config.DHCP.Conf4.LeaseDuration = 86400
<mask> config.DHCP.Conf4.ICMPTimeout = 1000
<mask> config.DHCP.Conf6.LeaseDuration = 86400
<mask>
<mask> if ch := version.Channel(); ch == version.ChannelEdge || ch == version.ChannelDevelopment {
<mask> config.BetaBindPort = 3001
<mask> }
<mask> }
</s> Pull request: 3824 fix DHCP empty form validation
Closes #3824
Squashed commit of the following:
commit 24d5770e2f276f710c011bf94e36702881ccbf1a
Merge: 8f539900 32294407
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Nov 24 12:21:23 2021 +0300
Merge branch 'master' into 3824-empty-values
commit 8f539900489c940c6d7068d672420a553a1da299
Merge: 4be77268 51f11d2f
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 19:06:44 2021 +0300
Merge branch 'master' into 3824-empty-values
commit 4be77268ab1b3dc99b754b8002320a615db2d99e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 23 19:04:06 2021 +0300
all: use new consts
commit 701fd9a2b82d69c6b813a4a1889c65404ac3571b
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 18:58:03 2021 +0300
client: get status on reset
commit a20734cbf26a57ec96fdb6e0f868a8656751e80a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 23 18:31:59 2021 +0300
dhcpd: fix reset defaults
commit e2cb0cb0995e7b2dd3e194c5bb9fe944cf7be8f5
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 17:33:22 2021 +0300
client: fix DHCP empty form validation </s> remove s.conf = ServerConfig{}
s.conf.WorkDir = oldconf.WorkDir
s.conf.HTTPRegister = oldconf.HTTPRegister
s.conf.ConfigModified = oldconf.ConfigModified
s.conf.DBFilePath = oldconf.DBFilePath
v4conf := V4ServerConf{}
v4conf.ICMPTimeout = 1000
v4conf.notify = s.onNotify
</s> add s.conf = ServerConfig{
WorkDir: oldconf.WorkDir,
HTTPRegister: oldconf.HTTPRegister,
ConfigModified: oldconf.ConfigModified,
DBFilePath: oldconf.DBFilePath,
}
v4conf := V4ServerConf{
LeaseDuration: DefaultDHCPLeaseTTL,
ICMPTimeout: DefaultDHCPTimeoutICMP,
notify: s.onNotify,
} </s> remove v6conf := V6ServerConf{}
v6conf.notify = s.onNotify
</s> add v6conf := V6ServerConf{
LeaseDuration: DefaultDHCPLeaseTTL,
notify: s.onNotify,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/936a7057fd17809bb3c8e49ec590abd48a12c0b3 | internal/home/config.go |
// Priority: etc/hosts > DHCP > ARP > rDNS | <mask>
<mask> type clientSource uint
<mask>
<mask> const (
<mask> // Priority: etc/hosts > ARP > rDNS
<mask> ClientSourceRDNS clientSource = 0 // from rDNS
<mask> ClientSourceARP clientSource = 1 // from 'arp -a'
<mask> ClientSourceHostsFile clientSource = 2 // from /etc/hosts
<mask> )
<mask>
</s> + clients: runtime list: add clients from DHCP that have non-empty Hostname property </s> remove ClientSourceARP clientSource = 1 // from 'arp -a'
ClientSourceHostsFile clientSource = 2 // from /etc/hosts
</s> add ClientSourceDHCP clientSource = 1 // from DHCP
ClientSourceARP clientSource = 2 // from 'arp -a'
ClientSourceHostsFile clientSource = 3 // from /etc/hosts | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/93babd3e1c6a63d7434aa521d53098093d2eceda | home/clients.go |
ClientSourceDHCP clientSource = 1 // from DHCP
ClientSourceARP clientSource = 2 // from 'arp -a'
ClientSourceHostsFile clientSource = 3 // from /etc/hosts | <mask>
<mask> const (
<mask> // Priority: etc/hosts > ARP > rDNS
<mask> ClientSourceRDNS clientSource = 0 // from rDNS
<mask> ClientSourceARP clientSource = 1 // from 'arp -a'
<mask> ClientSourceHostsFile clientSource = 2 // from /etc/hosts
<mask> )
<mask>
<mask> // ClientHost information
<mask> type ClientHost struct {
<mask> Host string
</s> + clients: runtime list: add clients from DHCP that have non-empty Hostname property </s> remove // Priority: etc/hosts > ARP > rDNS
</s> add // Priority: etc/hosts > DHCP > ARP > rDNS | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/93babd3e1c6a63d7434aa521d53098093d2eceda | home/clients.go |
clients.addFromDHCP() | <mask> func (clients *clientsContainer) periodicUpdate() {
<mask> for {
<mask> clients.addFromHostsFile()
<mask> clients.addFromSystemARP()
<mask> time.Sleep(clientsUpdatePeriod)
<mask> }
<mask> }
<mask>
</s> + clients: runtime list: add clients from DHCP that have non-empty Hostname property </s> remove ClientSourceARP clientSource = 1 // from 'arp -a'
ClientSourceHostsFile clientSource = 2 // from /etc/hosts
</s> add ClientSourceDHCP clientSource = 1 // from DHCP
ClientSourceARP clientSource = 2 // from 'arp -a'
ClientSourceHostsFile clientSource = 3 // from /etc/hosts </s> remove // Priority: etc/hosts > ARP > rDNS
</s> add // Priority: etc/hosts > DHCP > ARP > rDNS | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/93babd3e1c6a63d7434aa521d53098093d2eceda | home/clients.go |
// add clients from DHCP that have non-empty Hostname property
func (clients *clientsContainer) addFromDHCP() {
leases := config.dhcpServer.Leases()
for _, l := range leases {
if len(l.Hostname) == 0 {
continue
}
config.clients.AddHost(l.IP.String(), l.Hostname, ClientSourceDHCP)
}
}
| <mask>
<mask> log.Info("Added %d client aliases from 'arp -a' command output", n)
<mask> }
<mask>
<mask> type clientHostJSON struct {
<mask> IP string `json:"ip"`
<mask> Name string `json:"name"`
<mask> Source string `json:"source"`
<mask> }
<mask>
</s> + clients: runtime list: add clients from DHCP that have non-empty Hostname property </s> remove ClientSourceARP clientSource = 1 // from 'arp -a'
ClientSourceHostsFile clientSource = 2 // from /etc/hosts
</s> add ClientSourceDHCP clientSource = 1 // from DHCP
ClientSourceARP clientSource = 2 // from 'arp -a'
ClientSourceHostsFile clientSource = 3 // from /etc/hosts </s> remove // Priority: etc/hosts > ARP > rDNS
</s> add // Priority: etc/hosts > DHCP > ARP > rDNS | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/93babd3e1c6a63d7434aa521d53098093d2eceda | home/clients.go |
case ClientSourceDHCP:
cj.Source = "DHCP" | <mask> }
<mask> cj.Source = "etc/hosts"
<mask> switch ch.Source {
<mask> case ClientSourceRDNS:
<mask> cj.Source = "rDNS"
<mask> case ClientSourceARP:
<mask> cj.Source = "ARP"
<mask> }
<mask> data.AutoClients = append(data.AutoClients, cj)
</s> + clients: runtime list: add clients from DHCP that have non-empty Hostname property </s> remove ClientSourceARP clientSource = 1 // from 'arp -a'
ClientSourceHostsFile clientSource = 2 // from /etc/hosts
</s> add ClientSourceDHCP clientSource = 1 // from DHCP
ClientSourceARP clientSource = 2 // from 'arp -a'
ClientSourceHostsFile clientSource = 3 // from /etc/hosts </s> remove // Priority: etc/hosts > ARP > rDNS
</s> add // Priority: etc/hosts > DHCP > ARP > rDNS | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/93babd3e1c6a63d7434aa521d53098093d2eceda | home/clients.go |
'dockerGo': 'adguard/golang-ubuntu:6.6' | <mask> 'name': 'AdGuard Home - Build and publish release'
<mask> # Make sure to sync any changes with the branch overrides below.
<mask> 'variables':
<mask> 'channel': 'edge'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.5'
<mask>
<mask> 'stages':
<mask> - 'Build frontend':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request 1851: upd-golang-ubuntu-2
Merge in DNS/adguard-home from upd-golang-ubuntu-2 to master
Squashed commit of the following:
commit 9fdd86a0d352cd3a046bca19d6acf0f549adfc53
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon May 22 17:36:06 2023 +0300
all: upd golang-ubuntu again </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.5'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.6' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.5'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.6' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.5'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.6' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/941eb1dd73513d76f1b8db8413f2f0309c71c4eb | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:6.6' | <mask> # Set the default release channel on the release branch to beta, as we may
<mask> # need to build a few of these.
<mask> 'variables':
<mask> 'channel': 'beta'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.5'
<mask> # release-vX.Y.Z branches are the branches from which the actual final release
<mask> # is built.
<mask> - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
<mask> # Disable integration branches for release branches.
<mask> 'branch-config':
</s> Pull request 1851: upd-golang-ubuntu-2
Merge in DNS/adguard-home from upd-golang-ubuntu-2 to master
Squashed commit of the following:
commit 9fdd86a0d352cd3a046bca19d6acf0f549adfc53
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon May 22 17:36:06 2023 +0300
all: upd golang-ubuntu again </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.5'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.6' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.5'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.6' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.5'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.6' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/941eb1dd73513d76f1b8db8413f2f0309c71c4eb | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:6.6' | <mask> # Set the default release channel on the final branch to release, as these
<mask> # are the ones that actually get released.
<mask> 'variables':
<mask> 'channel': 'release'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.5'
</s> Pull request 1851: upd-golang-ubuntu-2
Merge in DNS/adguard-home from upd-golang-ubuntu-2 to master
Squashed commit of the following:
commit 9fdd86a0d352cd3a046bca19d6acf0f549adfc53
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon May 22 17:36:06 2023 +0300
all: upd golang-ubuntu again </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.5'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.6' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.5'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.6' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.5'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.6' | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/941eb1dd73513d76f1b8db8413f2f0309c71c4eb | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:6.6' | <mask> 'project-key': 'AGH'
<mask> 'key': 'AHBRTSPECS'
<mask> 'name': 'AdGuard Home - Build and run tests'
<mask> 'variables':
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.5'
<mask>
<mask> 'stages':
<mask> - 'Tests':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request 1851: upd-golang-ubuntu-2
Merge in DNS/adguard-home from upd-golang-ubuntu-2 to master
Squashed commit of the following:
commit 9fdd86a0d352cd3a046bca19d6acf0f549adfc53
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon May 22 17:36:06 2023 +0300
all: upd golang-ubuntu again </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.5'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.6' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.5'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.6' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.5'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.6' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/941eb1dd73513d76f1b8db8413f2f0309c71c4eb | bamboo-specs/test.yaml |
s.RLock()
// Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
// This could happen after proxy server has been stopped, but its workers are not yet exited.
//
// A better approach is for proxy.Stop() to wait until all its workers exit,
// but this would require the Upstream interface to have Close() function
// (to prevent from hanging while waiting for unresponsive DNS server to respond). | <mask>
<mask> // use dnsfilter before cache -- changed settings or filters would require cache invalidation otherwise
<mask> res, err := s.filterDNSRequest(d)
<mask> s.RUnlock()
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
</s> - dnsforward: don't use dnsfilter object after it's closed </s> remove if host != origHost {
log.Debug("Rewrite: not supported: CNAME for %s is %s", origHost, host)
}
</s> add </s> remove if !protectionEnabled {
</s> add if !s.conf.ProtectionEnabled { </s> remove s.RUnlock()
</s> add </s> remove s.RLock()
protectionEnabled := s.conf.ProtectionEnabled
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/94552a30d7080c8471f7fca370a5905c6c420272 | dnsforward/dnsforward.go |
s.RUnlock() | <mask> // (to prevent from hanging while waiting for unresponsive DNS server to respond).
<mask> res, err := s.filterDNSRequest(d)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
</s> - dnsforward: don't use dnsfilter object after it's closed </s> remove if host != origHost {
log.Debug("Rewrite: not supported: CNAME for %s is %s", origHost, host)
}
</s> add </s> remove if !protectionEnabled {
</s> add if !s.conf.ProtectionEnabled { </s> remove s.RUnlock()
</s> add </s> remove s.RLock()
protectionEnabled := s.conf.ProtectionEnabled
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/94552a30d7080c8471f7fca370a5905c6c420272 | dnsforward/dnsforward.go |
<mask> func (s *Server) filterDNSRequest(d *proxy.DNSContext) (*dnsfilter.Result, error) {
<mask> var res dnsfilter.Result
<mask> req := d.Req
<mask> host := strings.TrimSuffix(req.Question[0].Name, ".")
<mask> origHost := host
<mask>
<mask> s.RLock()
<mask> protectionEnabled := s.conf.ProtectionEnabled
<mask> dnsFilter := s.dnsFilter
<mask> s.RUnlock()
</s> - dnsforward: don't use dnsfilter object after it's closed </s> remove s.RLock()
protectionEnabled := s.conf.ProtectionEnabled
</s> add </s> remove s.RUnlock()
</s> add </s> remove if !protectionEnabled {
</s> add if !s.conf.ProtectionEnabled { </s> remove if host != origHost {
log.Debug("Rewrite: not supported: CNAME for %s is %s", origHost, host)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/94552a30d7080c8471f7fca370a5905c6c420272 | dnsforward/dnsforward.go | |
<mask> req := d.Req
<mask> host := strings.TrimSuffix(req.Question[0].Name, ".")
<mask> origHost := host
<mask>
<mask> s.RLock()
<mask> protectionEnabled := s.conf.ProtectionEnabled
<mask> dnsFilter := s.dnsFilter
<mask> s.RUnlock()
<mask>
<mask> if !protectionEnabled {
<mask> return &dnsfilter.Result{}, nil
</s> - dnsforward: don't use dnsfilter object after it's closed </s> remove origHost := host
</s> add </s> remove s.RUnlock()
</s> add </s> remove if !protectionEnabled {
</s> add if !s.conf.ProtectionEnabled { </s> remove if host != origHost {
log.Debug("Rewrite: not supported: CNAME for %s is %s", origHost, host)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/94552a30d7080c8471f7fca370a5905c6c420272 | dnsforward/dnsforward.go | |
<mask>
<mask> s.RLock()
<mask> protectionEnabled := s.conf.ProtectionEnabled
<mask> dnsFilter := s.dnsFilter
<mask> s.RUnlock()
<mask>
<mask> if !protectionEnabled {
<mask> return &dnsfilter.Result{}, nil
<mask> }
<mask>
</s> - dnsforward: don't use dnsfilter object after it's closed </s> remove s.RLock()
protectionEnabled := s.conf.ProtectionEnabled
</s> add </s> remove if !protectionEnabled {
</s> add if !s.conf.ProtectionEnabled { </s> remove origHost := host
</s> add </s> remove if host != origHost {
log.Debug("Rewrite: not supported: CNAME for %s is %s", origHost, host)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/94552a30d7080c8471f7fca370a5905c6c420272 | dnsforward/dnsforward.go | |
if !s.conf.ProtectionEnabled { | <mask> protectionEnabled := s.conf.ProtectionEnabled
<mask> dnsFilter := s.dnsFilter
<mask> s.RUnlock()
<mask>
<mask> if !protectionEnabled {
<mask> return &dnsfilter.Result{}, nil
<mask> }
<mask>
<mask> if host != origHost {
<mask> log.Debug("Rewrite: not supported: CNAME for %s is %s", origHost, host)
</s> - dnsforward: don't use dnsfilter object after it's closed </s> remove if host != origHost {
log.Debug("Rewrite: not supported: CNAME for %s is %s", origHost, host)
}
</s> add </s> remove s.RUnlock()
</s> add </s> remove s.RLock()
protectionEnabled := s.conf.ProtectionEnabled
</s> add </s> remove origHost := host
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/94552a30d7080c8471f7fca370a5905c6c420272 | dnsforward/dnsforward.go |
<mask> if !protectionEnabled {
<mask> return &dnsfilter.Result{}, nil
<mask> }
<mask>
<mask> if host != origHost {
<mask> log.Debug("Rewrite: not supported: CNAME for %s is %s", origHost, host)
<mask> }
<mask>
<mask> var err error
<mask>
<mask> clientAddr := ""
<mask> if d.Addr != nil {
<mask> clientAddr, _, _ = net.SplitHostPort(d.Addr.String())
</s> - dnsforward: don't use dnsfilter object after it's closed </s> remove if !protectionEnabled {
</s> add if !s.conf.ProtectionEnabled { </s> remove s.RUnlock()
</s> add </s> remove s.RLock()
protectionEnabled := s.conf.ProtectionEnabled
</s> add </s> remove origHost := host
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/94552a30d7080c8471f7fca370a5905c6c420272 | dnsforward/dnsforward.go | |
@echo Running JS unit-tests
npm run test --prefix client
@echo Running Go unit-tests | <mask> @echo Running go linter
<mask> golangci-lint run
<mask>
<mask> test:
<mask> @echo Running unit-tests
<mask> go test -race -v -bench=. -coverprofile=coverage.txt -covermode=atomic ./...
<mask>
<mask> ci: dependencies client test
<mask>
<mask> dependencies:
</s> - (ui): improved client access check performance
This is still not ideal and if the disallowed clients list is huge
enough, the slowdown is considerable. But it's at least x10 or x100
times faster than it was.
Closes: #1920 </s> remove export const getClientInfo = (clients, ip) => {
const client = clients
.find((item) => item.ip_addrs?.find((clientIp) => clientIp === ip));
if (!client) {
return '';
}
const { name, whois_info } = client;
const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
return {
name,
whois,
};
};
export const getAutoClientInfo = (clients, ip) => {
const client = clients.find((item) => ip === item.ip);
if (!client) {
return '';
}
const { name, whois_info } = client;
const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
return {
name,
whois,
};
};
</s> add </s> remove if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
</s> add // Using ipaddr.js is quite slow so we first do a quick check
// to see if it's possible that this IP may be in the specified CIDR range
if (isIpQuickMatchCIDR(ip, listItem)) {
const parsedIp = ipaddr.parse(ip);
const isItemAnIp = ipaddr.isValid(listItem);
const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
return IP_MATCH_LIST_STATUS.EXACT;
}
if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
} </s> remove const parsedIp = ipaddr.parse(ip);
const isItemAnIp = ipaddr.isValid(listItem);
const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
</s> add if (ip === listItem.trim()) { </s> remove export const isIpMatchCidr = (parsedIp, parsedCidr) => {
</s> add const isIpMatchCidr = (parsedIp, parsedCidr) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/946bda37a3bb06d1483c1af0c3083844c9602e58 | Makefile |
<mask> netname: 'network',
<mask> descr: '',
<mask> };
<mask>
<mask> export const DNS_RECORD_TYPES = [
<mask> 'A',
<mask> 'AAAA',
<mask> 'AFSDB',
<mask> 'APL',
<mask> 'CAA',
<mask> 'CDNSKEY',
<mask> 'CDS',
<mask> 'CERT',
<mask> 'CNAME',
<mask> 'CSYNC',
<mask> 'DHCID',
<mask> 'DLV',
<mask> 'DNAME',
<mask> 'DNSKEY',
<mask> 'DS',
<mask> 'HIP',
<mask> 'IPSECKEY',
<mask> 'KEY',
<mask> 'KX',
<mask> 'LOC',
<mask> 'MX',
<mask> 'NAPTR',
<mask> 'NS',
<mask> 'NSEC',
<mask> 'NSEC3',
<mask> 'NSEC3PARAM',
<mask> 'OPENPGPKEY',
<mask> 'PTR',
<mask> 'RRSIG',
<mask> 'RP',
<mask> 'SIG',
<mask> 'SMIMEA',
<mask> 'SOA',
<mask> 'SRV',
<mask> 'SSHFP',
<mask> 'TA',
<mask> 'TKEY',
<mask> 'TLSA',
<mask> 'TSIG',
<mask> 'TXT',
<mask> 'URI',
<mask> ];
<mask>
<mask> export const DEFAULT_LOGS_FILTER = {
<mask> search: '',
<mask> response_status: '',
<mask> };
<mask>
</s> - (ui): improved client access check performance
This is still not ideal and if the disallowed clients list is huge
enough, the slowdown is considerable. But it's at least x10 or x100
times faster than it was.
Closes: #1920 </s> remove export const isValidQuestionType = (type) => type && DNS_RECORD_TYPES.includes(type.toUpperCase());
</s> add </s> remove export const getClientInfo = (clients, ip) => {
const client = clients
.find((item) => item.ip_addrs?.find((clientIp) => clientIp === ip));
if (!client) {
return '';
}
const { name, whois_info } = client;
const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
return {
name,
whois,
};
};
export const getAutoClientInfo = (clients, ip) => {
const client = clients.find((item) => ip === item.ip);
if (!client) {
return '';
}
const { name, whois_info } = client;
const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
return {
name,
whois,
};
};
</s> add </s> remove /**
* @param date {string}
* @returns {boolean}
*/
export const isToday = (date) => isSameDay(new Date(date), new Date());
</s> add </s> remove export const isIpMatchCidr = (parsedIp, parsedCidr) => {
</s> add const isIpMatchCidr = (parsedIp, parsedCidr) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/946bda37a3bb06d1483c1af0c3083844c9602e58 | client/src/helpers/constants.js | |
<mask> import subHours from 'date-fns/sub_hours';
<mask> import addHours from 'date-fns/add_hours';
<mask> import addDays from 'date-fns/add_days';
<mask> import subDays from 'date-fns/sub_days';
<mask> import isSameDay from 'date-fns/is_same_day';
<mask> import round from 'lodash/round';
<mask> import axios from 'axios';
<mask> import i18n from 'i18next';
<mask> import uniqBy from 'lodash/uniqBy';
<mask> import ipaddr from 'ipaddr.js';
</s> - (ui): improved client access check performance
This is still not ideal and if the disallowed clients list is huge
enough, the slowdown is considerable. But it's at least x10 or x100
times faster than it was.
Closes: #1920 </s> remove if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
</s> add // Using ipaddr.js is quite slow so we first do a quick check
// to see if it's possible that this IP may be in the specified CIDR range
if (isIpQuickMatchCIDR(ip, listItem)) {
const parsedIp = ipaddr.parse(ip);
const isItemAnIp = ipaddr.isValid(listItem);
const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
return IP_MATCH_LIST_STATUS.EXACT;
}
if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
} </s> remove const parsedIp = ipaddr.parse(ip);
const isItemAnIp = ipaddr.isValid(listItem);
const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
</s> add if (ip === listItem.trim()) { </s> remove export const isIpMatchCidr = (parsedIp, parsedCidr) => {
</s> add const isIpMatchCidr = (parsedIp, parsedCidr) => { </s> remove * @param cidr {array} ipaddr.js CIDR array
</s> add * @param parsedCidr {array} ipaddr.js CIDR array | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/946bda37a3bb06d1483c1af0c3083844c9602e58 | client/src/helpers/helpers.js | |
<mask> DEFAULT_DATE_FORMAT_OPTIONS,
<mask> DEFAULT_LANGUAGE,
<mask> DEFAULT_TIME_FORMAT,
<mask> DETAILED_DATE_FORMAT_OPTIONS,
<mask> DNS_RECORD_TYPES,
<mask> FILTERED,
<mask> FILTERED_STATUS,
<mask> IP_MATCH_LIST_STATUS,
<mask> STANDARD_DNS_PORT,
<mask> STANDARD_HTTPS_PORT,
</s> - (ui): improved client access check performance
This is still not ideal and if the disallowed clients list is huge
enough, the slowdown is considerable. But it's at least x10 or x100
times faster than it was.
Closes: #1920 </s> remove /**
* @param date {string}
* @returns {boolean}
*/
export const isToday = (date) => isSameDay(new Date(date), new Date());
</s> add </s> remove if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
</s> add // Using ipaddr.js is quite slow so we first do a quick check
// to see if it's possible that this IP may be in the specified CIDR range
if (isIpQuickMatchCIDR(ip, listItem)) {
const parsedIp = ipaddr.parse(ip);
const isItemAnIp = ipaddr.isValid(listItem);
const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
return IP_MATCH_LIST_STATUS.EXACT;
}
if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
} </s> remove const parsedIp = ipaddr.parse(ip);
const isItemAnIp = ipaddr.isValid(listItem);
const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
</s> add if (ip === listItem.trim()) { </s> remove export const isIpMatchCidr = (parsedIp, parsedCidr) => {
</s> add const isIpMatchCidr = (parsedIp, parsedCidr) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/946bda37a3bb06d1483c1af0c3083844c9602e58 | client/src/helpers/helpers.js | |
* @param options {string} | <mask>
<mask> /**
<mask> * @param time {string} The time to format
<mask> * @returns {string} Returns the time in the format HH:mm:ss
<mask> */
<mask> export const formatTime = (time, options = DEFAULT_TIME_FORMAT) => {
<mask> const parsedTime = dateParse(time);
<mask> return dateFormat(parsedTime, options);
</s> - (ui): improved client access check performance
This is still not ideal and if the disallowed clients list is huge
enough, the slowdown is considerable. But it's at least x10 or x100
times faster than it was.
Closes: #1920 </s> remove /**
* @param date {string}
* @returns {boolean}
*/
export const isToday = (date) => isSameDay(new Date(date), new Date());
</s> add </s> remove * @param cidr {array} ipaddr.js CIDR array
</s> add * @param parsedCidr {array} ipaddr.js CIDR array </s> remove export const isIpMatchCidr = (parsedIp, parsedCidr) => {
</s> add const isIpMatchCidr = (parsedIp, parsedCidr) => { </s> remove if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
</s> add // Using ipaddr.js is quite slow so we first do a quick check
// to see if it's possible that this IP may be in the specified CIDR range
if (isIpQuickMatchCIDR(ip, listItem)) {
const parsedIp = ipaddr.parse(ip);
const isItemAnIp = ipaddr.isValid(listItem);
const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
return IP_MATCH_LIST_STATUS.EXACT;
}
if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
} </s> remove export const getClientInfo = (clients, ip) => {
const client = clients
.find((item) => item.ip_addrs?.find((clientIp) => clientIp === ip));
if (!client) {
return '';
}
const { name, whois_info } = client;
const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
return {
name,
whois,
};
};
export const getAutoClientInfo = (clients, ip) => {
const client = clients.find((item) => ip === item.ip);
if (!client) {
return '';
}
const { name, whois_info } = client;
const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
return {
name,
whois,
};
};
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/946bda37a3bb06d1483c1af0c3083844c9602e58 | client/src/helpers/helpers.js |
<mask> export const formatDetailedDateTime = (dateTime) => formatDateTime(
<mask> dateTime, DETAILED_DATE_FORMAT_OPTIONS,
<mask> );
<mask>
<mask> /**
<mask> * @param date {string}
<mask> * @returns {boolean}
<mask> */
<mask> export const isToday = (date) => isSameDay(new Date(date), new Date());
<mask>
<mask> export const normalizeLogs = (logs) => logs.map((log) => {
<mask> const {
<mask> answer,
<mask> answer_dnssec,
<mask> client,
</s> - (ui): improved client access check performance
This is still not ideal and if the disallowed clients list is huge
enough, the slowdown is considerable. But it's at least x10 or x100
times faster than it was.
Closes: #1920 </s> remove * @param cidr {array} ipaddr.js CIDR array
</s> add * @param parsedCidr {array} ipaddr.js CIDR array </s> remove export const isIpMatchCidr = (parsedIp, parsedCidr) => {
</s> add const isIpMatchCidr = (parsedIp, parsedCidr) => { </s> remove export const isValidQuestionType = (type) => type && DNS_RECORD_TYPES.includes(type.toUpperCase());
</s> add </s> remove export const getClientInfo = (clients, ip) => {
const client = clients
.find((item) => item.ip_addrs?.find((clientIp) => clientIp === ip));
if (!client) {
return '';
}
const { name, whois_info } = client;
const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
return {
name,
whois,
};
};
export const getAutoClientInfo = (clients, ip) => {
const client = clients.find((item) => ip === item.ip);
if (!client) {
return '';
}
const { name, whois_info } = client;
const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
return {
name,
whois,
};
};
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/946bda37a3bb06d1483c1af0c3083844c9602e58 | client/src/helpers/helpers.js | |
<mask> configured: {},
<mask> },
<mask> );
<mask>
<mask> export const getClientInfo = (clients, ip) => {
<mask> const client = clients
<mask> .find((item) => item.ip_addrs?.find((clientIp) => clientIp === ip));
<mask>
<mask> if (!client) {
<mask> return '';
<mask> }
<mask>
<mask> const { name, whois_info } = client;
<mask> const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
<mask>
<mask> return {
<mask> name,
<mask> whois,
<mask> };
<mask> };
<mask>
<mask> export const getAutoClientInfo = (clients, ip) => {
<mask> const client = clients.find((item) => ip === item.ip);
<mask>
<mask> if (!client) {
<mask> return '';
<mask> }
<mask>
<mask> const { name, whois_info } = client;
<mask> const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
<mask>
<mask> return {
<mask> name,
<mask> whois,
<mask> };
<mask> };
<mask>
<mask> export const sortClients = (clients) => {
<mask> const compare = (a, b) => {
<mask> const nameA = a.name.toUpperCase();
<mask> const nameB = b.name.toUpperCase();
<mask>
</s> - (ui): improved client access check performance
This is still not ideal and if the disallowed clients list is huge
enough, the slowdown is considerable. But it's at least x10 or x100
times faster than it was.
Closes: #1920 </s> remove const parsedIp = ipaddr.parse(ip);
const isItemAnIp = ipaddr.isValid(listItem);
const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
</s> add if (ip === listItem.trim()) { </s> remove if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
</s> add // Using ipaddr.js is quite slow so we first do a quick check
// to see if it's possible that this IP may be in the specified CIDR range
if (isIpQuickMatchCIDR(ip, listItem)) {
const parsedIp = ipaddr.parse(ip);
const isItemAnIp = ipaddr.isValid(listItem);
const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
return IP_MATCH_LIST_STATUS.EXACT;
}
if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
} </s> remove export const isValidQuestionType = (type) => type && DNS_RECORD_TYPES.includes(type.toUpperCase());
</s> add </s> remove export const isIpMatchCidr = (parsedIp, parsedCidr) => {
</s> add const isIpMatchCidr = (parsedIp, parsedCidr) => { </s> remove /**
* @param date {string}
* @returns {boolean}
*/
export const isToday = (date) => isSameDay(new Date(date), new Date());
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/946bda37a3bb06d1483c1af0c3083844c9602e58 | client/src/helpers/helpers.js | |
<mask>
<mask> return whois;
<mask> };
<mask>
<mask> export const isValidQuestionType = (type) => type && DNS_RECORD_TYPES.includes(type.toUpperCase());
<mask>
<mask> export const getPathWithQueryString = (path, params) => {
<mask> const searchParams = new URLSearchParams(params);
<mask>
<mask> return `${path}?${searchParams.toString()}`;
<mask> };
</s> - (ui): improved client access check performance
This is still not ideal and if the disallowed clients list is huge
enough, the slowdown is considerable. But it's at least x10 or x100
times faster than it was.
Closes: #1920 </s> remove export const getClientInfo = (clients, ip) => {
const client = clients
.find((item) => item.ip_addrs?.find((clientIp) => clientIp === ip));
if (!client) {
return '';
}
const { name, whois_info } = client;
const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
return {
name,
whois,
};
};
export const getAutoClientInfo = (clients, ip) => {
const client = clients.find((item) => ip === item.ip);
if (!client) {
return '';
}
const { name, whois_info } = client;
const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
return {
name,
whois,
};
};
</s> add </s> remove /**
* @param date {string}
* @returns {boolean}
*/
export const isToday = (date) => isSameDay(new Date(date), new Date());
</s> add </s> remove export const isIpMatchCidr = (parsedIp, parsedCidr) => {
</s> add const isIpMatchCidr = (parsedIp, parsedCidr) => { </s> remove const parsedIp = ipaddr.parse(ip);
const isItemAnIp = ipaddr.isValid(listItem);
const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
</s> add if (ip === listItem.trim()) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/946bda37a3bb06d1483c1af0c3083844c9602e58 | client/src/helpers/helpers.js | |
* @param parsedCidr {array} ipaddr.js CIDR array | <mask> }, {});
<mask>
<mask> /**
<mask> * @param parsedIp {object} ipaddr.js IPv4 or IPv6 object
<mask> * @param cidr {array} ipaddr.js CIDR array
<mask> * @returns {boolean}
<mask> */
<mask> export const isIpMatchCidr = (parsedIp, parsedCidr) => {
<mask> try {
<mask> const cidrIpVersion = parsedCidr[0].kind();
</s> - (ui): improved client access check performance
This is still not ideal and if the disallowed clients list is huge
enough, the slowdown is considerable. But it's at least x10 or x100
times faster than it was.
Closes: #1920 </s> remove export const isIpMatchCidr = (parsedIp, parsedCidr) => {
</s> add const isIpMatchCidr = (parsedIp, parsedCidr) => { </s> remove /**
* @param date {string}
* @returns {boolean}
*/
export const isToday = (date) => isSameDay(new Date(date), new Date());
</s> add </s> remove export const getClientInfo = (clients, ip) => {
const client = clients
.find((item) => item.ip_addrs?.find((clientIp) => clientIp === ip));
if (!client) {
return '';
}
const { name, whois_info } = client;
const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
return {
name,
whois,
};
};
export const getAutoClientInfo = (clients, ip) => {
const client = clients.find((item) => ip === item.ip);
if (!client) {
return '';
}
const { name, whois_info } = client;
const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
return {
name,
whois,
};
};
</s> add </s> remove if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
</s> add // Using ipaddr.js is quite slow so we first do a quick check
// to see if it's possible that this IP may be in the specified CIDR range
if (isIpQuickMatchCIDR(ip, listItem)) {
const parsedIp = ipaddr.parse(ip);
const isItemAnIp = ipaddr.isValid(listItem);
const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
return IP_MATCH_LIST_STATUS.EXACT;
}
if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/946bda37a3bb06d1483c1af0c3083844c9602e58 | client/src/helpers/helpers.js |
const isIpMatchCidr = (parsedIp, parsedCidr) => { | <mask> * @param parsedIp {object} ipaddr.js IPv4 or IPv6 object
<mask> * @param cidr {array} ipaddr.js CIDR array
<mask> * @returns {boolean}
<mask> */
<mask> export const isIpMatchCidr = (parsedIp, parsedCidr) => {
<mask> try {
<mask> const cidrIpVersion = parsedCidr[0].kind();
<mask> const ipVersion = parsedIp.kind();
<mask>
<mask> return ipVersion === cidrIpVersion && parsedIp.match(parsedCidr);
</s> - (ui): improved client access check performance
This is still not ideal and if the disallowed clients list is huge
enough, the slowdown is considerable. But it's at least x10 or x100
times faster than it was.
Closes: #1920 </s> remove * @param cidr {array} ipaddr.js CIDR array
</s> add * @param parsedCidr {array} ipaddr.js CIDR array </s> remove /**
* @param date {string}
* @returns {boolean}
*/
export const isToday = (date) => isSameDay(new Date(date), new Date());
</s> add </s> remove const parsedIp = ipaddr.parse(ip);
const isItemAnIp = ipaddr.isValid(listItem);
const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
</s> add if (ip === listItem.trim()) { </s> remove if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
</s> add // Using ipaddr.js is quite slow so we first do a quick check
// to see if it's possible that this IP may be in the specified CIDR range
if (isIpQuickMatchCIDR(ip, listItem)) {
const parsedIp = ipaddr.parse(ip);
const isItemAnIp = ipaddr.isValid(listItem);
const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
return IP_MATCH_LIST_STATUS.EXACT;
}
if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/946bda37a3bb06d1483c1af0c3083844c9602e58 | client/src/helpers/helpers.js |
if (ip === listItem.trim()) { | <mask> try {
<mask> for (let i = 0; i < listArr.length; i += 1) {
<mask> const listItem = listArr[i];
<mask>
<mask> const parsedIp = ipaddr.parse(ip);
<mask> const isItemAnIp = ipaddr.isValid(listItem);
<mask> const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
<mask>
<mask> if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
<mask> return IP_MATCH_LIST_STATUS.EXACT;
<mask> }
<mask>
<mask> if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
<mask> return IP_MATCH_LIST_STATUS.CIDR;
</s> - (ui): improved client access check performance
This is still not ideal and if the disallowed clients list is huge
enough, the slowdown is considerable. But it's at least x10 or x100
times faster than it was.
Closes: #1920 </s> remove if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
</s> add // Using ipaddr.js is quite slow so we first do a quick check
// to see if it's possible that this IP may be in the specified CIDR range
if (isIpQuickMatchCIDR(ip, listItem)) {
const parsedIp = ipaddr.parse(ip);
const isItemAnIp = ipaddr.isValid(listItem);
const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
return IP_MATCH_LIST_STATUS.EXACT;
}
if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
} </s> remove export const getClientInfo = (clients, ip) => {
const client = clients
.find((item) => item.ip_addrs?.find((clientIp) => clientIp === ip));
if (!client) {
return '';
}
const { name, whois_info } = client;
const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
return {
name,
whois,
};
};
export const getAutoClientInfo = (clients, ip) => {
const client = clients.find((item) => ip === item.ip);
if (!client) {
return '';
}
const { name, whois_info } = client;
const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
return {
name,
whois,
};
};
</s> add </s> remove export const isIpMatchCidr = (parsedIp, parsedCidr) => {
</s> add const isIpMatchCidr = (parsedIp, parsedCidr) => { </s> remove export const isValidQuestionType = (type) => type && DNS_RECORD_TYPES.includes(type.toUpperCase());
</s> add </s> remove * @param cidr {array} ipaddr.js CIDR array
</s> add * @param parsedCidr {array} ipaddr.js CIDR array | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/946bda37a3bb06d1483c1af0c3083844c9602e58 | client/src/helpers/helpers.js |
// Using ipaddr.js is quite slow so we first do a quick check
// to see if it's possible that this IP may be in the specified CIDR range
if (isIpQuickMatchCIDR(ip, listItem)) {
const parsedIp = ipaddr.parse(ip);
const isItemAnIp = ipaddr.isValid(listItem);
const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
return IP_MATCH_LIST_STATUS.EXACT;
}
if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
} | <mask> if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
<mask> return IP_MATCH_LIST_STATUS.EXACT;
<mask> }
<mask>
<mask> if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
<mask> return IP_MATCH_LIST_STATUS.CIDR;
<mask> }
<mask> }
<mask> return IP_MATCH_LIST_STATUS.NOT_FOUND;
<mask> } catch (e) {
<mask> return IP_MATCH_LIST_STATUS.NOT_FOUND;
</s> - (ui): improved client access check performance
This is still not ideal and if the disallowed clients list is huge
enough, the slowdown is considerable. But it's at least x10 or x100
times faster than it was.
Closes: #1920 </s> remove const parsedIp = ipaddr.parse(ip);
const isItemAnIp = ipaddr.isValid(listItem);
const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
</s> add if (ip === listItem.trim()) { </s> remove export const getClientInfo = (clients, ip) => {
const client = clients
.find((item) => item.ip_addrs?.find((clientIp) => clientIp === ip));
if (!client) {
return '';
}
const { name, whois_info } = client;
const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
return {
name,
whois,
};
};
export const getAutoClientInfo = (clients, ip) => {
const client = clients.find((item) => ip === item.ip);
if (!client) {
return '';
}
const { name, whois_info } = client;
const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
return {
name,
whois,
};
};
</s> add </s> remove export const isValidQuestionType = (type) => type && DNS_RECORD_TYPES.includes(type.toUpperCase());
</s> add </s> remove export const isIpMatchCidr = (parsedIp, parsedCidr) => {
</s> add const isIpMatchCidr = (parsedIp, parsedCidr) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/946bda37a3bb06d1483c1af0c3083844c9602e58 | client/src/helpers/helpers.js |
console.error(e); | <mask> return IP_MATCH_LIST_STATUS.NOT_FOUND;
<mask> } catch (e) {
<mask> return IP_MATCH_LIST_STATUS.NOT_FOUND;
<mask> }
<mask> };
<mask>
<mask>
<mask> /**
</s> - (ui): improved client access check performance
This is still not ideal and if the disallowed clients list is huge
enough, the slowdown is considerable. But it's at least x10 or x100
times faster than it was.
Closes: #1920 </s> remove if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
</s> add // Using ipaddr.js is quite slow so we first do a quick check
// to see if it's possible that this IP may be in the specified CIDR range
if (isIpQuickMatchCIDR(ip, listItem)) {
const parsedIp = ipaddr.parse(ip);
const isItemAnIp = ipaddr.isValid(listItem);
const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
return IP_MATCH_LIST_STATUS.EXACT;
}
if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
return IP_MATCH_LIST_STATUS.CIDR;
} </s> remove export const getClientInfo = (clients, ip) => {
const client = clients
.find((item) => item.ip_addrs?.find((clientIp) => clientIp === ip));
if (!client) {
return '';
}
const { name, whois_info } = client;
const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
return {
name,
whois,
};
};
export const getAutoClientInfo = (clients, ip) => {
const client = clients.find((item) => ip === item.ip);
if (!client) {
return '';
}
const { name, whois_info } = client;
const whois = Object.keys(whois_info).length > 0 ? whois_info : '';
return {
name,
whois,
};
};
</s> add </s> remove const parsedIp = ipaddr.parse(ip);
const isItemAnIp = ipaddr.isValid(listItem);
const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
</s> add if (ip === listItem.trim()) { </s> remove export const isValidQuestionType = (type) => type && DNS_RECORD_TYPES.includes(type.toUpperCase());
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/946bda37a3bb06d1483c1af0c3083844c9602e58 | client/src/helpers/helpers.js |
'GO_VERSION': '1.18.7' | <mask> 'name': 'build'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.18.6'
<mask> 'NODE_VERSION': '14'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'branches':
</s> Pull request: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 3dffc8b5d8951216c1e695472199fc9e9d85e1c7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Oct 7 14:30:23 2022 +0300
all: fix chlog
commit cca70bd6cd27d04cd7cebe14a4e4bef112ce2bcb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Oct 7 14:07:39 2022 +0300
all: upd go </s> remove 'GO_VERSION': '1.18.6'
</s> add 'GO_VERSION': '1.18.7' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/960a7a75ed44637a2fd936e3b4df87e13bcb0ba0 | .github/workflows/build.yml |
'GO_VERSION': '1.18.7' | <mask> 'name': 'lint'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.18.6'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'tags':
<mask> - 'v*'
</s> Pull request: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 3dffc8b5d8951216c1e695472199fc9e9d85e1c7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Oct 7 14:30:23 2022 +0300
all: fix chlog
commit cca70bd6cd27d04cd7cebe14a4e4bef112ce2bcb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Oct 7 14:07:39 2022 +0300
all: upd go </s> remove 'GO_VERSION': '1.18.6'
</s> add 'GO_VERSION': '1.18.7' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/960a7a75ed44637a2fd936e3b4df87e13bcb0ba0 | .github/workflows/lint.yml |
'dockerGo': 'adguard/golang-ubuntu:5.2' | <mask> 'name': 'AdGuard Home - Build and publish release'
<mask> # Make sure to sync any changes with the branch overrides below.
<mask> 'variables':
<mask> 'channel': 'edge'
<mask> 'dockerGo': 'adguard/golang-ubuntu:5.1'
<mask>
<mask> 'stages':
<mask> - 'Build frontend':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 3dffc8b5d8951216c1e695472199fc9e9d85e1c7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Oct 7 14:30:23 2022 +0300
all: fix chlog
commit cca70bd6cd27d04cd7cebe14a4e4bef112ce2bcb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Oct 7 14:07:39 2022 +0300
all: upd go </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' </s> remove 'GO_VERSION': '1.18.6'
</s> add 'GO_VERSION': '1.18.7' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' </s> remove 'GO_VERSION': '1.18.6'
</s> add 'GO_VERSION': '1.18.7' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/960a7a75ed44637a2fd936e3b4df87e13bcb0ba0 | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:5.2' | <mask> # Set the default release channel on the release branch to beta, as we may
<mask> # need to build a few of these.
<mask> 'variables':
<mask> 'channel': 'beta'
<mask> 'dockerGo': 'adguard/golang-ubuntu:5.1'
<mask> # release-vX.Y.Z branches are the branches from which the actual final release
<mask> # is built.
<mask> - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
<mask> # Disable integration branches for release branches.
<mask> 'branch-config':
</s> Pull request: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 3dffc8b5d8951216c1e695472199fc9e9d85e1c7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Oct 7 14:30:23 2022 +0300
all: fix chlog
commit cca70bd6cd27d04cd7cebe14a4e4bef112ce2bcb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Oct 7 14:07:39 2022 +0300
all: upd go </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' </s> remove 'GO_VERSION': '1.18.6'
</s> add 'GO_VERSION': '1.18.7' </s> remove 'GO_VERSION': '1.18.6'
</s> add 'GO_VERSION': '1.18.7' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/960a7a75ed44637a2fd936e3b4df87e13bcb0ba0 | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:5.2' | <mask> # Set the default release channel on the final branch to release, as these
<mask> # are the ones that actually get released.
<mask> 'variables':
<mask> 'channel': 'release'
<mask> 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> Pull request: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 3dffc8b5d8951216c1e695472199fc9e9d85e1c7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Oct 7 14:30:23 2022 +0300
all: fix chlog
commit cca70bd6cd27d04cd7cebe14a4e4bef112ce2bcb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Oct 7 14:07:39 2022 +0300
all: upd go </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' </s> remove 'GO_VERSION': '1.18.6'
</s> add 'GO_VERSION': '1.18.7' </s> remove 'GO_VERSION': '1.18.6'
</s> add 'GO_VERSION': '1.18.7' | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/960a7a75ed44637a2fd936e3b4df87e13bcb0ba0 | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:5.2' | <mask> 'project-key': 'AGH'
<mask> 'key': 'AHBRTSPECS'
<mask> 'name': 'AdGuard Home - Build and run tests'
<mask> 'variables':
<mask> 'dockerGo': 'adguard/golang-ubuntu:5.1'
<mask>
<mask> 'stages':
<mask> - 'Tests':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 3dffc8b5d8951216c1e695472199fc9e9d85e1c7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Oct 7 14:30:23 2022 +0300
all: fix chlog
commit cca70bd6cd27d04cd7cebe14a4e4bef112ce2bcb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Oct 7 14:07:39 2022 +0300
all: upd go </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' </s> remove 'GO_VERSION': '1.18.6'
</s> add 'GO_VERSION': '1.18.7' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.2' </s> remove 'GO_VERSION': '1.18.6'
</s> add 'GO_VERSION': '1.18.7' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/960a7a75ed44637a2fd936e3b4df87e13bcb0ba0 | bamboo-specs/test.yaml |
// Check DNS rewrites first, because the API there is a bit awkward. | <mask> }
<mask>
<mask> dnsres, ok := d.filteringEngine.MatchRequest(ureq)
<mask>
<mask> // Check DNS rewrites first, because the API there is a bit
<mask> // awkward.
<mask> if dnsr := dnsres.DNSRewrites(); len(dnsr) > 0 {
<mask> res = d.processDNSRewrites(dnsr)
<mask> if res.Reason == RewrittenRule && res.CanonName == host {
<mask> // A rewrite of a host to itself. Go on and
<mask> // try matching other things.
</s> Pull request: dnsfilter: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c153f08bcf5ade4d0fb9b59d2a0e6a21598c4127
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 21:03:51 2021 +0300
dnsfilter: imp code, decr cyclo </s> remove // A rewrite of a host to itself. Go on and
// try matching other things.
</s> add // A rewrite of a host to itself. Go on and try
// matching other things. </s> remove if dnsres.NetworkRule != nil {
log.Debug("Filtering: found rule for host %q: %q list_id: %d",
host, dnsres.NetworkRule.Text(), dnsres.NetworkRule.GetFilterListID())
reason := FilteredBlockList
if dnsres.NetworkRule.Whitelist {
reason = NotFilteredAllowList
}
return makeResult(dnsres.NetworkRule, reason), nil
}
if qtype == dns.TypeA && dnsres.HostRulesV4 != nil {
rule := dnsres.HostRulesV4[0] // note that we process only 1 matched rule
log.Debug("Filtering: found rule for host %q: %q list_id: %d",
host, rule.Text(), rule.GetFilterListID())
res = makeResult(rule, FilteredBlockList)
res.Rules[0].IP = rule.IP.To4()
return res, nil
}
if qtype == dns.TypeAAAA && dnsres.HostRulesV6 != nil {
rule := dnsres.HostRulesV6[0] // note that we process only 1 matched rule
log.Debug("Filtering: found rule for host %q: %q list_id: %d",
host, rule.Text(), rule.GetFilterListID())
res = makeResult(rule, FilteredBlockList)
res.Rules[0].IP = rule.IP
return res, nil
</s> add res = d.matchHostProcessDNSResult(qtype, dnsres)
if len(res.Rules) > 0 {
r := res.Rules[0]
log.Debug(
"filtering: found rule %q for host %q, filter list id: %d",
r.Text,
host,
r.FilterListID,
) </s> remove if dnsres.HostRulesV4 != nil || dnsres.HostRulesV6 != nil {
// Question Type doesn't match the host rules
// Return the first matched host rule, but without an IP address
var rule rules.Rule
if dnsres.HostRulesV4 != nil {
rule = dnsres.HostRulesV4[0]
} else if dnsres.HostRulesV6 != nil {
rule = dnsres.HostRulesV6[0]
}
log.Debug("Filtering: found rule for host %q: %q list_id: %d",
host, rule.Text(), rule.GetFilterListID())
res = makeResult(rule, FilteredBlockList)
res.Rules[0].IP = net.IP{}
return res, nil
}
return Result{}, nil
</s> add return res, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9631eff60862d88667eaa853ebfa3bce1e1cdd8e | internal/dnsfilter/dnsfilter.go |
// A rewrite of a host to itself. Go on and try
// matching other things. | <mask> // awkward.
<mask> if dnsr := dnsres.DNSRewrites(); len(dnsr) > 0 {
<mask> res = d.processDNSRewrites(dnsr)
<mask> if res.Reason == RewrittenRule && res.CanonName == host {
<mask> // A rewrite of a host to itself. Go on and
<mask> // try matching other things.
<mask> } else {
<mask> return res, nil
<mask> }
<mask> } else if !ok {
<mask> return Result{}, nil
</s> Pull request: dnsfilter: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c153f08bcf5ade4d0fb9b59d2a0e6a21598c4127
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 21:03:51 2021 +0300
dnsfilter: imp code, decr cyclo </s> remove if dnsres.NetworkRule != nil {
log.Debug("Filtering: found rule for host %q: %q list_id: %d",
host, dnsres.NetworkRule.Text(), dnsres.NetworkRule.GetFilterListID())
reason := FilteredBlockList
if dnsres.NetworkRule.Whitelist {
reason = NotFilteredAllowList
}
return makeResult(dnsres.NetworkRule, reason), nil
}
if qtype == dns.TypeA && dnsres.HostRulesV4 != nil {
rule := dnsres.HostRulesV4[0] // note that we process only 1 matched rule
log.Debug("Filtering: found rule for host %q: %q list_id: %d",
host, rule.Text(), rule.GetFilterListID())
res = makeResult(rule, FilteredBlockList)
res.Rules[0].IP = rule.IP.To4()
return res, nil
}
if qtype == dns.TypeAAAA && dnsres.HostRulesV6 != nil {
rule := dnsres.HostRulesV6[0] // note that we process only 1 matched rule
log.Debug("Filtering: found rule for host %q: %q list_id: %d",
host, rule.Text(), rule.GetFilterListID())
res = makeResult(rule, FilteredBlockList)
res.Rules[0].IP = rule.IP
return res, nil
</s> add res = d.matchHostProcessDNSResult(qtype, dnsres)
if len(res.Rules) > 0 {
r := res.Rules[0]
log.Debug(
"filtering: found rule %q for host %q, filter list id: %d",
r.Text,
host,
r.FilterListID,
) </s> remove if dnsres.HostRulesV4 != nil || dnsres.HostRulesV6 != nil {
// Question Type doesn't match the host rules
// Return the first matched host rule, but without an IP address
var rule rules.Rule
if dnsres.HostRulesV4 != nil {
rule = dnsres.HostRulesV4[0]
} else if dnsres.HostRulesV6 != nil {
rule = dnsres.HostRulesV6[0]
}
log.Debug("Filtering: found rule for host %q: %q list_id: %d",
host, rule.Text(), rule.GetFilterListID())
res = makeResult(rule, FilteredBlockList)
res.Rules[0].IP = net.IP{}
return res, nil
}
return Result{}, nil
</s> add return res, nil </s> remove // Check DNS rewrites first, because the API there is a bit
// awkward.
</s> add // Check DNS rewrites first, because the API there is a bit awkward. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9631eff60862d88667eaa853ebfa3bce1e1cdd8e | internal/dnsfilter/dnsfilter.go |
res = d.matchHostProcessDNSResult(qtype, dnsres)
if len(res.Rules) > 0 {
r := res.Rules[0]
log.Debug(
"filtering: found rule %q for host %q, filter list id: %d",
r.Text,
host,
r.FilterListID,
) | <mask> } else if !ok {
<mask> return Result{}, nil
<mask> }
<mask>
<mask> if dnsres.NetworkRule != nil {
<mask> log.Debug("Filtering: found rule for host %q: %q list_id: %d",
<mask> host, dnsres.NetworkRule.Text(), dnsres.NetworkRule.GetFilterListID())
<mask> reason := FilteredBlockList
<mask> if dnsres.NetworkRule.Whitelist {
<mask> reason = NotFilteredAllowList
<mask> }
<mask>
<mask> return makeResult(dnsres.NetworkRule, reason), nil
<mask> }
<mask>
<mask> if qtype == dns.TypeA && dnsres.HostRulesV4 != nil {
<mask> rule := dnsres.HostRulesV4[0] // note that we process only 1 matched rule
<mask> log.Debug("Filtering: found rule for host %q: %q list_id: %d",
<mask> host, rule.Text(), rule.GetFilterListID())
<mask> res = makeResult(rule, FilteredBlockList)
<mask> res.Rules[0].IP = rule.IP.To4()
<mask>
<mask> return res, nil
<mask> }
<mask>
<mask> if qtype == dns.TypeAAAA && dnsres.HostRulesV6 != nil {
<mask> rule := dnsres.HostRulesV6[0] // note that we process only 1 matched rule
<mask> log.Debug("Filtering: found rule for host %q: %q list_id: %d",
<mask> host, rule.Text(), rule.GetFilterListID())
<mask> res = makeResult(rule, FilteredBlockList)
<mask> res.Rules[0].IP = rule.IP
<mask>
<mask> return res, nil
<mask> }
<mask>
<mask> if dnsres.HostRulesV4 != nil || dnsres.HostRulesV6 != nil {
<mask> // Question Type doesn't match the host rules
<mask> // Return the first matched host rule, but without an IP address
</s> Pull request: dnsfilter: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c153f08bcf5ade4d0fb9b59d2a0e6a21598c4127
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 21:03:51 2021 +0300
dnsfilter: imp code, decr cyclo </s> remove if dnsres.HostRulesV4 != nil || dnsres.HostRulesV6 != nil {
// Question Type doesn't match the host rules
// Return the first matched host rule, but without an IP address
var rule rules.Rule
if dnsres.HostRulesV4 != nil {
rule = dnsres.HostRulesV4[0]
} else if dnsres.HostRulesV6 != nil {
rule = dnsres.HostRulesV6[0]
}
log.Debug("Filtering: found rule for host %q: %q list_id: %d",
host, rule.Text(), rule.GetFilterListID())
res = makeResult(rule, FilteredBlockList)
res.Rules[0].IP = net.IP{}
return res, nil
}
return Result{}, nil
</s> add return res, nil </s> remove // A rewrite of a host to itself. Go on and
// try matching other things.
</s> add // A rewrite of a host to itself. Go on and try
// matching other things. </s> remove // Check DNS rewrites first, because the API there is a bit
// awkward.
</s> add // Check DNS rewrites first, because the API there is a bit awkward. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/9631eff60862d88667eaa853ebfa3bce1e1cdd8e | internal/dnsfilter/dnsfilter.go |
return res, nil | <mask>
<mask> return res, nil
<mask> }
<mask>
<mask> if dnsres.HostRulesV4 != nil || dnsres.HostRulesV6 != nil {
<mask> // Question Type doesn't match the host rules
<mask> // Return the first matched host rule, but without an IP address
<mask> var rule rules.Rule
<mask> if dnsres.HostRulesV4 != nil {
<mask> rule = dnsres.HostRulesV4[0]
<mask> } else if dnsres.HostRulesV6 != nil {
<mask> rule = dnsres.HostRulesV6[0]
<mask> }
<mask> log.Debug("Filtering: found rule for host %q: %q list_id: %d",
<mask> host, rule.Text(), rule.GetFilterListID())
<mask> res = makeResult(rule, FilteredBlockList)
<mask> res.Rules[0].IP = net.IP{}
<mask>
<mask> return res, nil
<mask> }
<mask>
<mask> return Result{}, nil
<mask> }
<mask>
<mask> // makeResult returns a properly constructed Result.
<mask> func makeResult(rule rules.Rule, reason Reason) Result {
<mask> res := Result{
</s> Pull request: dnsfilter: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c153f08bcf5ade4d0fb9b59d2a0e6a21598c4127
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 21:03:51 2021 +0300
dnsfilter: imp code, decr cyclo </s> remove if dnsres.NetworkRule != nil {
log.Debug("Filtering: found rule for host %q: %q list_id: %d",
host, dnsres.NetworkRule.Text(), dnsres.NetworkRule.GetFilterListID())
reason := FilteredBlockList
if dnsres.NetworkRule.Whitelist {
reason = NotFilteredAllowList
}
return makeResult(dnsres.NetworkRule, reason), nil
}
if qtype == dns.TypeA && dnsres.HostRulesV4 != nil {
rule := dnsres.HostRulesV4[0] // note that we process only 1 matched rule
log.Debug("Filtering: found rule for host %q: %q list_id: %d",
host, rule.Text(), rule.GetFilterListID())
res = makeResult(rule, FilteredBlockList)
res.Rules[0].IP = rule.IP.To4()
return res, nil
}
if qtype == dns.TypeAAAA && dnsres.HostRulesV6 != nil {
rule := dnsres.HostRulesV6[0] // note that we process only 1 matched rule
log.Debug("Filtering: found rule for host %q: %q list_id: %d",
host, rule.Text(), rule.GetFilterListID())
res = makeResult(rule, FilteredBlockList)
res.Rules[0].IP = rule.IP
return res, nil
</s> add res = d.matchHostProcessDNSResult(qtype, dnsres)
if len(res.Rules) > 0 {
r := res.Rules[0]
log.Debug(
"filtering: found rule %q for host %q, filter list id: %d",
r.Text,
host,
r.FilterListID,
) </s> remove // A rewrite of a host to itself. Go on and
// try matching other things.
</s> add // A rewrite of a host to itself. Go on and try
// matching other things. </s> remove // Check DNS rewrites first, because the API there is a bit
// awkward.
</s> add // Check DNS rewrites first, because the API there is a bit awkward. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"k... | https://github.com/AdguardTeam/AdGuardHome/commit/9631eff60862d88667eaa853ebfa3bce1e1cdd8e | internal/dnsfilter/dnsfilter.go |
<mask> const FILTERS_ITEMS = [
<mask> { route: FILTERS_URLS.dns_blocklists, text: 'dns_blocklists' },
<mask> { route: FILTERS_URLS.dns_allowlists, text: 'dns_allowlists' },
<mask> { route: FILTERS_URLS.dns_rewrites, text: 'dns_rewrites' },
<mask> { route: FILTERS_URLS.custom_rules, text: 'custom_filtering_rules' },
<mask> { route: FILTERS_URLS.blocked_services, text: 'blocked_services' },
<mask> ];
<mask>
<mask> class Menu extends Component {
<mask> handleClickOutside = () => {
</s> - client: Don't normalise disallowed domains
Close #1820
Squashed commit of the following:
commit 0c758ddcd738136b92e6f947a8068ecc59f7ec25
Merge: 15650db3 f5a1f311
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 3 11:22:00 2020 +0300
Merge branch 'master' into fix/1820
commit 15650db35323009001fd427a74a312705b54ac86
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jun 29 12:01:51 2020 +0300
'- client: Don't normalise disallowed domains' </s> remove normalizeOnBlur={normalizeMultiline}
</s> add normalizeOnBlur={id === 'disallowed_clients' ? normalizeMultiline : undefined} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9640752d20666373165d1f8bb3f3ddb8378353c3 | client/src/components/Header/Menu.js | |
{ route: FILTERS_URLS.custom_rules, text: 'custom_filtering_rules' }, | <mask> { route: FILTERS_URLS.dns_blocklists, text: 'dns_blocklists' },
<mask> { route: FILTERS_URLS.dns_allowlists, text: 'dns_allowlists' },
<mask> { route: FILTERS_URLS.dns_rewrites, text: 'dns_rewrites' },
<mask> { route: FILTERS_URLS.blocked_services, text: 'blocked_services' },
<mask> ];
<mask>
<mask> class Menu extends Component {
<mask> handleClickOutside = () => {
<mask> this.props.closeMenu();
</s> - client: Don't normalise disallowed domains
Close #1820
Squashed commit of the following:
commit 0c758ddcd738136b92e6f947a8068ecc59f7ec25
Merge: 15650db3 f5a1f311
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 3 11:22:00 2020 +0300
Merge branch 'master' into fix/1820
commit 15650db35323009001fd427a74a312705b54ac86
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jun 29 12:01:51 2020 +0300
'- client: Don't normalise disallowed domains' </s> remove normalizeOnBlur={normalizeMultiline}
</s> add normalizeOnBlur={id === 'disallowed_clients' ? normalizeMultiline : undefined} </s> remove { route: FILTERS_URLS.custom_rules, text: 'custom_filtering_rules' },
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9640752d20666373165d1f8bb3f3ddb8378353c3 | client/src/components/Header/Menu.js |
normalizeOnBlur={id === 'disallowed_clients' ? normalizeMultiline : undefined} | <mask> component={renderTextareaField}
<mask> type="text"
<mask> className="form-control form-control--textarea font-monospace"
<mask> disabled={disabled}
<mask> normalizeOnBlur={normalizeMultiline}
<mask> />
<mask> </div>;
<mask>
<mask> renderField.propTypes = {
<mask> id: PropTypes.string,
</s> - client: Don't normalise disallowed domains
Close #1820
Squashed commit of the following:
commit 0c758ddcd738136b92e6f947a8068ecc59f7ec25
Merge: 15650db3 f5a1f311
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 3 11:22:00 2020 +0300
Merge branch 'master' into fix/1820
commit 15650db35323009001fd427a74a312705b54ac86
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jun 29 12:01:51 2020 +0300
'- client: Don't normalise disallowed domains' </s> remove { route: FILTERS_URLS.custom_rules, text: 'custom_filtering_rules' },
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9640752d20666373165d1f8bb3f3ddb8378353c3 | client/src/components/Settings/Dns/Access/Form.js |
conf ServerConfig | <mask> stats *stats // General server statistics
<mask> once sync.Once
<mask>
<mask> sync.RWMutex
<mask> ServerConfig
<mask> }
<mask>
<mask> // NewServer creates a new instance of the dnsforward.Server
<mask> // baseDir is the base directory for query logs
<mask> func NewServer(baseDir string) *Server {
</s> * dnsforward: use separate ServerConfig object </s> remove s.dnsFilter = dnsfilter.New(&s.Config)
</s> add s.dnsFilter = dnsfilter.New(&s.conf.Config) </s> remove s.ServerConfig = *config
</s> add s.conf = *config </s> remove Ttl: s.BlockedResponseTTL,
</s> add Ttl: s.conf.BlockedResponseTTL, </s> remove if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.RefuseAny {
</s> add if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.conf.RefuseAny { </s> remove if s.FilteringEnabled {
err := s.dnsFilter.AddRules(s.Filters)
</s> add if s.conf.FilteringEnabled {
err := s.dnsFilter.AddRules(s.conf.Filters) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward.go |
s.conf = *config | <mask>
<mask> // startInternal starts without locking
<mask> func (s *Server) startInternal(config *ServerConfig) error {
<mask> if config != nil {
<mask> s.ServerConfig = *config
<mask> }
<mask>
<mask> if s.dnsFilter != nil || s.dnsProxy != nil {
<mask> return errors.New("DNS server is already started")
<mask> }
</s> * dnsforward: use separate ServerConfig object </s> remove if s.FilteringEnabled {
err := s.dnsFilter.AddRules(s.Filters)
</s> add if s.conf.FilteringEnabled {
err := s.dnsFilter.AddRules(s.conf.Filters) </s> remove s.dnsFilter = dnsfilter.New(&s.Config)
</s> add s.dnsFilter = dnsfilter.New(&s.conf.Config) </s> remove if s.TLSListenAddr != nil && s.CertificateChain != "" && s.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.CertificateChain), []byte(s.PrivateKey))
</s> add if s.conf.TLSListenAddr != nil && s.conf.CertificateChain != "" && s.conf.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.conf.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.conf.CertificateChain), []byte(s.conf.PrivateKey)) </s> remove if s.BlockingMode == "null_ip" {
</s> add if s.conf.BlockingMode == "null_ip" { </s> remove if s.QueryLogEnabled && shouldLog {
</s> add if s.conf.QueryLogEnabled && shouldLog { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward.go |
UDPListenAddr: s.conf.UDPListenAddr,
TCPListenAddr: s.conf.TCPListenAddr,
Ratelimit: s.conf.Ratelimit,
RatelimitWhitelist: s.conf.RatelimitWhitelist,
RefuseAny: s.conf.RefuseAny, | <mask> go s.stats.statsRotator()
<mask> })
<mask>
<mask> proxyConfig := proxy.Config{
<mask> UDPListenAddr: s.UDPListenAddr,
<mask> TCPListenAddr: s.TCPListenAddr,
<mask> Ratelimit: s.Ratelimit,
<mask> RatelimitWhitelist: s.RatelimitWhitelist,
<mask> RefuseAny: s.RefuseAny,
<mask> CacheEnabled: true,
<mask> Upstreams: s.Upstreams,
<mask> DomainsReservedUpstreams: s.DomainsReservedUpstreams,
<mask> Handler: s.handleDNSRequest,
<mask> AllServers: s.AllServers,
</s> * dnsforward: use separate ServerConfig object </s> remove Upstreams: s.Upstreams,
DomainsReservedUpstreams: s.DomainsReservedUpstreams,
</s> add Upstreams: s.conf.Upstreams,
DomainsReservedUpstreams: s.conf.DomainsReservedUpstreams, </s> remove AllServers: s.AllServers,
</s> add AllServers: s.conf.AllServers, </s> remove if s.TLSListenAddr != nil && s.CertificateChain != "" && s.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.CertificateChain), []byte(s.PrivateKey))
</s> add if s.conf.TLSListenAddr != nil && s.conf.CertificateChain != "" && s.conf.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.conf.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.conf.CertificateChain), []byte(s.conf.PrivateKey)) </s> remove protectionEnabled := s.ProtectionEnabled
</s> add protectionEnabled := s.conf.ProtectionEnabled </s> remove s.TLSConfig = TLSConfig{
</s> add s.conf.TLSConfig = TLSConfig{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward.go |
Upstreams: s.conf.Upstreams,
DomainsReservedUpstreams: s.conf.DomainsReservedUpstreams, | <mask> Ratelimit: s.Ratelimit,
<mask> RatelimitWhitelist: s.RatelimitWhitelist,
<mask> RefuseAny: s.RefuseAny,
<mask> CacheEnabled: true,
<mask> Upstreams: s.Upstreams,
<mask> DomainsReservedUpstreams: s.DomainsReservedUpstreams,
<mask> Handler: s.handleDNSRequest,
<mask> AllServers: s.AllServers,
<mask> }
<mask>
<mask> if s.TLSListenAddr != nil && s.CertificateChain != "" && s.PrivateKey != "" {
</s> * dnsforward: use separate ServerConfig object </s> remove AllServers: s.AllServers,
</s> add AllServers: s.conf.AllServers, </s> remove UDPListenAddr: s.UDPListenAddr,
TCPListenAddr: s.TCPListenAddr,
Ratelimit: s.Ratelimit,
RatelimitWhitelist: s.RatelimitWhitelist,
RefuseAny: s.RefuseAny,
</s> add UDPListenAddr: s.conf.UDPListenAddr,
TCPListenAddr: s.conf.TCPListenAddr,
Ratelimit: s.conf.Ratelimit,
RatelimitWhitelist: s.conf.RatelimitWhitelist,
RefuseAny: s.conf.RefuseAny, </s> remove if s.TLSListenAddr != nil && s.CertificateChain != "" && s.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.CertificateChain), []byte(s.PrivateKey))
</s> add if s.conf.TLSListenAddr != nil && s.conf.CertificateChain != "" && s.conf.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.conf.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.conf.CertificateChain), []byte(s.conf.PrivateKey)) </s> remove if s.QueryLogEnabled && shouldLog {
</s> add if s.conf.QueryLogEnabled && shouldLog { </s> remove s.ServerConfig = *config
</s> add s.conf = *config | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward.go |
AllServers: s.conf.AllServers, | <mask> CacheEnabled: true,
<mask> Upstreams: s.Upstreams,
<mask> DomainsReservedUpstreams: s.DomainsReservedUpstreams,
<mask> Handler: s.handleDNSRequest,
<mask> AllServers: s.AllServers,
<mask> }
<mask>
<mask> if s.TLSListenAddr != nil && s.CertificateChain != "" && s.PrivateKey != "" {
<mask> proxyConfig.TLSListenAddr = s.TLSListenAddr
<mask> keypair, err := tls.X509KeyPair([]byte(s.CertificateChain), []byte(s.PrivateKey))
</s> * dnsforward: use separate ServerConfig object </s> remove Upstreams: s.Upstreams,
DomainsReservedUpstreams: s.DomainsReservedUpstreams,
</s> add Upstreams: s.conf.Upstreams,
DomainsReservedUpstreams: s.conf.DomainsReservedUpstreams, </s> remove if s.TLSListenAddr != nil && s.CertificateChain != "" && s.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.CertificateChain), []byte(s.PrivateKey))
</s> add if s.conf.TLSListenAddr != nil && s.conf.CertificateChain != "" && s.conf.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.conf.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.conf.CertificateChain), []byte(s.conf.PrivateKey)) </s> remove UDPListenAddr: s.UDPListenAddr,
TCPListenAddr: s.TCPListenAddr,
Ratelimit: s.Ratelimit,
RatelimitWhitelist: s.RatelimitWhitelist,
RefuseAny: s.RefuseAny,
</s> add UDPListenAddr: s.conf.UDPListenAddr,
TCPListenAddr: s.conf.TCPListenAddr,
Ratelimit: s.conf.Ratelimit,
RatelimitWhitelist: s.conf.RatelimitWhitelist,
RefuseAny: s.conf.RefuseAny, </s> remove if s.QueryLogEnabled && shouldLog {
</s> add if s.conf.QueryLogEnabled && shouldLog { </s> remove if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.RefuseAny {
</s> add if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.conf.RefuseAny { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward.go |
if s.conf.TLSListenAddr != nil && s.conf.CertificateChain != "" && s.conf.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.conf.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.conf.CertificateChain), []byte(s.conf.PrivateKey)) | <mask> Handler: s.handleDNSRequest,
<mask> AllServers: s.AllServers,
<mask> }
<mask>
<mask> if s.TLSListenAddr != nil && s.CertificateChain != "" && s.PrivateKey != "" {
<mask> proxyConfig.TLSListenAddr = s.TLSListenAddr
<mask> keypair, err := tls.X509KeyPair([]byte(s.CertificateChain), []byte(s.PrivateKey))
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Failed to parse TLS keypair")
<mask> }
<mask> proxyConfig.TLSConfig = &tls.Config{
<mask> Certificates: []tls.Certificate{keypair},
</s> * dnsforward: use separate ServerConfig object </s> remove AllServers: s.AllServers,
</s> add AllServers: s.conf.AllServers, </s> remove Upstreams: s.Upstreams,
DomainsReservedUpstreams: s.DomainsReservedUpstreams,
</s> add Upstreams: s.conf.Upstreams,
DomainsReservedUpstreams: s.conf.DomainsReservedUpstreams, </s> remove if s.QueryLogEnabled && shouldLog {
</s> add if s.conf.QueryLogEnabled && shouldLog { </s> remove if s.FilteringEnabled {
err := s.dnsFilter.AddRules(s.Filters)
</s> add if s.conf.FilteringEnabled {
err := s.dnsFilter.AddRules(s.conf.Filters) </s> remove s.FilteringConfig.BlockingMode = "null_ip"
</s> add s.conf.FilteringConfig.BlockingMode = "null_ip" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward.go |
s.dnsFilter = dnsfilter.New(&s.conf.Config) | <mask>
<mask> // Initializes the DNS filter
<mask> func (s *Server) initDNSFilter() error {
<mask> log.Tracef("Creating dnsfilter")
<mask> s.dnsFilter = dnsfilter.New(&s.Config)
<mask> // add rules only if they are enabled
<mask> if s.FilteringEnabled {
<mask> err := s.dnsFilter.AddRules(s.Filters)
<mask> if err != nil {
<mask> return errorx.Decorate(err, "could not initialize dnsfilter")
</s> * dnsforward: use separate ServerConfig object </s> remove if s.FilteringEnabled {
err := s.dnsFilter.AddRules(s.Filters)
</s> add if s.conf.FilteringEnabled {
err := s.dnsFilter.AddRules(s.conf.Filters) </s> remove s.ServerConfig = *config
</s> add s.conf = *config </s> remove if s.TLSListenAddr != nil && s.CertificateChain != "" && s.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.CertificateChain), []byte(s.PrivateKey))
</s> add if s.conf.TLSListenAddr != nil && s.conf.CertificateChain != "" && s.conf.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.conf.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.conf.CertificateChain), []byte(s.conf.PrivateKey)) </s> remove if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.RefuseAny {
</s> add if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.conf.RefuseAny { </s> remove answer, err := dns.NewRR(fmt.Sprintf("%s %d A %s", request.Question[0].Name, s.BlockedResponseTTL, ip.String()))
</s> add answer, err := dns.NewRR(fmt.Sprintf("%s %d A %s", request.Question[0].Name, s.conf.BlockedResponseTTL, ip.String())) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward.go |
if s.conf.FilteringEnabled {
err := s.dnsFilter.AddRules(s.conf.Filters) | <mask> func (s *Server) initDNSFilter() error {
<mask> log.Tracef("Creating dnsfilter")
<mask> s.dnsFilter = dnsfilter.New(&s.Config)
<mask> // add rules only if they are enabled
<mask> if s.FilteringEnabled {
<mask> err := s.dnsFilter.AddRules(s.Filters)
<mask> if err != nil {
<mask> return errorx.Decorate(err, "could not initialize dnsfilter")
<mask> }
<mask> }
<mask> return nil
</s> * dnsforward: use separate ServerConfig object </s> remove s.dnsFilter = dnsfilter.New(&s.Config)
</s> add s.dnsFilter = dnsfilter.New(&s.conf.Config) </s> remove s.ServerConfig = *config
</s> add s.conf = *config </s> remove if s.TLSListenAddr != nil && s.CertificateChain != "" && s.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.CertificateChain), []byte(s.PrivateKey))
</s> add if s.conf.TLSListenAddr != nil && s.conf.CertificateChain != "" && s.conf.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.conf.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.conf.CertificateChain), []byte(s.conf.PrivateKey)) </s> remove if s.BlockingMode == "null_ip" {
</s> add if s.conf.BlockingMode == "null_ip" { </s> remove answer, err := dns.NewRR(fmt.Sprintf("%s %d A %s", request.Question[0].Name, s.BlockedResponseTTL, ip.String()))
</s> add answer, err := dns.NewRR(fmt.Sprintf("%s %d A %s", request.Question[0].Name, s.conf.BlockedResponseTTL, ip.String())) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward.go |
if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.conf.RefuseAny { | <mask> shouldLog := true
<mask> msg := d.Req
<mask>
<mask> // don't log ANY request if refuseAny is enabled
<mask> if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.RefuseAny {
<mask> shouldLog = false
<mask> }
<mask>
<mask> if s.QueryLogEnabled && shouldLog {
<mask> elapsed := time.Since(start)
</s> * dnsforward: use separate ServerConfig object </s> remove if s.QueryLogEnabled && shouldLog {
</s> add if s.conf.QueryLogEnabled && shouldLog { </s> remove if s.TLSListenAddr != nil && s.CertificateChain != "" && s.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.CertificateChain), []byte(s.PrivateKey))
</s> add if s.conf.TLSListenAddr != nil && s.conf.CertificateChain != "" && s.conf.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.conf.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.conf.CertificateChain), []byte(s.conf.PrivateKey)) </s> remove protectionEnabled := s.ProtectionEnabled
</s> add protectionEnabled := s.conf.ProtectionEnabled </s> remove if s.FilteringEnabled {
err := s.dnsFilter.AddRules(s.Filters)
</s> add if s.conf.FilteringEnabled {
err := s.dnsFilter.AddRules(s.conf.Filters) </s> remove AllServers: s.AllServers,
</s> add AllServers: s.conf.AllServers, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward.go |
if s.conf.QueryLogEnabled && shouldLog { | <mask> if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.RefuseAny {
<mask> shouldLog = false
<mask> }
<mask>
<mask> if s.QueryLogEnabled && shouldLog {
<mask> elapsed := time.Since(start)
<mask> upstreamAddr := ""
<mask> if d.Upstream != nil {
<mask> upstreamAddr = d.Upstream.Address()
<mask> }
</s> * dnsforward: use separate ServerConfig object </s> remove if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.RefuseAny {
</s> add if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.conf.RefuseAny { </s> remove if s.TLSListenAddr != nil && s.CertificateChain != "" && s.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.CertificateChain), []byte(s.PrivateKey))
</s> add if s.conf.TLSListenAddr != nil && s.conf.CertificateChain != "" && s.conf.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.conf.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.conf.CertificateChain), []byte(s.conf.PrivateKey)) </s> remove AllServers: s.AllServers,
</s> add AllServers: s.conf.AllServers, </s> remove Upstreams: s.Upstreams,
DomainsReservedUpstreams: s.DomainsReservedUpstreams,
</s> add Upstreams: s.conf.Upstreams,
DomainsReservedUpstreams: s.conf.DomainsReservedUpstreams, </s> remove if s.BlockingMode == "null_ip" {
</s> add if s.conf.BlockingMode == "null_ip" { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward.go |
protectionEnabled := s.conf.ProtectionEnabled | <mask> msg := d.Req
<mask> host := strings.TrimSuffix(msg.Question[0].Name, ".")
<mask>
<mask> s.RLock()
<mask> protectionEnabled := s.ProtectionEnabled
<mask> dnsFilter := s.dnsFilter
<mask> s.RUnlock()
<mask>
<mask> if !protectionEnabled {
<mask> return nil, nil
</s> * dnsforward: use separate ServerConfig object </s> remove if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.RefuseAny {
</s> add if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.conf.RefuseAny { </s> remove if s.FilteringEnabled {
err := s.dnsFilter.AddRules(s.Filters)
</s> add if s.conf.FilteringEnabled {
err := s.dnsFilter.AddRules(s.conf.Filters) </s> remove answer, err := dns.NewRR(fmt.Sprintf("%s %d A %s", request.Question[0].Name, s.BlockedResponseTTL, ip.String()))
</s> add answer, err := dns.NewRR(fmt.Sprintf("%s %d A %s", request.Question[0].Name, s.conf.BlockedResponseTTL, ip.String())) </s> remove s.dnsFilter = dnsfilter.New(&s.Config)
</s> add s.dnsFilter = dnsfilter.New(&s.conf.Config) </s> remove if s.QueryLogEnabled && shouldLog {
</s> add if s.conf.QueryLogEnabled && shouldLog { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward.go |
if s.conf.BlockingMode == "null_ip" { | <mask> if result.IP != nil {
<mask> return s.genARecord(m, result.IP)
<mask> }
<mask>
<mask> if s.BlockingMode == "null_ip" {
<mask> return s.genARecord(m, net.IPv4zero)
<mask> }
<mask>
<mask> return s.genNXDomain(m)
<mask> }
</s> * dnsforward: use separate ServerConfig object </s> remove s.FilteringConfig.BlockingMode = "null_ip"
</s> add s.conf.FilteringConfig.BlockingMode = "null_ip" </s> remove if s.FilteringEnabled {
err := s.dnsFilter.AddRules(s.Filters)
</s> add if s.conf.FilteringEnabled {
err := s.dnsFilter.AddRules(s.conf.Filters) </s> remove if s.QueryLogEnabled && shouldLog {
</s> add if s.conf.QueryLogEnabled && shouldLog { </s> remove s.ServerConfig = *config
</s> add s.conf = *config </s> remove if s.TLSListenAddr != nil && s.CertificateChain != "" && s.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.CertificateChain), []byte(s.PrivateKey))
</s> add if s.conf.TLSListenAddr != nil && s.conf.CertificateChain != "" && s.conf.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.conf.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.conf.CertificateChain), []byte(s.conf.PrivateKey)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward.go |
answer, err := dns.NewRR(fmt.Sprintf("%s %d A %s", request.Question[0].Name, s.conf.BlockedResponseTTL, ip.String())) | <mask>
<mask> func (s *Server) genARecord(request *dns.Msg, ip net.IP) *dns.Msg {
<mask> resp := dns.Msg{}
<mask> resp.SetReply(request)
<mask> answer, err := dns.NewRR(fmt.Sprintf("%s %d A %s", request.Question[0].Name, s.BlockedResponseTTL, ip.String()))
<mask> if err != nil {
<mask> log.Printf("Couldn't generate A record for replacement host '%s': %s", ip.String(), err)
<mask> return s.genServerFailure(request)
<mask> }
<mask> resp.Answer = append(resp.Answer, answer)
</s> * dnsforward: use separate ServerConfig object </s> remove s.FilteringConfig.BlockingMode = "null_ip"
</s> add s.conf.FilteringConfig.BlockingMode = "null_ip" </s> remove s.SafeSearchEnabled = true
</s> add s.conf.SafeSearchEnabled = true </s> remove if s.FilteringEnabled {
err := s.dnsFilter.AddRules(s.Filters)
</s> add if s.conf.FilteringEnabled {
err := s.dnsFilter.AddRules(s.conf.Filters) </s> remove s.dnsFilter = dnsfilter.New(&s.Config)
</s> add s.dnsFilter = dnsfilter.New(&s.conf.Config) </s> remove s.ServerConfig = *config
</s> add s.conf = *config | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward.go |
Ttl: s.conf.BlockedResponseTTL, | <mask> // rest is request-specific
<mask> Hdr: dns.RR_Header{
<mask> Name: zone,
<mask> Rrtype: dns.TypeSOA,
<mask> Ttl: s.BlockedResponseTTL,
<mask> Class: dns.ClassINET,
<mask> },
<mask> Mbox: "hostmaster.", // zone will be appended later if it's not empty or "."
<mask> }
<mask> if soa.Hdr.Ttl == 0 {
</s> * dnsforward: use separate ServerConfig object </s> remove if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.RefuseAny {
</s> add if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.conf.RefuseAny { </s> remove if s.FilteringEnabled {
err := s.dnsFilter.AddRules(s.Filters)
</s> add if s.conf.FilteringEnabled {
err := s.dnsFilter.AddRules(s.conf.Filters) </s> remove s.dnsFilter = dnsfilter.New(&s.Config)
</s> add s.dnsFilter = dnsfilter.New(&s.conf.Config) </s> remove s.ServerConfig = *config
</s> add s.conf = *config </s> remove if s.BlockingMode == "null_ip" {
</s> add if s.conf.BlockingMode == "null_ip" { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward.go |
s.conf.TLSConfig = TLSConfig{ | <mask> _, certPem, keyPem := createServerTLSConfig(t)
<mask> s := createTestServer(t)
<mask> defer removeDataDir(t)
<mask>
<mask> s.TLSConfig = TLSConfig{
<mask> TLSListenAddr: &net.TCPAddr{Port: 0},
<mask> CertificateChain: string(certPem),
<mask> PrivateKey: string(keyPem),
<mask> }
<mask>
</s> * dnsforward: use separate ServerConfig object </s> remove s.FilteringConfig.BlockingMode = "null_ip"
</s> add s.conf.FilteringConfig.BlockingMode = "null_ip" </s> remove s.SafeSearchEnabled = true
</s> add s.conf.SafeSearchEnabled = true </s> remove s.UDPListenAddr = &net.UDPAddr{Port: 0}
s.TCPListenAddr = &net.TCPAddr{Port: 0}
</s> add s.conf.UDPListenAddr = &net.UDPAddr{Port: 0}
s.conf.TCPListenAddr = &net.TCPAddr{Port: 0} </s> remove s.QueryLogEnabled = true
s.FilteringConfig.FilteringEnabled = true
s.FilteringConfig.ProtectionEnabled = true
s.FilteringConfig.SafeBrowsingEnabled = true
s.Filters = make([]dnsfilter.Filter, 0)
</s> add s.conf.QueryLogEnabled = true
s.conf.FilteringConfig.FilteringEnabled = true
s.conf.FilteringConfig.ProtectionEnabled = true
s.conf.FilteringConfig.SafeBrowsingEnabled = true
s.conf.Filters = make([]dnsfilter.Filter, 0) </s> remove s.Filters = append(s.Filters, filter)
</s> add s.conf.Filters = append(s.conf.Filters, filter) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward_test.go |
s.conf.SafeSearchEnabled = true | <mask> }
<mask>
<mask> func TestSafeSearch(t *testing.T) {
<mask> s := createTestServer(t)
<mask> s.SafeSearchEnabled = true
<mask> defer removeDataDir(t)
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
</s> * dnsforward: use separate ServerConfig object </s> remove s.FilteringConfig.BlockingMode = "null_ip"
</s> add s.conf.FilteringConfig.BlockingMode = "null_ip" </s> remove answer, err := dns.NewRR(fmt.Sprintf("%s %d A %s", request.Question[0].Name, s.BlockedResponseTTL, ip.String()))
</s> add answer, err := dns.NewRR(fmt.Sprintf("%s %d A %s", request.Question[0].Name, s.conf.BlockedResponseTTL, ip.String())) </s> remove s.TLSConfig = TLSConfig{
</s> add s.conf.TLSConfig = TLSConfig{ </s> remove if s.TLSListenAddr != nil && s.CertificateChain != "" && s.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.CertificateChain), []byte(s.PrivateKey))
</s> add if s.conf.TLSListenAddr != nil && s.conf.CertificateChain != "" && s.conf.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.conf.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.conf.CertificateChain), []byte(s.conf.PrivateKey)) </s> remove s.UDPListenAddr = &net.UDPAddr{Port: 0}
s.TCPListenAddr = &net.TCPAddr{Port: 0}
</s> add s.conf.UDPListenAddr = &net.UDPAddr{Port: 0}
s.conf.TCPListenAddr = &net.TCPAddr{Port: 0} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward_test.go |
s.conf.FilteringConfig.BlockingMode = "null_ip" | <mask> }
<mask>
<mask> func TestNullBlockedRequest(t *testing.T) {
<mask> s := createTestServer(t)
<mask> s.FilteringConfig.BlockingMode = "null_ip"
<mask> defer removeDataDir(t)
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
</s> * dnsforward: use separate ServerConfig object </s> remove s.SafeSearchEnabled = true
</s> add s.conf.SafeSearchEnabled = true </s> remove answer, err := dns.NewRR(fmt.Sprintf("%s %d A %s", request.Question[0].Name, s.BlockedResponseTTL, ip.String()))
</s> add answer, err := dns.NewRR(fmt.Sprintf("%s %d A %s", request.Question[0].Name, s.conf.BlockedResponseTTL, ip.String())) </s> remove s.TLSConfig = TLSConfig{
</s> add s.conf.TLSConfig = TLSConfig{ </s> remove if s.TLSListenAddr != nil && s.CertificateChain != "" && s.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.CertificateChain), []byte(s.PrivateKey))
</s> add if s.conf.TLSListenAddr != nil && s.conf.CertificateChain != "" && s.conf.PrivateKey != "" {
proxyConfig.TLSListenAddr = s.conf.TLSListenAddr
keypair, err := tls.X509KeyPair([]byte(s.conf.CertificateChain), []byte(s.conf.PrivateKey)) </s> remove if s.BlockingMode == "null_ip" {
</s> add if s.conf.BlockingMode == "null_ip" { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward_test.go |
s.conf.UDPListenAddr = &net.UDPAddr{Port: 0}
s.conf.TCPListenAddr = &net.TCPAddr{Port: 0} | <mask> }
<mask>
<mask> func createTestServer(t *testing.T) *Server {
<mask> s := NewServer(createDataDir(t))
<mask> s.UDPListenAddr = &net.UDPAddr{Port: 0}
<mask> s.TCPListenAddr = &net.TCPAddr{Port: 0}
<mask>
<mask> s.QueryLogEnabled = true
<mask> s.FilteringConfig.FilteringEnabled = true
<mask> s.FilteringConfig.ProtectionEnabled = true
<mask> s.FilteringConfig.SafeBrowsingEnabled = true
</s> * dnsforward: use separate ServerConfig object </s> remove s.QueryLogEnabled = true
s.FilteringConfig.FilteringEnabled = true
s.FilteringConfig.ProtectionEnabled = true
s.FilteringConfig.SafeBrowsingEnabled = true
s.Filters = make([]dnsfilter.Filter, 0)
</s> add s.conf.QueryLogEnabled = true
s.conf.FilteringConfig.FilteringEnabled = true
s.conf.FilteringConfig.ProtectionEnabled = true
s.conf.FilteringConfig.SafeBrowsingEnabled = true
s.conf.Filters = make([]dnsfilter.Filter, 0) </s> remove s.SafeSearchEnabled = true
</s> add s.conf.SafeSearchEnabled = true </s> remove if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.RefuseAny {
</s> add if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.conf.RefuseAny { </s> remove s.FilteringConfig.BlockingMode = "null_ip"
</s> add s.conf.FilteringConfig.BlockingMode = "null_ip" </s> remove s.TLSConfig = TLSConfig{
</s> add s.conf.TLSConfig = TLSConfig{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward_test.go |
s.conf.QueryLogEnabled = true
s.conf.FilteringConfig.FilteringEnabled = true
s.conf.FilteringConfig.ProtectionEnabled = true
s.conf.FilteringConfig.SafeBrowsingEnabled = true
s.conf.Filters = make([]dnsfilter.Filter, 0) | <mask> s := NewServer(createDataDir(t))
<mask> s.UDPListenAddr = &net.UDPAddr{Port: 0}
<mask> s.TCPListenAddr = &net.TCPAddr{Port: 0}
<mask>
<mask> s.QueryLogEnabled = true
<mask> s.FilteringConfig.FilteringEnabled = true
<mask> s.FilteringConfig.ProtectionEnabled = true
<mask> s.FilteringConfig.SafeBrowsingEnabled = true
<mask> s.Filters = make([]dnsfilter.Filter, 0)
<mask>
<mask> rules := []string{
<mask> "||nxdomain.example.org^",
<mask> "||null.example.org^",
<mask> "127.0.0.1 host.example.org",
</s> * dnsforward: use separate ServerConfig object </s> remove s.UDPListenAddr = &net.UDPAddr{Port: 0}
s.TCPListenAddr = &net.TCPAddr{Port: 0}
</s> add s.conf.UDPListenAddr = &net.UDPAddr{Port: 0}
s.conf.TCPListenAddr = &net.TCPAddr{Port: 0} </s> remove s.Filters = append(s.Filters, filter)
</s> add s.conf.Filters = append(s.conf.Filters, filter) </s> remove s.SafeSearchEnabled = true
</s> add s.conf.SafeSearchEnabled = true </s> remove s.TLSConfig = TLSConfig{
</s> add s.conf.TLSConfig = TLSConfig{ </s> remove if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.RefuseAny {
</s> add if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.conf.RefuseAny { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward_test.go |
s.conf.Filters = append(s.conf.Filters, filter) | <mask> "||null.example.org^",
<mask> "127.0.0.1 host.example.org",
<mask> }
<mask> filter := dnsfilter.Filter{ID: 1, Rules: rules}
<mask> s.Filters = append(s.Filters, filter)
<mask> return s
<mask> }
<mask>
<mask> func createServerTLSConfig(t *testing.T) (*tls.Config, []byte, []byte) {
<mask> privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
</s> * dnsforward: use separate ServerConfig object </s> remove s.QueryLogEnabled = true
s.FilteringConfig.FilteringEnabled = true
s.FilteringConfig.ProtectionEnabled = true
s.FilteringConfig.SafeBrowsingEnabled = true
s.Filters = make([]dnsfilter.Filter, 0)
</s> add s.conf.QueryLogEnabled = true
s.conf.FilteringConfig.FilteringEnabled = true
s.conf.FilteringConfig.ProtectionEnabled = true
s.conf.FilteringConfig.SafeBrowsingEnabled = true
s.conf.Filters = make([]dnsfilter.Filter, 0) </s> remove s.FilteringConfig.BlockingMode = "null_ip"
</s> add s.conf.FilteringConfig.BlockingMode = "null_ip" </s> remove s.SafeSearchEnabled = true
</s> add s.conf.SafeSearchEnabled = true </s> remove s.UDPListenAddr = &net.UDPAddr{Port: 0}
s.TCPListenAddr = &net.TCPAddr{Port: 0}
</s> add s.conf.UDPListenAddr = &net.UDPAddr{Port: 0}
s.conf.TCPListenAddr = &net.TCPAddr{Port: 0} </s> remove if s.FilteringEnabled {
err := s.dnsFilter.AddRules(s.Filters)
</s> add if s.conf.FilteringEnabled {
err := s.dnsFilter.AddRules(s.conf.Filters) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9644f79a03894aab9b37a7a6813c0f51aea39d3e | dnsforward/dnsforward_test.go |
{!statsProcessing && <div className="row row-cards dashboard"> | <mask> {refreshFullButton}
<mask> </div>
<mask> </PageTitle>
<mask> {statsProcessing && <Loading />}
<mask> {!statsProcessing && <div className="row row-cards">
<mask> <div className="col-lg-12">
<mask> <Statistics
<mask> interval={stats.interval}
<mask> dnsQueries={stats.dnsQueries}
<mask> blockedFiltering={stats.blockedFiltering}
</s> - client: Make dashboard card height constant
Close #2039
Squashed commit of the following:
commit 1d6dd461558403ea0ba813d5f665ecbaab9cd8ed
Merge: 6ca80c91 2a5b0b8d
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 15 10:18:19 2020 +0300
Merge branch 'master' into fix/2039
commit 6ca80c9171da61a4bc02cec409299d0cfb96da49
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Sep 14 19:58:43 2020 +0300
Fix mobile media query
commit 239c9ab29aaaef200bd2289fa116507ea5c2bf4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Sep 14 13:59:39 2020 +0300
- client: Make dashboard card height constant </s> remove .card-table-overflow--limited.clients__table {
</s> add .dashboard .card-table-overflow--limited { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/96512433477a6b32ac4e51e73899f82dc1c2a6e1 | client/src/components/Dashboard/index.js |
.dashboard .card-table-overflow--limited { | <mask> overflow-y: auto;
<mask> max-height: 17.5rem;
<mask> }
<mask>
<mask> .card-table-overflow--limited.clients__table {
<mask> max-height: 18rem;
<mask> }
<mask>
<mask> .card-actions {
<mask> margin-top: 20px;
</s> - client: Make dashboard card height constant
Close #2039
Squashed commit of the following:
commit 1d6dd461558403ea0ba813d5f665ecbaab9cd8ed
Merge: 6ca80c91 2a5b0b8d
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 15 10:18:19 2020 +0300
Merge branch 'master' into fix/2039
commit 6ca80c9171da61a4bc02cec409299d0cfb96da49
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Sep 14 19:58:43 2020 +0300
Fix mobile media query
commit 239c9ab29aaaef200bd2289fa116507ea5c2bf4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Sep 14 13:59:39 2020 +0300
- client: Make dashboard card height constant </s> remove {!statsProcessing && <div className="row row-cards">
</s> add {!statsProcessing && <div className="row row-cards dashboard"> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/96512433477a6b32ac4e51e73899f82dc1c2a6e1 | client/src/components/ui/Card.css |
@media (min-width: 992px) {
.dashboard .card:not(.card--full) {
height: 22rem;
}
}
| <mask> font-size: 14px;
<mask> }
<mask> }
<mask>
<mask> .card .logs__cell--red {
<mask> background-color: #fff4f2;
<mask> }
<mask>
<mask> .card .logs__cell--green {
<mask> background-color: #f1faf3;
</s> - client: Make dashboard card height constant
Close #2039
Squashed commit of the following:
commit 1d6dd461558403ea0ba813d5f665ecbaab9cd8ed
Merge: 6ca80c91 2a5b0b8d
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 15 10:18:19 2020 +0300
Merge branch 'master' into fix/2039
commit 6ca80c9171da61a4bc02cec409299d0cfb96da49
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Sep 14 19:58:43 2020 +0300
Fix mobile media query
commit 239c9ab29aaaef200bd2289fa116507ea5c2bf4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Sep 14 13:59:39 2020 +0300
- client: Make dashboard card height constant </s> remove .card-table-overflow--limited.clients__table {
</s> add .dashboard .card-table-overflow--limited { </s> remove {!statsProcessing && <div className="row row-cards">
</s> add {!statsProcessing && <div className="row row-cards dashboard"> | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/96512433477a6b32ac4e51e73899f82dc1c2a6e1 | client/src/components/ui/Card.css |
- util/pprof.go | <mask> - ".*generated.*"
<mask> - dnsfilter/rule_to_regexp.go
<mask> - ".*_test.go"
<mask>
<mask>
<mask> # all available settings of specific linters
<mask> linters-settings:
</s> + config: add "debug_pprof" setting
Squashed commit of the following:
commit 96d185cf4acc55b21a00d10072e0a641ef7655b8
Merge: 3b75a8cb 9b7c1181
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 15:57:50 2020 +0300
Merge remote-tracking branch 'origin/master' into add-pprof
commit 3b75a8cbec5d72be8865a56bfd7ebb8b0673c3bc
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 13:52:36 2020 +0300
* use localhost:6060 for pprof
commit f66f2fbd7409b98cd9f7d297c268fca998f85e3b
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 12:46:25 2020 +0300
minor
commit 6e38712fb5542f612675858eb957efdefc38f9b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 11:59:39 2020 +0300
use separate HTTP server for pprof
commit 988d95b5fad22f536bf9204b6b96f3697cf9a589
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Apr 21 17:04:04 2020 +0300
minor
commit 90ee6e9753be2af49467687cdf71c35b3943b78b
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Apr 21 16:57:38 2020 +0300
* use modified version of pprof
commit 413002220fe0717950539a8b7e6b0f31cef31bb8
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Apr 20 16:35:21 2020 +0300
minor
commit d4655d3849de1d9fe97efdb7f18fc21d5ac19eda
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Apr 20 15:57:57 2020 +0300
+ config: add "enable_pprof" setting </s> remove - G204 </s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9671050e5b520e3cf979b113f19e554e6402a3c6 | .golangci.yml |
# gosec: Profiling endpoint is automatically exposed on /debug/pprof
- G108 | <mask> # goconst
<mask> - string .forcesafesearch.google.com. has 3 occurrences
<mask> # gosec: Subprocess launched with function call as argument or cmd arguments
<mask> - G204
</s> + config: add "debug_pprof" setting
Squashed commit of the following:
commit 96d185cf4acc55b21a00d10072e0a641ef7655b8
Merge: 3b75a8cb 9b7c1181
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 15:57:50 2020 +0300
Merge remote-tracking branch 'origin/master' into add-pprof
commit 3b75a8cbec5d72be8865a56bfd7ebb8b0673c3bc
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 13:52:36 2020 +0300
* use localhost:6060 for pprof
commit f66f2fbd7409b98cd9f7d297c268fca998f85e3b
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 12:46:25 2020 +0300
minor
commit 6e38712fb5542f612675858eb957efdefc38f9b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 11:59:39 2020 +0300
use separate HTTP server for pprof
commit 988d95b5fad22f536bf9204b6b96f3697cf9a589
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Apr 21 17:04:04 2020 +0300
minor
commit 90ee6e9753be2af49467687cdf71c35b3943b78b
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Apr 21 16:57:38 2020 +0300
* use modified version of pprof
commit 413002220fe0717950539a8b7e6b0f31cef31bb8
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Apr 20 16:35:21 2020 +0300
minor
commit d4655d3849de1d9fe97efdb7f18fc21d5ac19eda
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Apr 20 15:57:57 2020 +0300
+ config: add "enable_pprof" setting </s> remove - G204 </s> add | [
"keep",
"add",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9671050e5b520e3cf979b113f19e554e6402a3c6 | .golangci.yml |
<mask> - Error return value of ..*.Shutdown.
<mask> # goconst
<mask> - string .forcesafesearch.google.com. has 3 occurrences
<mask> # gosec: Subprocess launched with function call as argument or cmd arguments
<mask> - G204 </s> + config: add "debug_pprof" setting
Squashed commit of the following:
commit 96d185cf4acc55b21a00d10072e0a641ef7655b8
Merge: 3b75a8cb 9b7c1181
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 15:57:50 2020 +0300
Merge remote-tracking branch 'origin/master' into add-pprof
commit 3b75a8cbec5d72be8865a56bfd7ebb8b0673c3bc
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 13:52:36 2020 +0300
* use localhost:6060 for pprof
commit f66f2fbd7409b98cd9f7d297c268fca998f85e3b
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 12:46:25 2020 +0300
minor
commit 6e38712fb5542f612675858eb957efdefc38f9b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 11:59:39 2020 +0300
use separate HTTP server for pprof
commit 988d95b5fad22f536bf9204b6b96f3697cf9a589
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Apr 21 17:04:04 2020 +0300
minor
commit 90ee6e9753be2af49467687cdf71c35b3943b78b
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Apr 21 16:57:38 2020 +0300
* use modified version of pprof
commit 413002220fe0717950539a8b7e6b0f31cef31bb8
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Apr 20 16:35:21 2020 +0300
minor
commit d4655d3849de1d9fe97efdb7f18fc21d5ac19eda
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Apr 20 15:57:57 2020 +0300
+ config: add "enable_pprof" setting | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9671050e5b520e3cf979b113f19e554e6402a3c6 | .golangci.yml | |
- G204 | <mask> # gosec: Profiling endpoint is automatically exposed on /debug/pprof
<mask> - G108
<mask> # gosec: Subprocess launched with function call as argument or cmd arguments
<mask> - G204
</s> + config: add "debug_pprof" setting
Squashed commit of the following:
commit 96d185cf4acc55b21a00d10072e0a641ef7655b8
Merge: 3b75a8cb 9b7c1181
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 15:57:50 2020 +0300
Merge remote-tracking branch 'origin/master' into add-pprof
commit 3b75a8cbec5d72be8865a56bfd7ebb8b0673c3bc
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 13:52:36 2020 +0300
* use localhost:6060 for pprof
commit f66f2fbd7409b98cd9f7d297c268fca998f85e3b
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 12:46:25 2020 +0300
minor
commit 6e38712fb5542f612675858eb957efdefc38f9b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 11:59:39 2020 +0300
use separate HTTP server for pprof
commit 988d95b5fad22f536bf9204b6b96f3697cf9a589
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Apr 21 17:04:04 2020 +0300
minor
commit 90ee6e9753be2af49467687cdf71c35b3943b78b
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Apr 21 16:57:38 2020 +0300
* use modified version of pprof
commit 413002220fe0717950539a8b7e6b0f31cef31bb8
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Apr 20 16:35:21 2020 +0300
minor
commit d4655d3849de1d9fe97efdb7f18fc21d5ac19eda
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Apr 20 15:57:57 2020 +0300
+ config: add "enable_pprof" setting </s> remove - G204 </s> add | [
"keep",
"keep",
"keep",
"add"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9671050e5b520e3cf979b113f19e554e6402a3c6 | .golangci.yml |
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060 | <mask> ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
<mask> Language string `yaml:"language"` // two-letter ISO 639-1 language code
<mask> RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
<mask>
<mask> // TTL for a web session (in hours)
<mask> // An active session is automatically refreshed once a day.
<mask> WebSessionTTLHours uint32 `yaml:"web_session_ttl"`
</s> + config: add "debug_pprof" setting
Squashed commit of the following:
commit 96d185cf4acc55b21a00d10072e0a641ef7655b8
Merge: 3b75a8cb 9b7c1181
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 15:57:50 2020 +0300
Merge remote-tracking branch 'origin/master' into add-pprof
commit 3b75a8cbec5d72be8865a56bfd7ebb8b0673c3bc
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 13:52:36 2020 +0300
* use localhost:6060 for pprof
commit f66f2fbd7409b98cd9f7d297c268fca998f85e3b
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 12:46:25 2020 +0300
minor
commit 6e38712fb5542f612675858eb957efdefc38f9b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 11:59:39 2020 +0300
use separate HTTP server for pprof
commit 988d95b5fad22f536bf9204b6b96f3697cf9a589
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Apr 21 17:04:04 2020 +0300
minor
commit 90ee6e9753be2af49467687cdf71c35b3943b78b
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Apr 21 16:57:38 2020 +0300
* use modified version of pprof
commit 413002220fe0717950539a8b7e6b0f31cef31bb8
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Apr 20 16:35:21 2020 +0300
minor
commit d4655d3849de1d9fe97efdb7f18fc21d5ac19eda
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Apr 20 15:57:57 2020 +0300
+ config: add "enable_pprof" setting </s> remove - G204 </s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9671050e5b520e3cf979b113f19e554e6402a3c6 | home/config.go |
if config.DebugPProf {
mux := http.NewServeMux()
util.PProfRegisterWebHandlers(mux)
go func() {
log.Info("pprof: listening on localhost:6060")
err := http.ListenAndServe("localhost:6060", mux)
log.Error("Error while running the pprof server: %s", err)
}()
} | <mask> log.Fatal(err)
<mask> }
<mask> }
<mask>
<mask> err := os.MkdirAll(Context.getDataDir(), 0755)
<mask> if err != nil {
<mask> log.Fatalf("Cannot create DNS data dir at %s: %s", Context.getDataDir(), err)
</s> + config: add "debug_pprof" setting
Squashed commit of the following:
commit 96d185cf4acc55b21a00d10072e0a641ef7655b8
Merge: 3b75a8cb 9b7c1181
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 15:57:50 2020 +0300
Merge remote-tracking branch 'origin/master' into add-pprof
commit 3b75a8cbec5d72be8865a56bfd7ebb8b0673c3bc
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 13:52:36 2020 +0300
* use localhost:6060 for pprof
commit f66f2fbd7409b98cd9f7d297c268fca998f85e3b
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 12:46:25 2020 +0300
minor
commit 6e38712fb5542f612675858eb957efdefc38f9b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Apr 22 11:59:39 2020 +0300
use separate HTTP server for pprof
commit 988d95b5fad22f536bf9204b6b96f3697cf9a589
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Apr 21 17:04:04 2020 +0300
minor
commit 90ee6e9753be2af49467687cdf71c35b3943b78b
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Apr 21 16:57:38 2020 +0300
* use modified version of pprof
commit 413002220fe0717950539a8b7e6b0f31cef31bb8
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Apr 20 16:35:21 2020 +0300
minor
commit d4655d3849de1d9fe97efdb7f18fc21d5ac19eda
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Apr 20 15:57:57 2020 +0300
+ config: add "enable_pprof" setting </s> remove - G204 </s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9671050e5b520e3cf979b113f19e554e6402a3c6 | home/home.go |
"update_failed": "Auto-update failed. Please <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>follow the steps<\/a> to update manually.", | <mask> "down": "Down",
<mask> "fix": "Fix",
<mask> "dns_providers": "Here is a <0>list of known DNS providers</0> to choose from.",
<mask> "update_now": "Update now",
<mask> "update_failed": "Update failed",
<mask> "update_failed_try_later": "Update failed, please try again later",
<mask> "processing_update": "Please wait, AdGuard Home is being updated"
<mask> } </s> * client: add link to the update error </s> remove dispatch(addErrorToast({ error: 'update_failed' }));
</s> add dispatch(addNoticeToast({ error: 'update_failed' })); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/967517316fdc926ee38ef6f356b3af592e73bf00 | client/src/__locales/en.json |
export const addNoticeToast = createAction('ADD_NOTICE_TOAST'); | <mask>
<mask> export const addErrorToast = createAction('ADD_ERROR_TOAST');
<mask> export const addSuccessToast = createAction('ADD_SUCCESS_TOAST');
<mask> export const removeToast = createAction('REMOVE_TOAST');
<mask>
<mask> export const toggleSettingStatus = createAction('SETTING_STATUS_TOGGLE');
<mask> export const showSettingsFailure = createAction('SETTINGS_FAILURE_SHOW');
<mask>
<mask> export const toggleSetting = (settingKey, status) => async (dispatch) => {
</s> * client: add link to the update error </s> remove dispatch(addErrorToast({ error: 'update_failed' }));
</s> add dispatch(addNoticeToast({ error: 'update_failed' })); </s> remove import { addErrorToast, addSuccessToast, removeToast } from '../actions';
</s> add import { addErrorToast, addSuccessToast, addNoticeToast, removeToast } from '../actions'; </s> remove const timeout = this.props.type === 'error' ? 30000 : 5000;
</s> add const timeout = this.props.type === 'success' ? 5000 : 30000; </s> remove dispatch(addErrorToast({ error: 'update_failed_try_later' }));
</s> add dispatch(addNoticeToast({ error: 'update_failed' })); | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/967517316fdc926ee38ef6f356b3af592e73bf00 | client/src/actions/index.js |
dispatch(addNoticeToast({ error: 'update_failed' })); | <mask> let count = attempts || 1;
<mask> let timeout;
<mask>
<mask> if (count > 60) {
<mask> dispatch(addErrorToast({ error: 'update_failed_try_later' }));
<mask> dispatch(getUpdateFailure());
<mask> return false;
<mask> }
<mask>
<mask> const rmTimeout = t => t && clearTimeout(t);
</s> * client: add link to the update error </s> remove dispatch(addErrorToast({ error: 'update_failed' }));
</s> add dispatch(addNoticeToast({ error: 'update_failed' })); </s> remove import { addErrorToast, addSuccessToast, removeToast } from '../actions';
</s> add import { addErrorToast, addSuccessToast, addNoticeToast, removeToast } from '../actions'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/967517316fdc926ee38ef6f356b3af592e73bf00 | client/src/actions/index.js |
<mask> time,
<mask> ...args,
<mask> );
<mask>
<mask> console.log(count);
<mask>
<mask> axios.get('control/status')
<mask> .then((response) => {
<mask> rmTimeout(timeout);
<mask> if (response) {
<mask> dispatch(getUpdateSuccess());
</s> * client: add link to the update error </s> remove dispatch(addErrorToast({ error: 'update_failed_try_later' }));
</s> add dispatch(addNoticeToast({ error: 'update_failed' })); </s> remove import { addErrorToast, addSuccessToast, removeToast } from '../actions';
</s> add import { addErrorToast, addSuccessToast, addNoticeToast, removeToast } from '../actions'; </s> remove <button className="toast__dismiss" onClick={() => this.props.removeToast(this.props.id)}>
</s> add <button className="toast__dismiss" onClick={() => this.props.removeToast(id)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/967517316fdc926ee38ef6f356b3af592e73bf00 | client/src/actions/index.js | |
dispatch(addNoticeToast({ error: 'update_failed' })); | <mask> };
<mask>
<mask> checkUpdate();
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error: 'update_failed' }));
<mask> dispatch(getUpdateFailure());
<mask> }
<mask> };
<mask>
<mask> export const getClientsRequest = createAction('GET_CLIENTS_REQUEST');
</s> * client: add link to the update error </s> remove dispatch(addErrorToast({ error: 'update_failed_try_later' }));
</s> add dispatch(addNoticeToast({ error: 'update_failed' })); </s> remove import { addErrorToast, addSuccessToast, removeToast } from '../actions';
</s> add import { addErrorToast, addSuccessToast, addNoticeToast, removeToast } from '../actions'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/967517316fdc926ee38ef6f356b3af592e73bf00 | client/src/actions/index.js |
.toast__content a {
font-weight: 600;
color: #fff;
text-decoration: underline;
}
| <mask> }
<mask>
<mask> .toast__dismiss {
<mask> display: block;
<mask> flex: 0 0 auto;
<mask> padding: 0;
<mask> background: transparent;
</s> * client: add link to the update error </s> remove <div className={`toast toast--${this.props.type}`}>
</s> add <div className={`toast toast--${type}`}> </s> remove <button className="toast__dismiss" onClick={() => this.props.removeToast(this.props.id)}>
</s> add <button className="toast__dismiss" onClick={() => this.props.removeToast(id)}> </s> remove <Trans>{this.props.message}</Trans>
</s> add {this.showMessage(t, type, message)} </s> remove import { addErrorToast, addSuccessToast, removeToast } from '../actions';
</s> add import { addErrorToast, addSuccessToast, addNoticeToast, removeToast } from '../actions'; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/967517316fdc926ee38ef6f356b3af592e73bf00 | client/src/components/Toasts/Toast.css |
const timeout = this.props.type === 'success' ? 5000 : 30000; | <mask> import { Trans, withNamespaces } from 'react-i18next';
<mask>
<mask> class Toast extends Component {
<mask> componentDidMount() {
<mask> const timeout = this.props.type === 'error' ? 30000 : 5000;
<mask>
<mask> setTimeout(() => {
<mask> this.props.removeToast(this.props.id);
<mask> }, timeout);
<mask> }
</s> * client: add link to the update error </s> remove import { addErrorToast, addSuccessToast, removeToast } from '../actions';
</s> add import { addErrorToast, addSuccessToast, addNoticeToast, removeToast } from '../actions'; </s> remove dispatch(addErrorToast({ error: 'update_failed' }));
</s> add dispatch(addNoticeToast({ error: 'update_failed' })); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/967517316fdc926ee38ef6f356b3af592e73bf00 | client/src/components/Toasts/Toast.js |
showMessage(t, type, message) {
if (type === 'notice') {
return <span dangerouslySetInnerHTML={{ __html: t(message) }} />;
}
return <Trans>{message}</Trans>;
}
| <mask> return false;
<mask> }
<mask>
<mask> render() {
<mask> const {
<mask> type, id, t, message,
<mask> } = this.props;
<mask>
</s> * client: add link to the update error </s> remove dispatch(addErrorToast({ error: 'update_failed_try_later' }));
</s> add dispatch(addNoticeToast({ error: 'update_failed' })); </s> remove import { addErrorToast, addSuccessToast, removeToast } from '../actions';
</s> add import { addErrorToast, addSuccessToast, addNoticeToast, removeToast } from '../actions'; </s> remove const timeout = this.props.type === 'error' ? 30000 : 5000;
</s> add const timeout = this.props.type === 'success' ? 5000 : 30000; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/967517316fdc926ee38ef6f356b3af592e73bf00 | client/src/components/Toasts/Toast.js |
const {
type, id, t, message,
} = this.props;
| <mask> return <Trans>{message}</Trans>;
<mask> }
<mask>
<mask> render() {
<mask> return (
<mask> <div className={`toast toast--${type}`}>
<mask> <p className="toast__content">
<mask> {this.showMessage(t, type, message)}
<mask> </p>
</s> * client: add link to the update error </s> remove <Trans>{this.props.message}</Trans>
</s> add {this.showMessage(t, type, message)} </s> remove <div className={`toast toast--${this.props.type}`}>
</s> add <div className={`toast toast--${type}`}> </s> remove <button className="toast__dismiss" onClick={() => this.props.removeToast(this.props.id)}>
</s> add <button className="toast__dismiss" onClick={() => this.props.removeToast(id)}> | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/967517316fdc926ee38ef6f356b3af592e73bf00 | client/src/components/Toasts/Toast.js |
<div className={`toast toast--${type}`}> | <mask> }
<mask>
<mask> render() {
<mask> return (
<mask> <div className={`toast toast--${this.props.type}`}>
<mask> <p className="toast__content">
<mask> <Trans>{this.props.message}</Trans>
<mask> </p>
<mask> <button className="toast__dismiss" onClick={() => this.props.removeToast(this.props.id)}>
<mask> <svg stroke="#fff" fill="none" width="20" height="20" strokeWidth="2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m18 6-12 12"/><path d="m6 6 12 12"/></svg>
</s> * client: add link to the update error </s> remove <Trans>{this.props.message}</Trans>
</s> add {this.showMessage(t, type, message)} </s> remove <button className="toast__dismiss" onClick={() => this.props.removeToast(this.props.id)}>
</s> add <button className="toast__dismiss" onClick={() => this.props.removeToast(id)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/967517316fdc926ee38ef6f356b3af592e73bf00 | client/src/components/Toasts/Toast.js |
{this.showMessage(t, type, message)} | <mask> render() {
<mask> return (
<mask> <div className={`toast toast--${this.props.type}`}>
<mask> <p className="toast__content">
<mask> <Trans>{this.props.message}</Trans>
<mask> </p>
<mask> <button className="toast__dismiss" onClick={() => this.props.removeToast(this.props.id)}>
<mask> <svg stroke="#fff" fill="none" width="20" height="20" strokeWidth="2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m18 6-12 12"/><path d="m6 6 12 12"/></svg>
<mask> </button>
<mask> </div>
</s> * client: add link to the update error </s> remove <button className="toast__dismiss" onClick={() => this.props.removeToast(this.props.id)}>
</s> add <button className="toast__dismiss" onClick={() => this.props.removeToast(id)}> </s> remove <div className={`toast toast--${this.props.type}`}>
</s> add <div className={`toast toast--${type}`}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/967517316fdc926ee38ef6f356b3af592e73bf00 | client/src/components/Toasts/Toast.js |
<button className="toast__dismiss" onClick={() => this.props.removeToast(id)}> | <mask> <div className={`toast toast--${this.props.type}`}>
<mask> <p className="toast__content">
<mask> <Trans>{this.props.message}</Trans>
<mask> </p>
<mask> <button className="toast__dismiss" onClick={() => this.props.removeToast(this.props.id)}>
<mask> <svg stroke="#fff" fill="none" width="20" height="20" strokeWidth="2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m18 6-12 12"/><path d="m6 6 12 12"/></svg>
<mask> </button>
<mask> </div>
<mask> );
<mask> }
</s> * client: add link to the update error </s> remove <Trans>{this.props.message}</Trans>
</s> add {this.showMessage(t, type, message)} </s> remove <div className={`toast toast--${this.props.type}`}>
</s> add <div className={`toast toast--${type}`}> </s> remove console.log(count);
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/967517316fdc926ee38ef6f356b3af592e73bf00 | client/src/components/Toasts/Toast.js |
t: PropTypes.func.isRequired, | <mask> }
<mask> }
<mask>
<mask> Toast.propTypes = {
<mask> id: PropTypes.string.isRequired,
<mask> message: PropTypes.string.isRequired,
<mask> type: PropTypes.string.isRequired,
<mask> removeToast: PropTypes.func.isRequired,
<mask> };
</s> * client: add link to the update error </s> remove dispatch(addErrorToast({ error: 'update_failed' }));
</s> add dispatch(addNoticeToast({ error: 'update_failed' })); </s> remove import { addErrorToast, addSuccessToast, removeToast } from '../actions';
</s> add import { addErrorToast, addSuccessToast, addNoticeToast, removeToast } from '../actions'; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/967517316fdc926ee38ef6f356b3af592e73bf00 | client/src/components/Toasts/Toast.js |
import { addErrorToast, addSuccessToast, addNoticeToast, removeToast } from '../actions'; | <mask> import { handleActions } from 'redux-actions';
<mask> import nanoid from 'nanoid';
<mask>
<mask> import { addErrorToast, addSuccessToast, removeToast } from '../actions';
<mask>
<mask> const toasts = handleActions({
<mask> [addErrorToast]: (state, { payload }) => {
<mask> const errorToast = {
<mask> id: nanoid(),
</s> * client: add link to the update error </s> remove const timeout = this.props.type === 'error' ? 30000 : 5000;
</s> add const timeout = this.props.type === 'success' ? 5000 : 30000; | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/967517316fdc926ee38ef6f356b3af592e73bf00 | client/src/reducers/toasts.js |
[addNoticeToast]: (state, { payload }) => {
const noticeToast = {
id: nanoid(),
message: payload.error.toString(),
type: 'notice',
};
const newState = { ...state, notices: [...state.notices, noticeToast] };
return newState;
}, | <mask>
<mask> const newState = { ...state, notices: [...state.notices, successToast] };
<mask> return newState;
<mask> },
<mask> [removeToast]: (state, { payload }) => {
<mask> const filtered = state.notices.filter(notice => notice.id !== payload);
<mask> const newState = { ...state, notices: filtered };
<mask> return newState;
<mask> },
<mask> }, { notices: [] });
</s> * client: add link to the update error </s> remove import { addErrorToast, addSuccessToast, removeToast } from '../actions';
</s> add import { addErrorToast, addSuccessToast, addNoticeToast, removeToast } from '../actions'; </s> remove const timeout = this.props.type === 'error' ? 30000 : 5000;
</s> add const timeout = this.props.type === 'success' ? 5000 : 30000; </s> remove dispatch(addErrorToast({ error: 'update_failed' }));
</s> add dispatch(addNoticeToast({ error: 'update_failed' })); | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/967517316fdc926ee38ef6f356b3af592e73bf00 | client/src/reducers/toasts.js |
github.com/AdguardTeam/urlfilter v0.10.0 | <mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.26.0
<mask> github.com/AdguardTeam/golibs v0.4.2
<mask> github.com/AdguardTeam/urlfilter v0.9.1
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/fsnotify/fsnotify v1.4.7
<mask> github.com/gobuffalo/packr v1.30.1
<mask> github.com/joomcode/errorx v1.0.1
<mask> github.com/kardianos/service v1.0.0
</s> *: upd dependencies, go mod tidy </s> remove github.com/AdguardTeam/gomitmproxy v0.1.2/go.mod h1:Mrt/3EfiXIYY2aZ7KsLuCUJzUARD/fWJ119IfzOB13M=
github.com/AdguardTeam/urlfilter v0.9.1 h1:H0q1xig3mZjIEDH0/o2U/ezydwKGwxtQ56hz6LKPN2M=
github.com/AdguardTeam/urlfilter v0.9.1/go.mod h1:GHXPzEG59ezyff22lXSQ7dicj1kFZBrH5kmZ6EvQzfk=
</s> add github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
github.com/AdguardTeam/urlfilter v0.10.0 h1:/YZ4w/UF3KDkL4/QLrQtqalvwBfHHGgrMhk+u3Xm8Mo=
github.com/AdguardTeam/urlfilter v0.10.0/go.mod h1:aMuejlNxpWppOVjiEV87X6z0eMf7wsXHTAIWQuylfZY= </s> remove github.com/AdguardTeam/golibs v0.2.4 h1:GUssokegKxKF13K67Pgl0ZGwqHjNN6X7sep5ik6ORdY=
github.com/AdguardTeam/golibs v0.2.4/go.mod h1:R3M+mAg3nWG4X4Hsag5eef/TckHFH12ZYhK7AzJc8+U=
</s> add </s> remove github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
</s> add </s> remove github.com/joomcode/errorx v0.8.0 h1:GhAqPtcYuo1O7TOIbtzEIDzPGQ3SrKJ3tdjXNmUtDNo=
github.com/joomcode/errorx v0.8.0/go.mod h1:kgco15ekB6cs+4Xjzo7SPeXzx38PbJzBwbnu9qfVNHQ=
</s> add </s> remove github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/96bee3955c263d7cf78531600f9b74581cbe7c5c | go.mod |
<mask> github.com/AdguardTeam/dnsproxy v0.26.0 h1:ZoCy1B8LWj3CF/JBQkmaqtD3TjZGo7K+HXuWA3sIjSM=
<mask> github.com/AdguardTeam/dnsproxy v0.26.0/go.mod h1:hOYFV9TW+pd5XKYz7KZf2FFD8SvSPqjyGTxUae86s58=
<mask> github.com/AdguardTeam/golibs v0.2.4 h1:GUssokegKxKF13K67Pgl0ZGwqHjNN6X7sep5ik6ORdY=
<mask> github.com/AdguardTeam/golibs v0.2.4/go.mod h1:R3M+mAg3nWG4X4Hsag5eef/TckHFH12ZYhK7AzJc8+U=
<mask> github.com/AdguardTeam/golibs v0.4.0 h1:4VX6LoOqFe9p9Gf55BeD8BvJD6M6RDYmgEiHrENE9KU=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2 h1:7M28oTZFoFwNmp8eGPb3ImmYbxGaJLyQXeIFVHjME0o=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/gomitmproxy v0.1.2/go.mod h1:Mrt/3EfiXIYY2aZ7KsLuCUJzUARD/fWJ119IfzOB13M=
</s> *: upd dependencies, go mod tidy </s> remove github.com/AdguardTeam/gomitmproxy v0.1.2/go.mod h1:Mrt/3EfiXIYY2aZ7KsLuCUJzUARD/fWJ119IfzOB13M=
github.com/AdguardTeam/urlfilter v0.9.1 h1:H0q1xig3mZjIEDH0/o2U/ezydwKGwxtQ56hz6LKPN2M=
github.com/AdguardTeam/urlfilter v0.9.1/go.mod h1:GHXPzEG59ezyff22lXSQ7dicj1kFZBrH5kmZ6EvQzfk=
</s> add github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
github.com/AdguardTeam/urlfilter v0.10.0 h1:/YZ4w/UF3KDkL4/QLrQtqalvwBfHHGgrMhk+u3Xm8Mo=
github.com/AdguardTeam/urlfilter v0.10.0/go.mod h1:aMuejlNxpWppOVjiEV87X6z0eMf7wsXHTAIWQuylfZY= </s> remove github.com/AdguardTeam/urlfilter v0.9.1
</s> add github.com/AdguardTeam/urlfilter v0.10.0 </s> remove github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
</s> add </s> remove github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
</s> add </s> remove gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
</s> add | [
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/96bee3955c263d7cf78531600f9b74581cbe7c5c | go.sum | |
github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
github.com/AdguardTeam/urlfilter v0.10.0 h1:/YZ4w/UF3KDkL4/QLrQtqalvwBfHHGgrMhk+u3Xm8Mo=
github.com/AdguardTeam/urlfilter v0.10.0/go.mod h1:aMuejlNxpWppOVjiEV87X6z0eMf7wsXHTAIWQuylfZY= | <mask> github.com/AdguardTeam/golibs v0.4.0 h1:4VX6LoOqFe9p9Gf55BeD8BvJD6M6RDYmgEiHrENE9KU=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2 h1:7M28oTZFoFwNmp8eGPb3ImmYbxGaJLyQXeIFVHjME0o=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/gomitmproxy v0.1.2/go.mod h1:Mrt/3EfiXIYY2aZ7KsLuCUJzUARD/fWJ119IfzOB13M=
<mask> github.com/AdguardTeam/urlfilter v0.9.1 h1:H0q1xig3mZjIEDH0/o2U/ezydwKGwxtQ56hz6LKPN2M=
<mask> github.com/AdguardTeam/urlfilter v0.9.1/go.mod h1:GHXPzEG59ezyff22lXSQ7dicj1kFZBrH5kmZ6EvQzfk=
<mask> github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
<mask> github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
<mask> github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
<mask> github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 h1:UUppSQnhf4Yc6xGxSkoQpPhb7RVzuv5Nb1mwJ5VId9s=
<mask> github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
</s> *: upd dependencies, go mod tidy </s> remove github.com/AdguardTeam/golibs v0.2.4 h1:GUssokegKxKF13K67Pgl0ZGwqHjNN6X7sep5ik6ORdY=
github.com/AdguardTeam/golibs v0.2.4/go.mod h1:R3M+mAg3nWG4X4Hsag5eef/TckHFH12ZYhK7AzJc8+U=
</s> add </s> remove github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 h1:UUppSQnhf4Yc6xGxSkoQpPhb7RVzuv5Nb1mwJ5VId9s=
github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
</s> add github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= </s> remove github.com/AdguardTeam/urlfilter v0.9.1
</s> add github.com/AdguardTeam/urlfilter v0.10.0 </s> remove github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
</s> add </s> remove github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/96bee3955c263d7cf78531600f9b74581cbe7c5c | go.sum |
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= | <mask> github.com/AdguardTeam/urlfilter v0.9.1/go.mod h1:GHXPzEG59ezyff22lXSQ7dicj1kFZBrH5kmZ6EvQzfk=
<mask> github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
<mask> github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
<mask> github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
<mask> github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 h1:UUppSQnhf4Yc6xGxSkoQpPhb7RVzuv5Nb1mwJ5VId9s=
<mask> github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
<mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw=
<mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us=
<mask> github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
</s> *: upd dependencies, go mod tidy </s> remove github.com/AdguardTeam/gomitmproxy v0.1.2/go.mod h1:Mrt/3EfiXIYY2aZ7KsLuCUJzUARD/fWJ119IfzOB13M=
github.com/AdguardTeam/urlfilter v0.9.1 h1:H0q1xig3mZjIEDH0/o2U/ezydwKGwxtQ56hz6LKPN2M=
github.com/AdguardTeam/urlfilter v0.9.1/go.mod h1:GHXPzEG59ezyff22lXSQ7dicj1kFZBrH5kmZ6EvQzfk=
</s> add github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
github.com/AdguardTeam/urlfilter v0.10.0 h1:/YZ4w/UF3KDkL4/QLrQtqalvwBfHHGgrMhk+u3Xm8Mo=
github.com/AdguardTeam/urlfilter v0.10.0/go.mod h1:aMuejlNxpWppOVjiEV87X6z0eMf7wsXHTAIWQuylfZY= </s> remove github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
</s> add </s> remove github.com/AdguardTeam/urlfilter v0.9.1
</s> add github.com/AdguardTeam/urlfilter v0.10.0 </s> remove github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
</s> add </s> remove github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/96bee3955c263d7cf78531600f9b74581cbe7c5c | go.sum |
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
<mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw=
<mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us=
<mask> github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
<mask> github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
<mask> github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
<mask> github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
<mask> github.com/ameshkov/dnscrypt v1.1.0 h1:2vAt5dD6ZmqlAxEAfzRcLBnkvdf8NI46Kn9InSwQbSI=
<mask> github.com/ameshkov/dnscrypt v1.1.0/go.mod h1:ikduAxNLCTEfd1AaCgpIA5TgroIVQ8JY3Vb095fiFJg=
<mask> github.com/ameshkov/dnsstamps v1.0.1 h1:LhGvgWDzhNJh+kBQd/AfUlq1vfVe109huiXw4JhnPug=
<mask> github.com/ameshkov/dnsstamps v1.0.1/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
<mask> github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
</s> *: upd dependencies, go mod tidy </s> remove github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 h1:UUppSQnhf4Yc6xGxSkoQpPhb7RVzuv5Nb1mwJ5VId9s=
github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
</s> add github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= </s> remove github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf h1:eg0MeVzsP1G42dRafH3vf+al2vQIJU0YHX+1Tw87oco=
github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
</s> add github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 h1:zV3ejI06GQ59hwDQAvmK1qxOQGB3WuVTRoY0okPTAv0=
github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= </s> remove github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
</s> add </s> remove github.com/joomcode/errorx v0.8.0 h1:GhAqPtcYuo1O7TOIbtzEIDzPGQ3SrKJ3tdjXNmUtDNo=
github.com/joomcode/errorx v0.8.0/go.mod h1:kgco15ekB6cs+4Xjzo7SPeXzx38PbJzBwbnu9qfVNHQ=
</s> add </s> remove github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/96bee3955c263d7cf78531600f9b74581cbe7c5c | go.sum | |
github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 h1:zV3ejI06GQ59hwDQAvmK1qxOQGB3WuVTRoY0okPTAv0=
github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= | <mask> github.com/ameshkov/dnscrypt v1.1.0/go.mod h1:ikduAxNLCTEfd1AaCgpIA5TgroIVQ8JY3Vb095fiFJg=
<mask> github.com/ameshkov/dnsstamps v1.0.1 h1:LhGvgWDzhNJh+kBQd/AfUlq1vfVe109huiXw4JhnPug=
<mask> github.com/ameshkov/dnsstamps v1.0.1/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
<mask> github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
<mask> github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf h1:eg0MeVzsP1G42dRafH3vf+al2vQIJU0YHX+1Tw87oco=
<mask> github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
<mask> github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6 h1:KXlsf+qt/X5ttPGEjR0tPH1xaWWoKBEg9Q1THAj2h3I=
<mask> github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA=
<mask> github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
<mask> github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
<mask> github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
</s> *: upd dependencies, go mod tidy </s> remove github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
</s> add </s> remove github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
</s> add </s> remove github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
</s> add </s> remove github.com/joomcode/errorx v0.8.0 h1:GhAqPtcYuo1O7TOIbtzEIDzPGQ3SrKJ3tdjXNmUtDNo=
github.com/joomcode/errorx v0.8.0/go.mod h1:kgco15ekB6cs+4Xjzo7SPeXzx38PbJzBwbnu9qfVNHQ=
</s> add </s> remove github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/96bee3955c263d7cf78531600f9b74581cbe7c5c | go.sum |
<mask> github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf h1:eg0MeVzsP1G42dRafH3vf+al2vQIJU0YHX+1Tw87oco=
<mask> github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
<mask> github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6 h1:KXlsf+qt/X5ttPGEjR0tPH1xaWWoKBEg9Q1THAj2h3I=
<mask> github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA=
<mask> github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
<mask> github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
<mask> github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
<mask> github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
<mask> github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
<mask> github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
<mask> github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
</s> *: upd dependencies, go mod tidy </s> remove github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf h1:eg0MeVzsP1G42dRafH3vf+al2vQIJU0YHX+1Tw87oco=
github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
</s> add github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 h1:zV3ejI06GQ59hwDQAvmK1qxOQGB3WuVTRoY0okPTAv0=
github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= </s> remove github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
</s> add </s> remove github.com/AdguardTeam/gomitmproxy v0.1.2/go.mod h1:Mrt/3EfiXIYY2aZ7KsLuCUJzUARD/fWJ119IfzOB13M=
github.com/AdguardTeam/urlfilter v0.9.1 h1:H0q1xig3mZjIEDH0/o2U/ezydwKGwxtQ56hz6LKPN2M=
github.com/AdguardTeam/urlfilter v0.9.1/go.mod h1:GHXPzEG59ezyff22lXSQ7dicj1kFZBrH5kmZ6EvQzfk=
</s> add github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
github.com/AdguardTeam/urlfilter v0.10.0 h1:/YZ4w/UF3KDkL4/QLrQtqalvwBfHHGgrMhk+u3Xm8Mo=
github.com/AdguardTeam/urlfilter v0.10.0/go.mod h1:aMuejlNxpWppOVjiEV87X6z0eMf7wsXHTAIWQuylfZY= </s> remove github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
</s> add </s> remove github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/96bee3955c263d7cf78531600f9b74581cbe7c5c | go.sum |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.