docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep keep keep keep replace keep keep keep keep keep | <mask> Version string `json:"version"`
<mask> Language string `json:"language"`
<mask> DNSAddrs []string `json:"dns_addresses"`
<mask> DNSPort int `json:"dns_port"`
<mask> HTTPPort int `json:"http_port"`
<mask>
<mask> // ProtectionDisabledDuration is the duration of the protection pause in
<mask> // milliseconds.
<mask> ProtectionDisabledDuration int64 `json:"protection_disabled_duration"`
<mask>
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove // BindHost is the address for the web interface server to listen on.
BindHost netip.Addr `yaml:"bind_host"`
// BindPort is the port for the web interface server to listen on.
BindPort int `yaml:"bind_port"`
</s> add // HTTPConfig is the block with http conf.
HTTPConfig httpConfig `yaml:"http"` </s> remove // field ordering is important -- yaml fields will mirror ordering from here
</s> add // httpConfig is a block with HTTP configuration params.
//
// Field ordering is important, YAML fields better not to be reordered, if it's
// not absolutely necessary.
type httpConfig struct {
// Address is the address to serve the web UI on.
Address netip.AddrPort
// SessionTTL for a web session.
// An active session is automatically refreshed once a day.
SessionTTL timeutil.Duration `yaml:"session_ttl"`
}
// dnsConfig is a block with DNS configuration params.
//
// Field ordering is important, YAML fields better not to be reordered, if it's
// not absolutely necessary. </s> remove config.BindHost = req.Web.IP
config.BindPort = req.Web.Port
</s> add config.HTTPConfig.Address = netip.AddrPortFrom(req.Web.IP, uint16(req.Web.Port)) </s> remove return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, uint16(portInt)))
</s> add return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, reqPort)) </s> remove BindPort: 3000,
BindHost: netip.IPv4Unspecified(),
AuthAttempts: 5,
AuthBlockMin: 15,
WebSessionTTLHours: 30 * 24,
</s> add AuthAttempts: 5,
AuthBlockMin: 15,
HTTPConfig: httpConfig{
Address: netip.AddrPortFrom(netip.IPv4Unspecified(), 3000),
SessionTTL: timeutil.Duration{Duration: 30 * timeutil.Day},
}, </s> remove portInt := req.Web.Port
port := tcpPort(portInt)
</s> add // TODO(a.garipov): Declare all port variables anywhere as uint16.
reqPort := uint16(req.Web.Port)
port := tcpPort(reqPort) | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/control.go |
keep keep keep keep replace keep keep keep keep keep | <mask> Version: version.Version(),
<mask> Language: config.Language,
<mask> DNSAddrs: dnsAddrs,
<mask> DNSPort: config.DNS.Port,
<mask> HTTPPort: config.BindPort,
<mask> ProtectionDisabledDuration: protectionDisabledDuration,
<mask> ProtectionEnabled: protectionEnabled,
<mask> IsRunning: isRunning(),
<mask> }
<mask> }()
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove BindHost: config.BindHost,
BindPort: config.BindPort,
</s> add BindHost: config.HTTPConfig.Address.Addr(),
BindPort: int(config.HTTPConfig.Address.Port()), </s> remove port := req.DNS.Port
</s> add port := uint16(req.DNS.Port) </s> remove BindPort: 3000,
BindHost: netip.IPv4Unspecified(),
AuthAttempts: 5,
AuthBlockMin: 15,
WebSessionTTLHours: 30 * 24,
</s> add AuthAttempts: 5,
AuthBlockMin: 15,
HTTPConfig: httpConfig{
Address: netip.AddrPortFrom(netip.IPv4Unspecified(), 3000),
SessionTTL: timeutil.Duration{Duration: 30 * timeutil.Day},
}, </s> remove portInt := req.Web.Port
port := tcpPort(portInt)
</s> add // TODO(a.garipov): Declare all port variables anywhere as uint16.
reqPort := uint16(req.Web.Port)
port := tcpPort(reqPort) </s> add if opts.bindHost.IsValid() {
config.HTTPConfig.Address = netip.AddrPortFrom(
opts.bindHost,
config.HTTPConfig.Address.Port(),
)
}
</s> remove printWebAddrs(proto, addr.String(), config.BindPort)
</s> add printWebAddrs(proto, addr.String(), port) | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/control.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> // be set.
<mask> func (req *checkConfReq) validateWeb(tcpPorts aghalg.UniqChecker[tcpPort]) (err error) {
<mask> defer func() { err = errors.Annotate(err, "validating ports: %w") }()
<mask>
<mask> portInt := req.Web.Port
<mask> port := tcpPort(portInt)
<mask> addPorts(tcpPorts, port)
<mask> if err = tcpPorts.Validate(); err != nil {
<mask> // Reset the value for the port to 1 to make sure that validateDNS
<mask> // doesn't throw the same error, unless the same TCP port is set there
<mask> // as well.
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove port := req.DNS.Port
</s> add port := uint16(req.DNS.Port) </s> remove case config.BindPort:
</s> add case config.HTTPConfig.Address.Port(): </s> remove if opts.bindPort != 0 {
config.BindPort = opts.bindPort
</s> add bindAddr := opts.bindAddr
if bindAddr != (netip.AddrPort{}) {
config.HTTPConfig.Address = bindAddr </s> remove err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
</s> add if config.HTTPConfig.Address.Port() != 0 {
err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
} </s> remove port := config.BindPort
</s> add port := int(config.HTTPConfig.Address.Port()) </s> remove return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, uint16(portInt)))
</s> add return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, reqPort)) | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/controlinstall.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> return err
<mask> }
<mask>
<mask> switch portInt {
<mask> case 0, config.BindPort:
<mask> return nil
<mask> default:
<mask> // Go on and check the port binding only if it's not zero or won't be
<mask> // unbound after install.
<mask> }
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, uint16(portInt)))
</s> add return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, reqPort)) </s> remove case config.BindPort:
</s> add case config.HTTPConfig.Address.Port(): </s> remove port := req.DNS.Port
</s> add port := uint16(req.DNS.Port) </s> remove port := config.BindPort
</s> add port := int(config.HTTPConfig.Address.Port()) </s> remove }
</s> add </s> remove portInt := req.Web.Port
port := tcpPort(portInt)
</s> add // TODO(a.garipov): Declare all port variables anywhere as uint16.
reqPort := uint16(req.Web.Port)
port := tcpPort(reqPort) | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/controlinstall.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // Go on and check the port binding only if it's not zero or won't be
<mask> // unbound after install.
<mask> }
<mask>
<mask> return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, uint16(portInt)))
<mask> }
<mask>
<mask> // validateDNS returns error if the DNS part of the initial configuration can't
<mask> // be set. canAutofix is true if the port can be unbound by AdGuard Home
<mask> // automatically.
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove switch portInt {
case 0, config.BindPort:
</s> add switch reqPort {
case 0, config.HTTPConfig.Address.Port(): </s> remove case config.BindPort:
</s> add case config.HTTPConfig.Address.Port(): </s> remove // field ordering is important -- yaml fields will mirror ordering from here
</s> add // httpConfig is a block with HTTP configuration params.
//
// Field ordering is important, YAML fields better not to be reordered, if it's
// not absolutely necessary.
type httpConfig struct {
// Address is the address to serve the web UI on.
Address netip.AddrPort
// SessionTTL for a web session.
// An active session is automatically refreshed once a day.
SessionTTL timeutil.Duration `yaml:"session_ttl"`
}
// dnsConfig is a block with DNS configuration params.
//
// Field ordering is important, YAML fields better not to be reordered, if it's
// not absolutely necessary. </s> remove portInt := req.Web.Port
port := tcpPort(portInt)
</s> add // TODO(a.garipov): Declare all port variables anywhere as uint16.
reqPort := uint16(req.Web.Port)
port := tcpPort(reqPort) </s> remove return aghnet.CheckPort("tcp", netip.AddrPortFrom(config.BindHost, uint16(port))) == nil
</s> add addrPort := netip.AddrPortFrom(config.HTTPConfig.Address.Addr(), uint16(port))
return aghnet.CheckPort("tcp", addrPort) == nil </s> remove config.BindHost = req.Web.IP
config.BindPort = req.Web.Port
</s> add config.HTTPConfig.Address = netip.AddrPortFrom(req.Web.IP, uint16(req.Web.Port)) | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/controlinstall.go |
keep keep keep replace keep keep keep replace keep keep keep | <mask> ) (canAutofix bool, err error) {
<mask> defer func() { err = errors.Annotate(err, "validating ports: %w") }()
<mask>
<mask> port := req.DNS.Port
<mask> switch port {
<mask> case 0:
<mask> return false, nil
<mask> case config.BindPort:
<mask> // Go on and only check the UDP port since the TCP one is already bound
<mask> // by AdGuard Home for web interface.
<mask> default:
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove switch portInt {
case 0, config.BindPort:
</s> add switch reqPort {
case 0, config.HTTPConfig.Address.Port(): </s> remove portInt := req.Web.Port
port := tcpPort(portInt)
</s> add // TODO(a.garipov): Declare all port variables anywhere as uint16.
reqPort := uint16(req.Web.Port)
port := tcpPort(reqPort) </s> remove return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, uint16(portInt)))
</s> add return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, reqPort)) </s> remove port := config.BindPort
</s> add port := int(config.HTTPConfig.Address.Port()) </s> remove /^bind_port:/ { port = $2 }
END {
if (match(host, ":")) {
print "http://[" host "]:" port
} else {
print "http://" host ":" port
}
}
</s> add /^[[:space:]]+address:/ { if (is_http) print "http://" $2 } | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/controlinstall.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> // copyInstallSettings copies the installation parameters between two
<mask> // configuration structures.
<mask> func copyInstallSettings(dst, src *configuration) {
<mask> dst.BindHost = src.BindHost
<mask> dst.BindPort = src.BindPort
<mask> dst.DNS.BindHosts = src.DNS.BindHosts
<mask> dst.DNS.Port = src.DNS.Port
<mask> }
<mask>
<mask> // shutdownTimeout is the timeout for shutting HTTP server down operation.
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
</s> add if config.HTTPConfig.Address.Port() != 0 {
err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
} </s> remove if opts.bindPort != 0 {
config.BindPort = opts.bindPort
</s> add bindAddr := opts.bindAddr
if bindAddr != (netip.AddrPort{}) {
config.HTTPConfig.Address = bindAddr </s> remove portInt := req.Web.Port
port := tcpPort(portInt)
</s> add // TODO(a.garipov): Declare all port variables anywhere as uint16.
reqPort := uint16(req.Web.Port)
port := tcpPort(reqPort) </s> remove config.BindHost = req.Web.IP
config.BindPort = req.Web.Port
</s> add config.HTTPConfig.Address = netip.AddrPortFrom(req.Web.IP, uint16(req.Web.Port)) </s> remove const currentSchemaVersion = 22
</s> add const currentSchemaVersion = 23 </s> remove return aghnet.CheckPort("tcp", netip.AddrPortFrom(config.BindHost, uint16(port))) == nil
</s> add addrPort := netip.AddrPortFrom(config.HTTPConfig.Address.Addr(), uint16(port))
return aghnet.CheckPort("tcp", addrPort) == nil | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/controlinstall.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> curConfig := &configuration{}
<mask> copyInstallSettings(curConfig, config)
<mask>
<mask> Context.firstRun = false
<mask> config.BindHost = req.Web.IP
<mask> config.BindPort = req.Web.Port
<mask> config.DNS.BindHosts = []netip.Addr{req.DNS.IP}
<mask> config.DNS.Port = req.DNS.Port
<mask>
<mask> // TODO(e.burkov): StartMods() should be put in a separate goroutine at the
<mask> // moment we'll allow setting up TLS in the initial configuration or the
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove restartHTTP = config.BindHost != req.Web.IP || config.BindPort != req.Web.Port
</s> add addrPort := config.HTTPConfig.Address
restartHTTP = addrPort.Addr() != req.Web.IP || int(addrPort.Port()) != req.Web.Port </s> remove // Rewrite deprecated options.
bindAddr := opts.bindAddr
if bindAddr.IsValid() {
config.BindHost = bindAddr.Addr()
config.BindPort = int(bindAddr.Port())
</s> add if opts.bindPort != 0 {
config.HTTPConfig.Address = netip.AddrPortFrom(
config.HTTPConfig.Address.Addr(),
uint16(opts.bindPort),
) </s> remove port := config.BindPort
</s> add port := int(config.HTTPConfig.Address.Port()) </s> remove dst.BindHost = src.BindHost
dst.BindPort = src.BindPort
</s> add dst.HTTPConfig = src.HTTPConfig </s> remove portInt := req.Web.Port
port := tcpPort(portInt)
</s> add // TODO(a.garipov): Declare all port variables anywhere as uint16.
reqPort := uint16(req.Web.Port)
port := tcpPort(reqPort) </s> remove return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, uint16(portInt)))
</s> add return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, reqPort)) | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/controlinstall.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if req.Web.Port == 0 || req.DNS.Port == 0 {
<mask> return nil, false, errors.Error("ports cannot be 0")
<mask> }
<mask>
<mask> restartHTTP = config.BindHost != req.Web.IP || config.BindPort != req.Web.Port
<mask> if restartHTTP {
<mask> err = aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, uint16(req.Web.Port)))
<mask> if err != nil {
<mask> return nil, false, fmt.Errorf(
<mask> "checking address %s:%d: %w",
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove if tlsConfUsesPrivilegedPorts(tlsConf) || config.BindPort < 1024 || config.DNS.Port < 1024 {
</s> add if tlsConfUsesPrivilegedPorts(tlsConf) ||
config.HTTPConfig.Address.Port() < 1024 ||
config.DNS.Port < 1024 { </s> remove err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
</s> add if config.HTTPConfig.Address.Port() != 0 {
err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
} </s> remove // Rewrite deprecated options.
bindAddr := opts.bindAddr
if bindAddr.IsValid() {
config.BindHost = bindAddr.Addr()
config.BindPort = int(bindAddr.Port())
</s> add if opts.bindPort != 0 {
config.HTTPConfig.Address = netip.AddrPortFrom(
config.HTTPConfig.Address.Addr(),
uint16(opts.bindPort),
) </s> remove if opts.bindPort != 0 {
config.BindPort = opts.bindPort
</s> add bindAddr := opts.bindAddr
if bindAddr != (netip.AddrPort{}) {
config.HTTPConfig.Address = bindAddr </s> remove return aghnet.CheckPort("tcp", netip.AddrPortFrom(config.BindHost, uint16(port))) == nil
</s> add addrPort := netip.AddrPortFrom(config.HTTPConfig.Address.Addr(), uint16(port))
return aghnet.CheckPort("tcp", addrPort) == nil </s> remove port := config.BindPort
</s> add port := int(config.HTTPConfig.Address.Port()) | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/controlinstall.go |
keep keep keep keep replace keep keep keep keep keep | <mask> tlsConf := &tlsConfigSettings{}
<mask> Context.tls.WriteDiskConfig(tlsConf)
<mask>
<mask> canUpdate := true
<mask> if tlsConfUsesPrivilegedPorts(tlsConf) || config.BindPort < 1024 || config.DNS.Port < 1024 {
<mask> canUpdate, err = aghnet.CanBindPrivilegedPorts()
<mask> if err != nil {
<mask> return fmt.Errorf("checking ability to bind privileged ports: %w", err)
<mask> }
<mask> }
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove restartHTTP = config.BindHost != req.Web.IP || config.BindPort != req.Web.Port
</s> add addrPort := config.HTTPConfig.Address
restartHTTP = addrPort.Addr() != req.Web.IP || int(addrPort.Port()) != req.Web.Port </s> remove if opts.bindPort != 0 {
config.BindPort = opts.bindPort
</s> add bindAddr := opts.bindAddr
if bindAddr != (netip.AddrPort{}) {
config.HTTPConfig.Address = bindAddr </s> remove return aghnet.CheckPort("tcp", netip.AddrPortFrom(config.BindHost, uint16(port))) == nil
</s> add addrPort := netip.AddrPortFrom(config.HTTPConfig.Address.Addr(), uint16(port))
return aghnet.CheckPort("tcp", addrPort) == nil </s> remove err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
</s> add if config.HTTPConfig.Address.Port() != 0 {
err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
} </s> remove // Rewrite deprecated options.
bindAddr := opts.bindAddr
if bindAddr.IsValid() {
config.BindHost = bindAddr.Addr()
config.BindPort = int(bindAddr.Port())
</s> add if opts.bindPort != 0 {
config.HTTPConfig.Address = netip.AddrPortFrom(
config.HTTPConfig.Address.Addr(),
uint16(opts.bindPort),
) </s> remove port := config.BindPort
</s> add port := int(config.HTTPConfig.Address.Port()) | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/controlupdate.go |
keep keep keep replace replace keep replace replace replace replace keep keep keep keep | <mask>
<mask> // setupBindOpts overrides bind host/port from the opts.
<mask> func setupBindOpts(opts options) (err error) {
<mask> if opts.bindPort != 0 {
<mask> config.BindPort = opts.bindPort
<mask>
<mask> err = checkPorts()
<mask> if err != nil {
<mask> // Don't wrap the error, because it's informative enough as is.
<mask> return err
<mask> }
<mask> }
<mask>
<mask> if opts.bindHost.IsValid() {
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove // Rewrite deprecated options.
bindAddr := opts.bindAddr
if bindAddr.IsValid() {
config.BindHost = bindAddr.Addr()
config.BindPort = int(bindAddr.Port())
</s> add if opts.bindPort != 0 {
config.HTTPConfig.Address = netip.AddrPortFrom(
config.HTTPConfig.Address.Addr(),
uint16(opts.bindPort),
) </s> remove }
</s> add </s> remove portInt := req.Web.Port
port := tcpPort(portInt)
</s> add // TODO(a.garipov): Declare all port variables anywhere as uint16.
reqPort := uint16(req.Web.Port)
port := tcpPort(reqPort) </s> remove restartHTTP = config.BindHost != req.Web.IP || config.BindPort != req.Web.Port
</s> add addrPort := config.HTTPConfig.Address
restartHTTP = addrPort.Addr() != req.Web.IP || int(addrPort.Port()) != req.Web.Port </s> remove if tlsConfUsesPrivilegedPorts(tlsConf) || config.BindPort < 1024 || config.DNS.Port < 1024 {
</s> add if tlsConfUsesPrivilegedPorts(tlsConf) ||
config.HTTPConfig.Address.Port() < 1024 ||
config.DNS.Port < 1024 { | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/home.go |
keep keep replace keep replace replace keep | <mask> return err
<mask> }
<mask> }
<mask>
<mask> if opts.bindHost.IsValid() {
<mask> config.BindHost = opts.bindHost
<mask> }
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
</s> add if config.HTTPConfig.Address.Port() != 0 {
err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
} </s> remove // Rewrite deprecated options.
bindAddr := opts.bindAddr
if bindAddr.IsValid() {
config.BindHost = bindAddr.Addr()
config.BindPort = int(bindAddr.Port())
</s> add if opts.bindPort != 0 {
config.HTTPConfig.Address = netip.AddrPortFrom(
config.HTTPConfig.Address.Addr(),
uint16(opts.bindPort),
) </s> add if opts.bindHost.IsValid() {
config.HTTPConfig.Address = netip.AddrPortFrom(
opts.bindHost,
config.HTTPConfig.Address.Port(),
)
}
</s> remove bindhost := config.BindHost
if !bindhost.IsUnspecified() {
printWebAddrs(proto, bindhost.String(), port)
</s> add bindHost := config.HTTPConfig.Address.Addr()
if !bindHost.IsUnspecified() {
printWebAddrs(proto, bindHost.String(), port) </s> remove /^bind_port:/ { port = $2 }
END {
if (match(host, ":")) {
print "http://[" host "]:" port
} else {
print "http://" host ":" port
}
}
</s> add /^[[:space:]]+address:/ { if (is_http) print "http://" $2 } | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/home.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> if opts.bindHost.IsValid() {
<mask> config.BindHost = opts.bindHost
<mask> }
<mask>
<mask> // Rewrite deprecated options.
<mask> bindAddr := opts.bindAddr
<mask> if bindAddr.IsValid() {
<mask> config.BindHost = bindAddr.Addr()
<mask> config.BindPort = int(bindAddr.Port())
<mask>
<mask> err = checkPorts()
<mask> if err != nil {
<mask> // Don't wrap the error, because it's informative enough as is.
<mask> return err
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
</s> add if config.HTTPConfig.Address.Port() != 0 {
err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
} </s> remove }
</s> add </s> remove if opts.bindHost.IsValid() {
config.BindHost = opts.bindHost
</s> add return nil </s> remove if opts.bindPort != 0 {
config.BindPort = opts.bindPort
</s> add bindAddr := opts.bindAddr
if bindAddr != (netip.AddrPort{}) {
config.HTTPConfig.Address = bindAddr </s> remove restartHTTP = config.BindHost != req.Web.IP || config.BindPort != req.Web.Port
</s> add addrPort := config.HTTPConfig.Address
restartHTTP = addrPort.Addr() != req.Web.IP || int(addrPort.Port()) != req.Web.Port </s> remove portInt := req.Web.Port
port := tcpPort(portInt)
</s> add // TODO(a.garipov): Declare all port variables anywhere as uint16.
reqPort := uint16(req.Web.Port)
port := tcpPort(reqPort) | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/home.go |
keep keep keep add keep keep keep keep | <mask> return err
<mask> }
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // setupDNSFilteringConf sets up DNS filtering configuration settings.
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, uint16(portInt)))
</s> add return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, reqPort)) </s> remove if opts.bindHost.IsValid() {
config.BindHost = opts.bindHost
</s> add return nil </s> remove }
</s> add </s> remove return aghnet.CheckPort("tcp", netip.AddrPortFrom(config.BindHost, uint16(port))) == nil
</s> add addrPort := netip.AddrPortFrom(config.HTTPConfig.Address.Addr(), uint16(port))
return aghnet.CheckPort("tcp", addrPort) == nil </s> remove err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
</s> add if config.HTTPConfig.Address.Port() != 0 {
err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
} </s> remove switch portInt {
case 0, config.BindPort:
</s> add switch reqPort {
case 0, config.HTTPConfig.Address.Port(): | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> // checkPorts is a helper for ports validation in config.
<mask> func checkPorts() (err error) {
<mask> tcpPorts := aghalg.UniqChecker[tcpPort]{}
<mask> addPorts(tcpPorts, tcpPort(config.BindPort))
<mask>
<mask> udpPorts := aghalg.UniqChecker[udpPort]{}
<mask> addPorts(udpPorts, udpPort(config.DNS.Port))
<mask>
<mask> if config.TLS.Enabled {
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove addPorts(tcpPorts, tcpPort(config.BindPort))
</s> add addPorts(tcpPorts, tcpPort(config.HTTPConfig.Address.Port())) </s> remove if !conf.BindHost.IsValid() {
return errors.Error("bind_host is not a valid ip address")
</s> add if !conf.HTTPConfig.Address.IsValid() {
return errors.Error("http.address is not a valid ip address") </s> remove if opts.bindPort != 0 {
config.BindPort = opts.bindPort
</s> add bindAddr := opts.bindAddr
if bindAddr != (netip.AddrPort{}) {
config.HTTPConfig.Address = bindAddr </s> remove portInt := req.Web.Port
port := tcpPort(portInt)
</s> add // TODO(a.garipov): Declare all port variables anywhere as uint16.
reqPort := uint16(req.Web.Port)
port := tcpPort(reqPort) </s> remove err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
</s> add if config.HTTPConfig.Address.Port() != 0 {
err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
} </s> remove port := req.DNS.Port
</s> add port := uint16(req.DNS.Port) | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/home.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> }
<mask>
<mask> webConf := webConfig{
<mask> firstRun: Context.firstRun,
<mask> BindHost: config.BindHost,
<mask> BindPort: config.BindPort,
<mask>
<mask> ReadTimeout: readTimeout,
<mask> ReadHeaderTimeout: readHdrTimeout,
<mask> WriteTimeout: writeTimeout,
<mask>
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove HTTPPort: config.BindPort,
</s> add HTTPPort: config.HTTPConfig.Address.Port(), </s> remove BindPort: 3000,
BindHost: netip.IPv4Unspecified(),
AuthAttempts: 5,
AuthBlockMin: 15,
WebSessionTTLHours: 30 * 24,
</s> add AuthAttempts: 5,
AuthBlockMin: 15,
HTTPConfig: httpConfig{
Address: netip.AddrPortFrom(netip.IPv4Unspecified(), 3000),
SessionTTL: timeutil.Duration{Duration: 30 * timeutil.Day},
}, </s> remove printWebAddrs(proto, addr.String(), config.BindPort)
</s> add printWebAddrs(proto, addr.String(), port) </s> remove bindhost := config.BindHost
if !bindhost.IsUnspecified() {
printWebAddrs(proto, bindhost.String(), port)
</s> add bindHost := config.HTTPConfig.Address.Addr()
if !bindHost.IsUnspecified() {
printWebAddrs(proto, bindHost.String(), port) </s> add upgradeSchema22to23, </s> remove if opts.bindHost.IsValid() {
config.BindHost = opts.bindHost
</s> add return nil | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/home.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> } else {
<mask> log.Info("authratelimiter is disabled")
<mask> }
<mask>
<mask> sessionTTL := config.WebSessionTTLHours * 60 * 60
<mask> auth = InitAuth(sessFilename, config.Users, sessionTTL, rateLimiter)
<mask> if auth == nil {
<mask> return nil, errors.Error("initializing auth module failed")
<mask> }
<mask>
<mask> config.Users = nil
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove restartHTTP = config.BindHost != req.Web.IP || config.BindPort != req.Web.Port
</s> add addrPort := config.HTTPConfig.Address
restartHTTP = addrPort.Addr() != req.Web.IP || int(addrPort.Port()) != req.Web.Port </s> remove port := config.BindPort
</s> add port := int(config.HTTPConfig.Address.Port()) </s> remove /^bind_port:/ { port = $2 }
END {
if (match(host, ":")) {
print "http://[" host "]:" port
} else {
print "http://" host ":" port
}
}
</s> add /^[[:space:]]+address:/ { if (is_http) print "http://" $2 } </s> remove if opts.bindHost.IsValid() {
config.BindHost = opts.bindHost
</s> add return nil </s> remove return aghnet.CheckPort("tcp", netip.AddrPortFrom(config.BindHost, uint16(port))) == nil
</s> add addrPort := netip.AddrPortFrom(config.HTTPConfig.Address.Addr(), uint16(port))
return aghnet.CheckPort("tcp", addrPort) == nil </s> remove err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
</s> add if config.HTTPConfig.Address.Port() != 0 {
err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
} | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if Context.tls != nil {
<mask> Context.tls.WriteDiskConfig(&tlsConf)
<mask> }
<mask>
<mask> port := config.BindPort
<mask> if proto == aghhttp.SchemeHTTPS {
<mask> port = tlsConf.PortHTTPS
<mask> }
<mask>
<mask> // TODO(e.burkov): Inspect and perhaps merge with the previous condition.
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove return aghnet.CheckPort("tcp", netip.AddrPortFrom(config.BindHost, uint16(port))) == nil
</s> add addrPort := netip.AddrPortFrom(config.HTTPConfig.Address.Addr(), uint16(port))
return aghnet.CheckPort("tcp", addrPort) == nil </s> remove restartHTTP = config.BindHost != req.Web.IP || config.BindPort != req.Web.Port
</s> add addrPort := config.HTTPConfig.Address
restartHTTP = addrPort.Addr() != req.Web.IP || int(addrPort.Port()) != req.Web.Port </s> remove err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
</s> add if config.HTTPConfig.Address.Port() != 0 {
err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
} </s> remove if opts.bindPort != 0 {
config.BindPort = opts.bindPort
</s> add bindAddr := opts.bindAddr
if bindAddr != (netip.AddrPort{}) {
config.HTTPConfig.Address = bindAddr </s> remove // Rewrite deprecated options.
bindAddr := opts.bindAddr
if bindAddr.IsValid() {
config.BindHost = bindAddr.Addr()
config.BindPort = int(bindAddr.Port())
</s> add if opts.bindPort != 0 {
config.HTTPConfig.Address = netip.AddrPortFrom(
config.HTTPConfig.Address.Addr(),
uint16(opts.bindPort),
) </s> remove /^bind_port:/ { port = $2 }
END {
if (match(host, ":")) {
print "http://[" host "]:" port
} else {
print "http://" host ":" port
}
}
</s> add /^[[:space:]]+address:/ { if (is_http) print "http://" $2 } | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/home.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask>
<mask> return
<mask> }
<mask>
<mask> bindhost := config.BindHost
<mask> if !bindhost.IsUnspecified() {
<mask> printWebAddrs(proto, bindhost.String(), port)
<mask>
<mask> return
<mask> }
<mask>
<mask> ifaces, err := aghnet.GetValidNetInterfacesForWeb()
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove printWebAddrs(proto, bindhost.String(), port)
</s> add printWebAddrs(proto, bindHost.String(), port) </s> remove printWebAddrs(proto, addr.String(), config.BindPort)
</s> add printWebAddrs(proto, addr.String(), port) </s> remove if opts.bindHost.IsValid() {
config.BindHost = opts.bindHost
</s> add return nil </s> remove // Rewrite deprecated options.
bindAddr := opts.bindAddr
if bindAddr.IsValid() {
config.BindHost = bindAddr.Addr()
config.BindPort = int(bindAddr.Port())
</s> add if opts.bindPort != 0 {
config.HTTPConfig.Address = netip.AddrPortFrom(
config.HTTPConfig.Address.Addr(),
uint16(opts.bindPort),
) </s> remove }
</s> add </s> remove addPorts(tcpPorts, tcpPort(config.BindPort))
</s> add addPorts(tcpPorts, tcpPort(config.HTTPConfig.Address.Port())) | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask> log.Error("web: getting iface ips: %s", err)
<mask> // That's weird, but we'll ignore it.
<mask> //
<mask> // TODO(e.burkov): Find out when it happens.
<mask> printWebAddrs(proto, bindhost.String(), port)
<mask>
<mask> return
<mask> }
<mask>
<mask> for _, iface := range ifaces {
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove printWebAddrs(proto, addr.String(), config.BindPort)
</s> add printWebAddrs(proto, addr.String(), port) </s> remove bindhost := config.BindHost
if !bindhost.IsUnspecified() {
printWebAddrs(proto, bindhost.String(), port)
</s> add bindHost := config.HTTPConfig.Address.Addr()
if !bindHost.IsUnspecified() {
printWebAddrs(proto, bindHost.String(), port) </s> remove port := config.BindPort
</s> add port := int(config.HTTPConfig.Address.Port()) </s> remove config.BindHost = req.Web.IP
config.BindPort = req.Web.Port
</s> add config.HTTPConfig.Address = netip.AddrPortFrom(req.Web.IP, uint16(req.Web.Port)) </s> remove // field ordering is important -- yaml fields will mirror ordering from here
</s> add // httpConfig is a block with HTTP configuration params.
//
// Field ordering is important, YAML fields better not to be reordered, if it's
// not absolutely necessary.
type httpConfig struct {
// Address is the address to serve the web UI on.
Address netip.AddrPort
// SessionTTL for a web session.
// An active session is automatically refreshed once a day.
SessionTTL timeutil.Duration `yaml:"session_ttl"`
}
// dnsConfig is a block with DNS configuration params.
//
// Field ordering is important, YAML fields better not to be reordered, if it's
// not absolutely necessary. </s> remove portInt := req.Web.Port
port := tcpPort(portInt)
</s> add // TODO(a.garipov): Declare all port variables anywhere as uint16.
reqPort := uint16(req.Web.Port)
port := tcpPort(reqPort) | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> for _, iface := range ifaces {
<mask> for _, addr := range iface.Addresses {
<mask> printWebAddrs(proto, addr.String(), config.BindPort)
<mask> }
<mask> }
<mask> }
<mask>
<mask> // -------------------
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove printWebAddrs(proto, bindhost.String(), port)
</s> add printWebAddrs(proto, bindHost.String(), port) </s> add upgradeSchema22to23, </s> remove bindhost := config.BindHost
if !bindhost.IsUnspecified() {
printWebAddrs(proto, bindhost.String(), port)
</s> add bindHost := config.HTTPConfig.Address.Addr()
if !bindHost.IsUnspecified() {
printWebAddrs(proto, bindHost.String(), port) </s> remove if !conf.BindHost.IsValid() {
return errors.Error("bind_host is not a valid ip address")
</s> add if !conf.HTTPConfig.Address.IsValid() {
return errors.Error("http.address is not a valid ip address") </s> remove if opts.bindHost.IsValid() {
config.BindHost = opts.bindHost
</s> add return nil </s> remove port := config.BindPort
</s> add port := int(config.HTTPConfig.Address.Port()) | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> if setts.Enabled {
<mask> err = validatePorts(
<mask> tcpPort(config.BindPort),
<mask> tcpPort(setts.PortHTTPS),
<mask> tcpPort(setts.PortDNSOverTLS),
<mask> tcpPort(setts.PortDNSCrypt),
<mask> udpPort(config.DNS.Port),
<mask> udpPort(setts.PortDNSOverQUIC),
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove tcpPort(config.BindPort),
</s> add tcpPort(config.HTTPConfig.Address.Port()), </s> remove err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
</s> add if config.HTTPConfig.Address.Port() != 0 {
err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
} </s> remove }
</s> add </s> remove if opts.bindHost.IsValid() {
config.BindHost = opts.bindHost
</s> add return nil </s> remove // Rewrite deprecated options.
bindAddr := opts.bindAddr
if bindAddr.IsValid() {
config.BindHost = bindAddr.Addr()
config.BindPort = int(bindAddr.Port())
</s> add if opts.bindPort != 0 {
config.HTTPConfig.Address = netip.AddrPortFrom(
config.HTTPConfig.Address.Addr(),
uint16(opts.bindPort),
) </s> remove if opts.bindPort != 0 {
config.BindPort = opts.bindPort
</s> add bindAddr := opts.bindAddr
if bindAddr != (netip.AddrPort{}) {
config.HTTPConfig.Address = bindAddr | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/tls.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> if req.Enabled {
<mask> err = validatePorts(
<mask> tcpPort(config.BindPort),
<mask> tcpPort(req.PortHTTPS),
<mask> tcpPort(req.PortDNSOverTLS),
<mask> tcpPort(req.PortDNSCrypt),
<mask> udpPort(config.DNS.Port),
<mask> udpPort(req.PortDNSOverQUIC),
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove tcpPort(config.BindPort),
</s> add tcpPort(config.HTTPConfig.Address.Port()), </s> remove err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
</s> add if config.HTTPConfig.Address.Port() != 0 {
err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
} </s> remove }
</s> add </s> remove if opts.bindHost.IsValid() {
config.BindHost = opts.bindHost
</s> add return nil </s> remove // Rewrite deprecated options.
bindAddr := opts.bindAddr
if bindAddr.IsValid() {
config.BindHost = bindAddr.Addr()
config.BindPort = int(bindAddr.Port())
</s> add if opts.bindPort != 0 {
config.HTTPConfig.Address = netip.AddrPortFrom(
config.HTTPConfig.Address.Addr(),
uint16(opts.bindPort),
) </s> remove if opts.bindPort != 0 {
config.BindPort = opts.bindPort
</s> add bindAddr := opts.bindAddr
if bindAddr != (netip.AddrPort{}) {
config.HTTPConfig.Address = bindAddr | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/tls.go |
keep add keep keep keep keep | <mask> "bytes"
<mask> "fmt"
<mask> "net/url"
<mask> "os"
<mask> "path"
<mask> "path/filepath"
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove return aghnet.CheckPort("tcp", netip.AddrPortFrom(config.BindHost, uint16(port))) == nil
</s> add addrPort := netip.AddrPortFrom(config.HTTPConfig.Address.Addr(), uint16(port))
return aghnet.CheckPort("tcp", addrPort) == nil </s> remove HTTPPort int `json:"http_port"`
</s> add HTTPPort uint16 `json:"http_port"` </s> remove dst.BindHost = src.BindHost
dst.BindPort = src.BindPort
</s> add dst.HTTPConfig = src.HTTPConfig </s> remove case config.BindPort:
</s> add case config.HTTPConfig.Address.Port(): </s> remove port := req.DNS.Port
</s> add port := uint16(req.DNS.Port) </s> remove return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, uint16(portInt)))
</s> add return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, reqPort)) | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/upgrade.go |
keep keep keep keep replace keep keep keep keep keep | <mask> yaml "gopkg.in/yaml.v3"
<mask> )
<mask>
<mask> // currentSchemaVersion is the current schema version.
<mask> const currentSchemaVersion = 22
<mask>
<mask> // These aliases are provided for convenience.
<mask> type (
<mask> yarr = []any
<mask> yobj = map[string]any
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove dst.BindHost = src.BindHost
dst.BindPort = src.BindPort
</s> add dst.HTTPConfig = src.HTTPConfig </s> remove // Rewrite deprecated options.
bindAddr := opts.bindAddr
if bindAddr.IsValid() {
config.BindHost = bindAddr.Addr()
config.BindPort = int(bindAddr.Port())
</s> add if opts.bindPort != 0 {
config.HTTPConfig.Address = netip.AddrPortFrom(
config.HTTPConfig.Address.Addr(),
uint16(opts.bindPort),
) </s> remove // field ordering is important -- yaml fields will mirror ordering from here
</s> add // httpConfig is a block with HTTP configuration params.
//
// Field ordering is important, YAML fields better not to be reordered, if it's
// not absolutely necessary.
type httpConfig struct {
// Address is the address to serve the web UI on.
Address netip.AddrPort
// SessionTTL for a web session.
// An active session is automatically refreshed once a day.
SessionTTL timeutil.Duration `yaml:"session_ttl"`
}
// dnsConfig is a block with DNS configuration params.
//
// Field ordering is important, YAML fields better not to be reordered, if it's
// not absolutely necessary. </s> remove // BindHost is the address for the web interface server to listen on.
BindHost netip.Addr `yaml:"bind_host"`
// BindPort is the port for the web interface server to listen on.
BindPort int `yaml:"bind_port"`
</s> add // HTTPConfig is the block with http conf.
HTTPConfig httpConfig `yaml:"http"` </s> remove config.BindHost = req.Web.IP
config.BindPort = req.Web.Port
</s> add config.HTTPConfig.Address = netip.AddrPortFrom(req.Web.IP, uint16(req.Web.Port)) </s> remove // configuration is loaded from YAML
// field ordering is important -- yaml fields will mirror ordering from here
</s> add // configuration is loaded from YAML.
//
// Field ordering is important, YAML fields better not to be reordered, if it's
// not absolutely necessary. | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/upgrade.go |
keep add keep keep keep keep | <mask> upgradeSchema20to21,
<mask> upgradeSchema21to22,
<mask> }
<mask>
<mask> n := 0
<mask> for i, u := range upgrades {
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove printWebAddrs(proto, addr.String(), config.BindPort)
</s> add printWebAddrs(proto, addr.String(), port) </s> remove if !conf.BindHost.IsValid() {
return errors.Error("bind_host is not a valid ip address")
</s> add if !conf.HTTPConfig.Address.IsValid() {
return errors.Error("http.address is not a valid ip address") </s> remove printWebAddrs(proto, bindhost.String(), port)
</s> add printWebAddrs(proto, bindHost.String(), port) </s> remove restartHTTP = config.BindHost != req.Web.IP || config.BindPort != req.Web.Port
</s> add addrPort := config.HTTPConfig.Address
restartHTTP = addrPort.Addr() != req.Web.IP || int(addrPort.Port()) != req.Web.Port </s> remove bindhost := config.BindHost
if !bindhost.IsUnspecified() {
printWebAddrs(proto, bindhost.String(), port)
</s> add bindHost := config.HTTPConfig.Address.Addr()
if !bindHost.IsUnspecified() {
printWebAddrs(proto, bindHost.String(), port) </s> remove if opts.bindPort != 0 {
config.BindPort = opts.bindPort
</s> add bindAddr := opts.bindAddr
if bindAddr != (netip.AddrPort{}) {
config.HTTPConfig.Address = bindAddr | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/upgrade.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if Context.web.httpsServer.server != nil {
<mask> return true
<mask> }
<mask>
<mask> return aghnet.CheckPort("tcp", netip.AddrPortFrom(config.BindHost, uint16(port))) == nil
<mask> }
<mask>
<mask> // tlsConfigChanged updates the TLS configuration and restarts the HTTPS server
<mask> // if necessary.
<mask> func (web *webAPI) tlsConfigChanged(ctx context.Context, tlsConf tlsConfigSettings) {
</s> Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <[email protected]>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <[email protected]>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <[email protected]>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <[email protected]>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits </s> remove return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, uint16(portInt)))
</s> add return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, reqPort)) </s> remove port := config.BindPort
</s> add port := int(config.HTTPConfig.Address.Port()) </s> remove err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
</s> add if config.HTTPConfig.Address.Port() != 0 {
err = checkPorts()
if err != nil {
// Don't wrap the error, because it's informative enough as is.
return err
} </s> remove if opts.bindPort != 0 {
config.BindPort = opts.bindPort
</s> add bindAddr := opts.bindAddr
if bindAddr != (netip.AddrPort{}) {
config.HTTPConfig.Address = bindAddr </s> remove }
</s> add </s> remove if tlsConfUsesPrivilegedPorts(tlsConf) || config.BindPort < 1024 || config.DNS.Port < 1024 {
</s> add if tlsConfUsesPrivilegedPorts(tlsConf) ||
config.HTTPConfig.Address.Port() < 1024 ||
config.DNS.Port < 1024 { | https://github.com/AdguardTeam/AdGuardHome/commit/39f5c50acd9da08dca22a0a3170f3f47446210df | internal/home/web.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> "net/http"
<mask> "os"
<mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<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: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghos" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghos" | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/dhcpd/http.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> func (s *Server) enableDHCP(ifaceName string) (code int, err error) {
<mask> var hasStaticIP bool
<mask> hasStaticIP, err = sysutil.IfaceHasStaticIP(ifaceName)
<mask> if err != nil {
<mask> if errors.Is(err, os.ErrPermission) {
<mask> // ErrPermission may happen here on Linux systems where
<mask> // AdGuard Home is installed using Snap. That doesn't
<mask> // necessarily mean that the machine doesn't have
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
</s> add isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName) </s> remove err := sysutil.ConfigureSyslog(serviceName)
</s> add err := aghos.ConfigureSyslog(serviceName) </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() </s> remove ifaces, err := util.GetValidNetInterfaces()
</s> add ifaces, err := aghnet.GetValidNetInterfaces() </s> remove err = util.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
</s> add err = aghnet.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port) </s> remove ok, err := util.CanBindPort(53)
</s> add ok, err := aghnet.CanBindPort(53) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/dhcpd/http.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // to log it. Think about it more.
<mask> log.Info("error while checking static ip: %s; "+
<mask> "assuming machine has static ip and going on", err)
<mask> hasStaticIP = true
<mask> } else if errors.Is(err, sysutil.ErrNoStaticIPInfo) {
<mask> // Couldn't obtain a definitive answer. Assume static
<mask> // IP an go on.
<mask> log.Info("can't check for static ip; " +
<mask> "assuming machine has static ip and going on")
<mask> hasStaticIP = true
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
</s> add isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName) </s> remove err := sysutil.IfaceSetStaticIP(interfaceName)
</s> add err := aghnet.IfaceSetStaticIP(interfaceName) </s> remove err = sysutil.IfaceSetStaticIP(ifaceName)
</s> add err = aghnet.IfaceSetStaticIP(ifaceName) </s> remove hasStaticIP, err = sysutil.IfaceHasStaticIP(ifaceName)
</s> add hasStaticIP, err = aghnet.IfaceHasStaticIP(ifaceName) </s> remove err := util.CheckPortAvailable(config.BindHost, port)
</s> add err := aghnet.CheckPortAvailable(config.BindHost, port) </s> remove err = util.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
</s> add err = aghnet.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/dhcpd/http.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> if !hasStaticIP {
<mask> err = sysutil.IfaceSetStaticIP(ifaceName)
<mask> if err != nil {
<mask> err = fmt.Errorf("setting static ip: %w", err)
<mask>
<mask> return http.StatusInternalServerError, err
<mask> }
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove err = util.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err := sysutil.IfaceSetStaticIP(interfaceName)
</s> add err := aghnet.IfaceSetStaticIP(interfaceName) </s> remove err = util.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove err := util.CheckPortAvailable(config.BindHost, port)
</s> add err := aghnet.CheckPortAvailable(config.BindHost, port) </s> remove isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
</s> add isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/dhcpd/http.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> func (s *Server) handleDHCPInterfaces(w http.ResponseWriter, r *http.Request) {
<mask> response := map[string]netInterfaceJSON{}
<mask>
<mask> ifaces, err := util.GetValidNetInterfaces()
<mask> if err != nil {
<mask> httpError(r, w, http.StatusInternalServerError, "Couldn't get interfaces: %s", err)
<mask> return
<mask> }
<mask>
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() </s> remove ifaces, e := util.GetValidNetInterfacesForWeb()
</s> add ifaces, e := aghnet.GetValidNetInterfacesForWeb() </s> remove data.Interfaces = make(map[string]*util.NetInterface)
</s> add data.Interfaces = make(map[string]*aghnet.NetInterface) </s> remove err = sysutil.IfaceSetStaticIP(ifaceName)
</s> add err = aghnet.IfaceSetStaticIP(ifaceName) </s> remove WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"`
Interfaces map[string]*util.NetInterface `json:"interfaces"`
</s> add WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"`
Interfaces map[string]*aghnet.NetInterface `json:"interfaces"` | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/dhcpd/http.go |
keep keep keep keep replace keep keep keep keep keep | <mask> jsonIface.Addrs6 = append(jsonIface.Addrs6, ipnet.IP)
<mask> }
<mask> }
<mask> if len(jsonIface.Addrs4)+len(jsonIface.Addrs6) != 0 {
<mask> jsonIface.GatewayIP = sysutil.GatewayIP(iface.Name)
<mask> response[iface.Name] = jsonIface
<mask> }
<mask> }
<mask>
<mask> err = json.NewEncoder(w).Encode(response)
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) </s> remove err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = sysutil.IfaceSetStaticIP(ifaceName)
</s> add err = aghnet.IfaceSetStaticIP(ifaceName) </s> remove err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = util.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/dhcpd/http.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> found4, err4 := CheckIfOtherDHCPServersPresentV4(interfaceName)
<mask>
<mask> isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
<mask> if err != nil {
<mask> result.V4.StaticIP.Static = "error"
<mask> result.V4.StaticIP.Error = err.Error()
<mask> } else if !isStaticIP {
<mask> result.V4.StaticIP.Static = "no"
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove result.V4.StaticIP.IP = util.GetSubnet(interfaceName).String()
</s> add result.V4.StaticIP.IP = aghnet.GetSubnet(interfaceName).String() </s> remove isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
</s> add isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName) </s> remove err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err := sysutil.IfaceSetStaticIP(interfaceName)
</s> add err := aghnet.IfaceSetStaticIP(interfaceName) </s> remove err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) </s> remove err = sysutil.IfaceSetStaticIP(ifaceName)
</s> add err = aghnet.IfaceSetStaticIP(ifaceName) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/dhcpd/http.go |
keep keep keep keep replace keep keep keep keep keep | <mask> result.V4.StaticIP.Static = "error"
<mask> result.V4.StaticIP.Error = err.Error()
<mask> } else if !isStaticIP {
<mask> result.V4.StaticIP.Static = "no"
<mask> result.V4.StaticIP.IP = util.GetSubnet(interfaceName).String()
<mask> }
<mask>
<mask> if found4 {
<mask> result.V4.OtherServer.Found = "yes"
<mask> } else if err4 != nil {
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
</s> add isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName) </s> remove resp.IP = util.GetSubnet(interfaceName).String()
</s> add resp.IP = aghnet.GetSubnet(interfaceName).String() </s> remove err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
</s> add isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName) </s> remove err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) </s> remove err := sysutil.IfaceSetStaticIP(interfaceName)
</s> add err := aghnet.IfaceSetStaticIP(interfaceName) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/dhcpd/http.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> "strconv"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // getAddrsResponse is the response for /install/get_addresses endpoint.
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"`
Interfaces map[string]*util.NetInterface `json:"interfaces"`
</s> add WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"`
Interfaces map[string]*aghnet.NetInterface `json:"interfaces"` </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghos" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghos" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
"github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlinstall.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> )
<mask>
<mask> // getAddrsResponse is the response for /install/get_addresses endpoint.
<mask> type getAddrsResponse struct {
<mask> WebPort int `json:"web_port"`
<mask> DNSPort int `json:"dns_port"`
<mask> Interfaces map[string]*util.NetInterface `json:"interfaces"`
<mask> }
<mask>
<mask> // handleInstallGetAddresses is the handler for /install/get_addresses endpoint.
<mask> func (web *Web) handleInstallGetAddresses(w http.ResponseWriter, r *http.Request) {
<mask> data := getAddrsResponse{}
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"`
Interfaces []*util.NetInterface `json:"interfaces"`
</s> add WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"`
Interfaces []*aghnet.NetInterface `json:"interfaces"` </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove ifaces, err := util.GetValidNetInterfaces()
</s> add ifaces, err := aghnet.GetValidNetInterfaces() </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghos" </s> remove err := sysutil.IfaceSetStaticIP(interfaceName)
</s> add err := aghnet.IfaceSetStaticIP(interfaceName) </s> remove hasStaticIP, err = sysutil.IfaceHasStaticIP(ifaceName)
</s> add hasStaticIP, err = aghnet.IfaceHasStaticIP(ifaceName) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlinstall.go |
keep keep keep keep replace keep keep keep keep keep | <mask> data := getAddrsResponse{}
<mask> data.WebPort = 80
<mask> data.DNSPort = 53
<mask>
<mask> ifaces, err := util.GetValidNetInterfacesForWeb()
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "Couldn't get interfaces: %s", err)
<mask> return
<mask> }
<mask>
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() </s> remove ifaces, err := util.GetValidNetInterfaces()
</s> add ifaces, err := aghnet.GetValidNetInterfaces() </s> remove data.Interfaces = make(map[string]*util.NetInterface)
</s> add data.Interfaces = make(map[string]*aghnet.NetInterface) </s> remove ifaces, e := util.GetValidNetInterfacesForWeb()
</s> add ifaces, e := aghnet.GetValidNetInterfacesForWeb() </s> remove err = sysutil.IfaceSetStaticIP(ifaceName)
</s> add err = aghnet.IfaceSetStaticIP(ifaceName) </s> remove err = util.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlinstall.go |
keep keep keep keep replace keep keep keep keep keep | <mask> httpError(w, http.StatusInternalServerError, "Couldn't get interfaces: %s", err)
<mask> return
<mask> }
<mask>
<mask> data.Interfaces = make(map[string]*util.NetInterface)
<mask> for _, iface := range ifaces {
<mask> data.Interfaces[iface.Name] = iface
<mask> }
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() </s> remove ifaces, err := util.GetValidNetInterfaces()
</s> add ifaces, err := aghnet.GetValidNetInterfaces() </s> remove if !Context.ipDetector.detectSpecialNetwork(ip) {
</s> add if !Context.ipDetector.DetectSpecialNetwork(ip) { </s> remove err = util.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove err = sysutil.IfaceSetStaticIP(ifaceName)
</s> add err = aghnet.IfaceSetStaticIP(ifaceName) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlinstall.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return
<mask> }
<mask>
<mask> if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort && reqData.Web.Port != config.BetaBindPort {
<mask> err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port)
<mask> if err != nil {
<mask> respData.Web.Status = err.Error()
<mask> }
<mask> }
<mask>
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove if util.ErrorIsAddrInUse(err) {
</s> add if aghnet.ErrorIsAddrInUse(err) { </s> remove err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove sysutil.SetRlimit(config.RlimitNoFile)
</s> add aghos.SetRlimit(config.RlimitNoFile) </s> remove err := util.CheckPortAvailable(config.BindHost, port)
</s> add err := aghnet.CheckPortAvailable(config.BindHost, port) </s> remove err = sysutil.IfaceSetStaticIP(ifaceName)
</s> add err = aghnet.IfaceSetStaticIP(ifaceName) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlinstall.go |
keep keep keep replace keep keep keep keep keep keep keep keep replace keep keep keep | <mask> }
<mask>
<mask> if reqData.DNS.Port != 0 {
<mask> err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
<mask>
<mask> if util.ErrorIsAddrInUse(err) {
<mask> canAutofix := checkDNSStubListener()
<mask> if canAutofix && reqData.DNS.Autofix {
<mask>
<mask> if reqData.DNS.Port != 0 {
<mask> err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
<mask>
<mask> if util.ErrorIsAddrInUse(err) {
<mask> canAutofix := checkDNSStubListener()
<mask> if canAutofix && reqData.DNS.Autofix {
<mask>
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) </s> remove sysutil.SetRlimit(config.RlimitNoFile)
</s> add aghos.SetRlimit(config.RlimitNoFile) </s> remove err := util.CheckPortAvailable(config.BindHost, port)
</s> add err := aghnet.CheckPortAvailable(config.BindHost, port) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlinstall.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if err != nil {
<mask> log.Error("Couldn't disable DNSStubListener: %s", err)
<mask> }
<mask>
<mask> err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
<mask> canAutofix = false
<mask> }
<mask>
<mask> respData.DNS.CanAutofix = canAutofix
<mask> }
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove if util.ErrorIsAddrInUse(err) {
</s> add if aghnet.ErrorIsAddrInUse(err) { </s> remove err := util.CheckPortAvailable(config.BindHost, port)
</s> add err := aghnet.CheckPortAvailable(config.BindHost, port) </s> remove err = sysutil.IfaceSetStaticIP(ifaceName)
</s> add err = aghnet.IfaceSetStaticIP(ifaceName) </s> remove err = util.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlinstall.go |
keep keep keep keep replace keep keep keep keep keep | <mask> respData.DNS.CanAutofix = canAutofix
<mask> }
<mask>
<mask> if err == nil {
<mask> err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
<mask> }
<mask>
<mask> if err != nil {
<mask> respData.DNS.Status = err.Error()
<mask> } else if !reqData.DNS.IP.IsUnspecified() {
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove if util.ErrorIsAddrInUse(err) {
</s> add if aghnet.ErrorIsAddrInUse(err) { </s> remove Context.ipDetector, err = newIPDetector()
</s> add Context.ipDetector, err = aghnet.NewIPDetector() </s> remove isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
</s> add isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName) </s> remove err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlinstall.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // Or if set=true, it tries to set it
<mask> func handleStaticIP(ip net.IP, set bool) staticIPJSON {
<mask> resp := staticIPJSON{}
<mask>
<mask> interfaceName := util.GetInterfaceByIP(ip)
<mask> resp.Static = "no"
<mask>
<mask> if len(interfaceName) == 0 {
<mask> resp.Static = "error"
<mask> resp.Error = fmt.Sprintf("Couldn't find network interface by IP %s", ip)
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove err := sysutil.IfaceSetStaticIP(interfaceName)
</s> add err := aghnet.IfaceSetStaticIP(interfaceName) </s> remove isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
</s> add isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName) </s> remove resp.IP = util.GetSubnet(interfaceName).String()
</s> add resp.IP = aghnet.GetSubnet(interfaceName).String() </s> remove result.V4.StaticIP.IP = util.GetSubnet(interfaceName).String()
</s> add result.V4.StaticIP.IP = aghnet.GetSubnet(interfaceName).String() </s> remove isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
</s> add isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName) </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlinstall.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> if set {
<mask> // Try to set static IP for the specified interface
<mask> err := sysutil.IfaceSetStaticIP(interfaceName)
<mask> if err != nil {
<mask> resp.Static = "error"
<mask> resp.Error = err.Error()
<mask> return resp
<mask> }
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
</s> add isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName) </s> remove interfaceName := util.GetInterfaceByIP(ip)
</s> add interfaceName := aghnet.GetInterfaceByIP(ip) </s> remove isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
</s> add isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName) </s> remove err = sysutil.IfaceSetStaticIP(ifaceName)
</s> add err = aghnet.IfaceSetStaticIP(ifaceName) </s> remove err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove resp.IP = util.GetSubnet(interfaceName).String()
</s> add resp.IP = aghnet.GetSubnet(interfaceName).String() | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlinstall.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> // Fallthrough here even if we set static IP
<mask> // Check if we have a static IP and return the details
<mask> isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
<mask> if err != nil {
<mask> resp.Static = "error"
<mask> resp.Error = err.Error()
<mask> } else {
<mask> if isStaticIP {
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove err := sysutil.IfaceSetStaticIP(interfaceName)
</s> add err := aghnet.IfaceSetStaticIP(interfaceName) </s> remove isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
</s> add isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName) </s> remove resp.IP = util.GetSubnet(interfaceName).String()
</s> add resp.IP = aghnet.GetSubnet(interfaceName).String() </s> remove } else if errors.Is(err, sysutil.ErrNoStaticIPInfo) {
</s> add } else if errors.Is(err, aghnet.ErrNoStaticIPInfo) { </s> remove interfaceName := util.GetInterfaceByIP(ip)
</s> add interfaceName := aghnet.GetInterfaceByIP(ip) </s> remove err = sysutil.IfaceSetStaticIP(ifaceName)
</s> add err = aghnet.IfaceSetStaticIP(ifaceName) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlinstall.go |
keep keep keep keep replace keep keep keep keep keep | <mask> } else {
<mask> if isStaticIP {
<mask> resp.Static = "yes"
<mask> }
<mask> resp.IP = util.GetSubnet(interfaceName).String()
<mask> }
<mask> return resp
<mask> }
<mask>
<mask> // Check if DNSStubListener is active
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove result.V4.StaticIP.IP = util.GetSubnet(interfaceName).String()
</s> add result.V4.StaticIP.IP = aghnet.GetSubnet(interfaceName).String() </s> remove isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
</s> add isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName) </s> remove err := sysutil.IfaceSetStaticIP(interfaceName)
</s> add err := aghnet.IfaceSetStaticIP(interfaceName) </s> remove err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = sysutil.IfaceSetStaticIP(ifaceName)
</s> add err = aghnet.IfaceSetStaticIP(ifaceName) </s> remove isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
</s> add isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlinstall.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> // validate that hosts and ports are bindable
<mask> if restartHTTP {
<mask> err = util.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Impossible to listen on IP:port %s due to %s",
<mask> net.JoinHostPort(newSettings.Web.IP.String(), strconv.Itoa(newSettings.Web.Port)), err)
<mask> return
<mask> }
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove err = util.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove err = util.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove err = sysutil.SendProcessSignal(pid, syscall.SIGHUP)
</s> add err = aghos.SendProcessSignal(pid, syscall.SIGHUP) </s> remove err := sysutil.ConfigureSyslog(serviceName)
</s> add err := aghos.ConfigureSyslog(serviceName) </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() </s> remove err := sysutil.IfaceSetStaticIP(interfaceName)
</s> add err := aghnet.IfaceSetStaticIP(interfaceName) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlinstall.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> }
<mask>
<mask> err = util.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "%s", err)
<mask> return
<mask> }
<mask>
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove err = util.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove err = util.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
</s> add err = aghnet.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port) </s> remove err = sysutil.IfaceSetStaticIP(ifaceName)
</s> add err = aghnet.IfaceSetStaticIP(ifaceName) </s> remove err := util.CheckPortAvailable(config.BindHost, port)
</s> add err := aghnet.CheckPortAvailable(config.BindHost, port) </s> remove err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlinstall.go |
keep keep keep keep replace keep keep keep keep keep | <mask> httpError(w, http.StatusBadRequest, "%s", err)
<mask> return
<mask> }
<mask>
<mask> err = util.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "%s", err)
<mask> return
<mask> }
<mask>
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove err = util.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove err = util.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
</s> add err = aghnet.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port) </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() </s> remove err = sysutil.IfaceSetStaticIP(ifaceName)
</s> add err = aghnet.IfaceSetStaticIP(ifaceName) </s> remove err = sysutil.SendProcessSignal(pid, syscall.SIGHUP)
</s> add err = aghos.SendProcessSignal(pid, syscall.SIGHUP) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlinstall.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> //
<mask> // TODO(e.burkov): This should removed with the API v1 when the appropriate
<mask> // functionality will appear in default firstRunData.
<mask> type getAddrsResponseBeta struct {
<mask> WebPort int `json:"web_port"`
<mask> DNSPort int `json:"dns_port"`
<mask> Interfaces []*util.NetInterface `json:"interfaces"`
<mask> }
<mask>
<mask> // handleInstallConfigureBeta is a substitution of /install/get_addresses
<mask> // handler for new client.
<mask> //
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"`
Interfaces map[string]*util.NetInterface `json:"interfaces"`
</s> add WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"`
Interfaces map[string]*aghnet.NetInterface `json:"interfaces"` </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove ok, err := util.CanBindPort(53)
</s> add ok, err := aghnet.CanBindPort(53) </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghos" </s> remove isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
</s> add isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName) </s> remove admin, _ := sysutil.HaveAdminRights()
</s> add admin, _ := aghos.HaveAdminRights() | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlinstall.go |
keep keep keep keep replace keep keep keep keep keep | <mask> data := getAddrsResponseBeta{}
<mask> data.WebPort = 80
<mask> data.DNSPort = 53
<mask>
<mask> ifaces, err := util.GetValidNetInterfacesForWeb()
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "Couldn't get interfaces: %s", err)
<mask> return
<mask> }
<mask>
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() </s> remove ifaces, err := util.GetValidNetInterfaces()
</s> add ifaces, err := aghnet.GetValidNetInterfaces() </s> remove data.Interfaces = make(map[string]*util.NetInterface)
</s> add data.Interfaces = make(map[string]*aghnet.NetInterface) </s> remove ifaces, e := util.GetValidNetInterfacesForWeb()
</s> add ifaces, e := aghnet.GetValidNetInterfacesForWeb() </s> remove err = sysutil.IfaceSetStaticIP(ifaceName)
</s> add err = aghnet.IfaceSetStaticIP(ifaceName) </s> remove err = util.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlinstall.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "runtime"
<mask> "syscall"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/updater"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // temporaryError is the interface for temporary errors from the Go standard
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghos" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"`
Interfaces map[string]*util.NetInterface `json:"interfaces"`
</s> add WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"`
Interfaces map[string]*aghnet.NetInterface `json:"interfaces"` </s> remove err := sysutil.IfaceSetStaticIP(interfaceName)
</s> add err := aghnet.IfaceSetStaticIP(interfaceName) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlupdate.go |
keep keep keep keep replace keep keep keep keep keep | <mask> tlsConf.PortDNSOverTLS < 1024 ||
<mask> tlsConf.PortDNSOverQUIC < 1024)) ||
<mask> config.BindPort < 1024 ||
<mask> config.DNS.Port < 1024) {
<mask> canUpdate, _ = sysutil.CanBindPrivilegedPorts()
<mask> }
<mask> vr.CanAutoUpdate = &canUpdate
<mask> }
<mask> }
<mask>
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove sysutil.SetRlimit(config.RlimitNoFile)
</s> add aghos.SetRlimit(config.RlimitNoFile) </s> remove err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) </s> remove jsonIface.GatewayIP = sysutil.GatewayIP(iface.Name)
</s> add jsonIface.GatewayIP = aghnet.GatewayIP(iface.Name) </s> remove resp.IP = util.GetSubnet(interfaceName).String()
</s> add resp.IP = aghnet.GetSubnet(interfaceName).String() </s> remove result.V4.StaticIP.IP = util.GetSubnet(interfaceName).String()
</s> add result.V4.StaticIP.IP = aghnet.GetSubnet(interfaceName).String() </s> remove err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/controlupdate.go |
keep keep keep add keep keep keep keep | <mask> "path/filepath"
<mask> "strconv"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
"github.com/AdguardTeam/AdGuardHome/internal/aghos" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghos" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/ameshkov/dnscrypt/v2"
<mask> yaml "gopkg.in/yaml.v2"
<mask> )
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add </s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
"github.com/AdguardTeam/AdGuardHome/internal/aghos" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghos" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> if !ip.IsLoopback() {
<mask> Context.rdns.Begin(ip)
<mask> }
<mask> if !Context.ipDetector.detectSpecialNetwork(ip) {
<mask> Context.whois.Begin(ip)
<mask> }
<mask> }
<mask>
<mask> func generateServerConfig() (newconfig dnsforward.ServerConfig, err error) {
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove if !Context.ipDetector.detectSpecialNetwork(ip) {
</s> add if !Context.ipDetector.DetectSpecialNetwork(ip) { </s> remove err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err := util.CheckPortAvailable(config.BindHost, port)
</s> add err := aghnet.CheckPortAvailable(config.BindHost, port) </s> remove err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove Context.ipDetector, err = newIPDetector()
</s> add Context.ipDetector, err = aghnet.NewIPDetector() </s> remove err = sysutil.IfaceSetStaticIP(ifaceName)
</s> add err = aghnet.IfaceSetStaticIP(ifaceName) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> func getDNSAddresses() []string {
<mask> dnsAddresses := []string{}
<mask>
<mask> if config.DNS.BindHost.IsUnspecified() {
<mask> ifaces, e := util.GetValidNetInterfacesForWeb()
<mask> if e != nil {
<mask> log.Error("Couldn't get network interfaces: %v", e)
<mask> return []string{}
<mask> }
<mask>
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() </s> remove ifaces, err := util.GetValidNetInterfaces()
</s> add ifaces, err := aghnet.GetValidNetInterfaces() </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() </s> remove err := util.CheckPortAvailable(config.BindHost, port)
</s> add err := aghnet.CheckPortAvailable(config.BindHost, port) </s> remove if !Context.ipDetector.detectSpecialNetwork(ip) {
</s> add if !Context.ipDetector.DetectSpecialNetwork(ip) { | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> for _, ip := range Context.stats.GetTopClientsIP(topClientsNumber) {
<mask> if !ip.IsLoopback() {
<mask> Context.rdns.Begin(ip)
<mask> }
<mask> if !Context.ipDetector.detectSpecialNetwork(ip) {
<mask> Context.whois.Begin(ip)
<mask> }
<mask> }
<mask>
<mask> return nil
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove if !Context.ipDetector.detectSpecialNetwork(ip) {
</s> add if !Context.ipDetector.DetectSpecialNetwork(ip) { </s> remove data.Interfaces = make(map[string]*util.NetInterface)
</s> add data.Interfaces = make(map[string]*aghnet.NetInterface) </s> remove err := util.CheckPortAvailable(config.BindHost, port)
</s> add err := aghnet.CheckPortAvailable(config.BindHost, port) </s> remove err := sysutil.IfaceSetStaticIP(interfaceName)
</s> add err := aghnet.IfaceSetStaticIP(interfaceName) </s> remove err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove Context.ipDetector, err = newIPDetector()
</s> add Context.ipDetector, err = aghnet.NewIPDetector() | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/dns.go |
keep add keep keep keep keep keep keep | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/updater"
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghos" </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() </s> remove interfaceName := util.GetInterfaceByIP(ip)
</s> add interfaceName := aghnet.GetInterfaceByIP(ip) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/updater"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/version"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "gopkg.in/natefinch/lumberjack.v2"
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add </s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
"github.com/AdguardTeam/AdGuardHome/internal/aghos" </s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghos" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghos" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask> tls *TLSMod // TLS module
<mask> autoHosts util.AutoHosts // IP-hostname pairs taken from system configuration (e.g. /etc/hosts) files
<mask> updater *updater.Updater
<mask>
<mask> ipDetector *ipDetector
<mask>
<mask> // mux is our custom http.ServeMux.
<mask> mux *http.ServeMux
<mask>
<mask> // Runtime properties
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghos" </s> remove WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"`
Interfaces []*util.NetInterface `json:"interfaces"`
</s> add WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"`
Interfaces []*aghnet.NetInterface `json:"interfaces"` </s> remove sysutil.SetRlimit(config.RlimitNoFile)
</s> add aghos.SetRlimit(config.RlimitNoFile) </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"`
Interfaces map[string]*util.NetInterface `json:"interfaces"`
</s> add WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"`
Interfaces map[string]*aghnet.NetInterface `json:"interfaces"` </s> remove hasStaticIP, err = sysutil.IfaceHasStaticIP(ifaceName)
</s> add hasStaticIP, err = aghnet.IfaceHasStaticIP(ifaceName) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask> config.Clients = nil
<mask>
<mask> if (runtime.GOOS == "linux" || runtime.GOOS == "darwin") &&
<mask> config.RlimitNoFile != 0 {
<mask> sysutil.SetRlimit(config.RlimitNoFile)
<mask> }
<mask>
<mask> // override bind host/port from the console
<mask> if args.bindHost != nil {
<mask> config.BindHost = args.bindHost
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) </s> remove err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove Context.ipDetector, err = newIPDetector()
</s> add Context.ipDetector, err = aghnet.NewIPDetector() </s> remove if util.ErrorIsAddrInUse(err) {
</s> add if aghnet.ErrorIsAddrInUse(err) { </s> remove err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err := util.CheckPortAvailable(config.BindHost, port)
</s> add err := aghnet.CheckPortAvailable(config.BindHost, port) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if Context.web == nil {
<mask> log.Fatalf("Can't initialize Web module")
<mask> }
<mask>
<mask> Context.ipDetector, err = newIPDetector()
<mask> if err != nil {
<mask> log.Fatal(err)
<mask> }
<mask>
<mask> if !Context.firstRun {
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err := sysutil.ConfigureSyslog(serviceName)
</s> add err := aghos.ConfigureSyslog(serviceName) </s> remove err := util.CheckPortAvailable(config.BindHost, port)
</s> add err := aghnet.CheckPortAvailable(config.BindHost, port) </s> remove err = sysutil.IfaceSetStaticIP(ifaceName)
</s> add err = aghnet.IfaceSetStaticIP(ifaceName) </s> remove err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) </s> remove if util.ErrorIsAddrInUse(err) {
</s> add if aghnet.ErrorIsAddrInUse(err) { | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> if runtime.GOOS == "windows" {
<mask> // On Windows we need to have admin rights to run properly
<mask>
<mask> admin, _ := sysutil.HaveAdminRights()
<mask> if admin {
<mask> return
<mask> }
<mask>
<mask> log.Fatal("This is the first launch of AdGuard Home. You must run it as Administrator.")
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove ok, err := util.CanBindPort(53)
</s> add ok, err := aghnet.CanBindPort(53) </s> remove isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
</s> add isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName) </s> remove err := sysutil.ConfigureSyslog(serviceName)
</s> add err := aghos.ConfigureSyslog(serviceName) </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() </s> remove sysutil.SetRlimit(config.RlimitNoFile)
</s> add aghos.SetRlimit(config.RlimitNoFile) </s> remove interfaceName := util.GetInterfaceByIP(ip)
</s> add interfaceName := aghnet.GetInterfaceByIP(ip) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask> log.Fatal("This is the first launch of AdGuard Home. You must run it as Administrator.")
<mask> }
<mask>
<mask> // We should check if AdGuard Home is able to bind to port 53
<mask> ok, err := util.CanBindPort(53)
<mask>
<mask> if ok {
<mask> log.Info("AdGuard Home can bind to port 53")
<mask> return
<mask> }
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove admin, _ := sysutil.HaveAdminRights()
</s> add admin, _ := aghos.HaveAdminRights() </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() </s> remove hasStaticIP, err = sysutil.IfaceHasStaticIP(ifaceName)
</s> add hasStaticIP, err = aghnet.IfaceHasStaticIP(ifaceName) </s> remove err := sysutil.IfaceSetStaticIP(interfaceName)
</s> add err := aghnet.IfaceSetStaticIP(interfaceName) </s> remove err = util.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
</s> add err = aghnet.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port) </s> remove err = sysutil.SendProcessSignal(pid, syscall.SIGHUP)
</s> add err = aghos.SendProcessSignal(pid, syscall.SIGHUP) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> if ls.LogFile == configSyslog {
<mask> // Use syslog where it is possible and eventlog on Windows
<mask> err := sysutil.ConfigureSyslog(serviceName)
<mask> if err != nil {
<mask> log.Fatalf("cannot initialize syslog: %s", err)
<mask> }
<mask> } else {
<mask> logFilePath := filepath.Join(Context.workDir, ls.LogFile)
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove Context.ipDetector, err = newIPDetector()
</s> add Context.ipDetector, err = aghnet.NewIPDetector() </s> remove err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = util.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
</s> add err = aghnet.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port) </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() </s> remove isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
</s> add isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName) </s> remove err := util.CheckPortAvailable(config.BindHost, port)
</s> add err := aghnet.CheckPortAvailable(config.BindHost, port) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask> log.Printf("Go to https://%s:%s", tlsConf.ServerName, port)
<mask> }
<mask> } else if config.BindHost.IsUnspecified() {
<mask> log.Println("AdGuard Home is available on the following addresses:")
<mask> ifaces, err := util.GetValidNetInterfacesForWeb()
<mask> if err != nil {
<mask> // That's weird, but we'll ignore it
<mask> hostStr = config.BindHost.String()
<mask> log.Printf("Go to %s://%s", proto, net.JoinHostPort(hostStr, port))
<mask> if config.BetaBindPort != 0 {
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove err := util.CheckPortAvailable(config.BindHost, port)
</s> add err := aghnet.CheckPortAvailable(config.BindHost, port) </s> remove err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) </s> remove ok, err := util.CanBindPort(53)
</s> add ok, err := aghnet.CanBindPort(53) </s> remove err := sysutil.ConfigureSyslog(serviceName)
</s> add err := aghos.ConfigureSyslog(serviceName) </s> remove err = util.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
</s> add err = aghnet.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port) </s> remove err := sysutil.IfaceSetStaticIP(interfaceName)
</s> add err := aghnet.IfaceSetStaticIP(interfaceName) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "strconv"
<mask> "strings"
<mask> "syscall"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/kardianos/service"
<mask> )
<mask>
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
"github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghos" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/service.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if err != nil {
<mask> log.Error("Can't read PID file %s: %s", pidfile, err)
<mask> return
<mask> }
<mask> err = sysutil.SendProcessSignal(pid, syscall.SIGHUP)
<mask> if err != nil {
<mask> log.Error("Can't send signal to PID %d: %s", pid, err)
<mask> return
<mask> }
<mask> log.Debug("Sent signal to PID %d", pid)
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove err = util.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
</s> add err = aghnet.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port) </s> remove err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = sysutil.IfaceSetStaticIP(ifaceName)
</s> add err = aghnet.IfaceSetStaticIP(ifaceName) </s> remove err = util.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove err = util.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove ifaces, err := util.GetValidNetInterfacesForWeb()
</s> add ifaces, err := aghnet.GetValidNetInterfacesForWeb() | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/service.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "strconv"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/NYTimes/gziphandler"
<mask> "github.com/gobuffalo/packr"
<mask> )
<mask>
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghos" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghos" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
"github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/web.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if Context.web.httpsServer.server != nil {
<mask> alreadyRunning = true
<mask> }
<mask> if !alreadyRunning {
<mask> err := util.CheckPortAvailable(config.BindHost, port)
<mask> if err != nil {
<mask> return false
<mask> }
<mask> }
<mask> return true
</s> Pull request: create aghnet package
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package </s> remove err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = sysutil.IfaceSetStaticIP(ifaceName)
</s> add err = aghnet.IfaceSetStaticIP(ifaceName) </s> remove err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = aghnet.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) </s> remove Context.ipDetector, err = newIPDetector()
</s> add Context.ipDetector, err = aghnet.NewIPDetector() </s> remove err = util.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = aghnet.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) | https://github.com/AdguardTeam/AdGuardHome/commit/3a67cc2c4593df1d169a316480130fec7f3d45b1 | internal/home/web.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> "minimist": "^1.2.0"
<mask> }
<mask> },
<mask> "minimist": {
<mask> "version": "1.2.0",
<mask> "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
<mask> "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
<mask> "dev": true
<mask> },
<mask> "ms": {
<mask> "version": "2.1.1",
<mask> "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
</s> add "resolved": "", </s> remove "minimist": "1.1.x"
},
"dependencies": {
"minimist": {
"version": "1.1.3",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
"integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
"dev": true
}
</s> add "minimist": "^1.2.5" </s> remove "version": "0.0.8",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
</s> add "version": "1.2.5",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", </s> add },
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true </s> remove "minimist": "0.0.8"
</s> add "minimist": "^1.2.5" </s> remove "version": "0.5.1",
"resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
</s> add "version": "0.5.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> "negotiator": "0.6.1"
<mask> }
<mask> },
<mask> "acorn": {
<mask> "version": "5.7.2",
<mask> "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.2.tgz",
<mask> "integrity": "sha512-cJrKCNcr2kv8dlDnbw+JPUGjHZzo4myaxOLmpOX8a+rgX94YeTcTMv/LFJUSByRpc+i4GgVnnhLxvMu/2Y+rqw==",
<mask> "dev": true
<mask> },
<mask> "acorn-dynamic-import": {
<mask> "version": "2.0.2",
<mask> "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> add "coa": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
"integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
"dev": true,
"requires": {
"@types/q": "^1.5.1",
"chalk": "^2.4.1",
"q": "^1.1.2"
}
}, </s> remove },
"dependencies": {
"coa": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
"integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
"dev": true,
"requires": {
"@types/q": "^1.5.1",
"chalk": "^2.4.1",
"q": "^1.1.2"
}
},
"css-select": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz",
"integrity": "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==",
"dev": true,
"requires": {
"boolbase": "^1.0.0",
"css-what": "^2.1.2",
"domutils": "^1.7.0",
"nth-check": "^1.0.2"
},
"dependencies": {
"css-what": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
"integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
"dev": true
},
"domutils": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
"dev": true,
"requires": {
"dom-serializer": "0",
"domelementtype": "1"
}
},
"nth-check": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
"integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
"dev": true,
"requires": {
"boolbase": "~1.0.0"
}
}
}
},
"csso": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz",
"integrity": "sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==",
"dev": true,
"requires": {
"css-tree": "1.0.0-alpha.29"
},
"dependencies": {
"css-tree": {
"version": "1.0.0-alpha.29",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz",
"integrity": "sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
}
}
},
"esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
},
"js-yaml": {
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"dev": true,
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
}
},
"source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
"dev": true
},
"svgo": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.2.tgz",
"integrity": "sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA==",
"dev": true,
"requires": {
"chalk": "^2.4.1",
"coa": "^2.0.2",
"css-select": "^2.0.0",
"css-select-base-adapter": "^0.1.1",
"css-tree": "1.0.0-alpha.28",
"css-url-regex": "^1.1.0",
"csso": "^3.5.1",
"js-yaml": "^3.13.1",
"mkdirp": "~0.5.1",
"object.values": "^1.1.0",
"sax": "~1.2.4",
"stable": "^0.1.8",
"unquote": "~1.1.1",
"util.promisify": "~1.0.0"
},
"dependencies": {
"css-select-base-adapter": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
"integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
"dev": true
},
"css-tree": {
"version": "1.0.0-alpha.28",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz",
"integrity": "sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
},
"css-url-regex": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz",
"integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=",
"dev": true
},
"object.values": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
"integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.12.0",
"function-bind": "^1.1.1",
"has": "^1.0.3"
}
},
"stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
},
"unquote": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
"integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
"dev": true
}
}
}
</s> add </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> add "stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
}, </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep keep replace replace keep keep keep keep keep | <mask> "dev": true
<mask> },
<mask> "kind-of": {
<mask> "version": "6.0.2",
<mask> "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
<mask> "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
<mask> "dev": true
<mask> }
<mask> }
<mask> },
<mask> "base64-js": {
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep keep replace replace keep keep keep keep keep | <mask> "dev": true
<mask> },
<mask> "kind-of": {
<mask> "version": "6.0.2",
<mask> "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
<mask> "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
<mask> "dev": true
<mask> },
<mask> "micromatch": {
<mask> "version": "3.1.10",
<mask> "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep add keep keep keep keep keep | <mask> "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
<mask> "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
<mask> "dev": true
<mask> },
<mask> "code-point-at": {
<mask> "version": "1.1.0",
<mask> "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
<mask> "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
<mask> "dev": true
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> add "object-inspect": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
"integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
"dev": true
}, </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> add "unquote": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
"integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
"dev": true
}, </s> remove },
"dependencies": {
"coa": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
"integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
"dev": true,
"requires": {
"@types/q": "^1.5.1",
"chalk": "^2.4.1",
"q": "^1.1.2"
}
},
"css-select": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz",
"integrity": "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==",
"dev": true,
"requires": {
"boolbase": "^1.0.0",
"css-what": "^2.1.2",
"domutils": "^1.7.0",
"nth-check": "^1.0.2"
},
"dependencies": {
"css-what": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
"integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
"dev": true
},
"domutils": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
"dev": true,
"requires": {
"dom-serializer": "0",
"domelementtype": "1"
}
},
"nth-check": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
"integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
"dev": true,
"requires": {
"boolbase": "~1.0.0"
}
}
}
},
"csso": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz",
"integrity": "sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==",
"dev": true,
"requires": {
"css-tree": "1.0.0-alpha.29"
},
"dependencies": {
"css-tree": {
"version": "1.0.0-alpha.29",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz",
"integrity": "sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
}
}
},
"esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
},
"js-yaml": {
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"dev": true,
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
}
},
"source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
"dev": true
},
"svgo": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.2.tgz",
"integrity": "sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA==",
"dev": true,
"requires": {
"chalk": "^2.4.1",
"coa": "^2.0.2",
"css-select": "^2.0.0",
"css-select-base-adapter": "^0.1.1",
"css-tree": "1.0.0-alpha.28",
"css-url-regex": "^1.1.0",
"csso": "^3.5.1",
"js-yaml": "^3.13.1",
"mkdirp": "~0.5.1",
"object.values": "^1.1.0",
"sax": "~1.2.4",
"stable": "^0.1.8",
"unquote": "~1.1.1",
"util.promisify": "~1.0.0"
},
"dependencies": {
"css-select-base-adapter": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
"integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
"dev": true
},
"css-tree": {
"version": "1.0.0-alpha.28",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz",
"integrity": "sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
},
"css-url-regex": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz",
"integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=",
"dev": true
},
"object.values": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
"integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.12.0",
"function-bind": "^1.1.1",
"has": "^1.0.3"
}
},
"stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
},
"unquote": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
"integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
"dev": true
}
}
}
</s> add </s> add "stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
}, | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep keep replace replace keep keep keep keep keep | <mask> }
<mask> },
<mask> "minimist": {
<mask> "version": "1.2.0",
<mask> "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
<mask> "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
<mask> "dev": true
<mask> },
<mask> "normalize-path": {
<mask> "version": "3.0.0",
<mask> "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
</s> add "version": "1.2.5",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", </s> add "has-symbols": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
"integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
"dev": true
}, </s> remove "minimist": "1.1.x"
},
"dependencies": {
"minimist": {
"version": "1.1.3",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
"integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
"dev": true
}
</s> add "minimist": "^1.2.5" </s> remove "version": "0.0.8",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
</s> add "version": "1.2.5",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", </s> remove "version": "0.5.1",
"resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
</s> add "version": "0.5.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", </s> remove "version": "4.2.3",
"resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.3.tgz",
"integrity": "sha512-Kjhohco0esHQnOiqqdJeNz/5fyPkOMD/d6XVjwTAoPGUFh0mCollPUTUTa2OZy4dYNAqlPIQdTiNzJTWdd9Htw==",
</s> add "version": "4.3.0",
"resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz",
"integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==", | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
<mask> "dev": true
<mask> },
<mask> "kind-of": {
<mask> "version": "6.0.2",
<mask> "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
<mask> "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
<mask> "dev": true
<mask> }
<mask> }
<mask> },
<mask> "del": {
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep add keep keep keep keep keep keep | <mask> }
<mask> },
<mask> "esquery": {
<mask> "version": "1.0.1",
<mask> "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
<mask> "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
<mask> "dev": true,
<mask> "requires": {
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> add "stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
}, </s> remove "minimist": "0.0.8"
</s> add "minimist": "^1.2.5" </s> remove "version": "1.0.1",
"resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.1.tgz",
"integrity": "sha1-VuC/CL2XCLJqdltoUJhAyN7J/bw=",
</s> add "version": "1.0.3",
"resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz",
"integrity": "sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA==", </s> add "has-symbols": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
"integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
"dev": true
}, </s> remove },
"dependencies": {
"coa": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
"integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
"dev": true,
"requires": {
"@types/q": "^1.5.1",
"chalk": "^2.4.1",
"q": "^1.1.2"
}
},
"css-select": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz",
"integrity": "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==",
"dev": true,
"requires": {
"boolbase": "^1.0.0",
"css-what": "^2.1.2",
"domutils": "^1.7.0",
"nth-check": "^1.0.2"
},
"dependencies": {
"css-what": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
"integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
"dev": true
},
"domutils": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
"dev": true,
"requires": {
"dom-serializer": "0",
"domelementtype": "1"
}
},
"nth-check": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
"integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
"dev": true,
"requires": {
"boolbase": "~1.0.0"
}
}
}
},
"csso": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz",
"integrity": "sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==",
"dev": true,
"requires": {
"css-tree": "1.0.0-alpha.29"
},
"dependencies": {
"css-tree": {
"version": "1.0.0-alpha.29",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz",
"integrity": "sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
}
}
},
"esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
},
"js-yaml": {
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"dev": true,
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
}
},
"source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
"dev": true
},
"svgo": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.2.tgz",
"integrity": "sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA==",
"dev": true,
"requires": {
"chalk": "^2.4.1",
"coa": "^2.0.2",
"css-select": "^2.0.0",
"css-select-base-adapter": "^0.1.1",
"css-tree": "1.0.0-alpha.28",
"css-url-regex": "^1.1.0",
"csso": "^3.5.1",
"js-yaml": "^3.13.1",
"mkdirp": "~0.5.1",
"object.values": "^1.1.0",
"sax": "~1.2.4",
"stable": "^0.1.8",
"unquote": "~1.1.1",
"util.promisify": "~1.0.0"
},
"dependencies": {
"css-select-base-adapter": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
"integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
"dev": true
},
"css-tree": {
"version": "1.0.0-alpha.28",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz",
"integrity": "sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
},
"css-url-regex": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz",
"integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=",
"dev": true
},
"object.values": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
"integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.12.0",
"function-bind": "^1.1.1",
"has": "^1.0.3"
}
},
"stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
},
"unquote": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
"integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
"dev": true
}
}
}
</s> add </s> remove "minimist": "1.1.x"
},
"dependencies": {
"minimist": {
"version": "1.1.3",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
"integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
"dev": true
}
</s> add "minimist": "^1.2.5" | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep keep replace replace keep keep keep keep keep | <mask> }
<mask> },
<mask> "kind-of": {
<mask> "version": "6.0.2",
<mask> "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
<mask> "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
<mask> "dev": true
<mask> }
<mask> }
<mask> },
<mask> "extract-text-webpack-plugin": {
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> "which": "^1.3.1"
<mask> },
<mask> "dependencies": {
<mask> "kind-of": {
<mask> "version": "6.0.2",
<mask> "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
<mask> "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
<mask> "dev": true
<mask> }
<mask> }
<mask> },
<mask> "globals": {
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep replace replace replace keep keep replace replace replace replace replace replace replace replace replace keep keep keep keep | <mask> },
<mask> "gonzales-pe": {
<mask> "version": "4.2.3",
<mask> "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.3.tgz",
<mask> "integrity": "sha512-Kjhohco0esHQnOiqqdJeNz/5fyPkOMD/d6XVjwTAoPGUFh0mCollPUTUTa2OZy4dYNAqlPIQdTiNzJTWdd9Htw==",
<mask> "dev": true,
<mask> "requires": {
<mask> "minimist": "1.1.x"
<mask> },
<mask> "dependencies": {
<mask> "minimist": {
<mask> "version": "1.1.3",
<mask> "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
<mask> "integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
<mask> "dev": true
<mask> }
<mask> }
<mask> },
<mask> "graceful-fs": {
<mask> "version": "4.1.11",
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
</s> add "version": "1.2.5",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", </s> remove "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
</s> add "resolved": "", </s> remove "version": "0.5.1",
"resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
</s> add "version": "0.5.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", </s> remove "version": "0.0.8",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
</s> add "version": "1.2.5",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", </s> remove },
"dependencies": {
"coa": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
"integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
"dev": true,
"requires": {
"@types/q": "^1.5.1",
"chalk": "^2.4.1",
"q": "^1.1.2"
}
},
"css-select": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz",
"integrity": "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==",
"dev": true,
"requires": {
"boolbase": "^1.0.0",
"css-what": "^2.1.2",
"domutils": "^1.7.0",
"nth-check": "^1.0.2"
},
"dependencies": {
"css-what": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
"integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
"dev": true
},
"domutils": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
"dev": true,
"requires": {
"dom-serializer": "0",
"domelementtype": "1"
}
},
"nth-check": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
"integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
"dev": true,
"requires": {
"boolbase": "~1.0.0"
}
}
}
},
"csso": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz",
"integrity": "sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==",
"dev": true,
"requires": {
"css-tree": "1.0.0-alpha.29"
},
"dependencies": {
"css-tree": {
"version": "1.0.0-alpha.29",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz",
"integrity": "sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
}
}
},
"esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
},
"js-yaml": {
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"dev": true,
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
}
},
"source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
"dev": true
},
"svgo": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.2.tgz",
"integrity": "sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA==",
"dev": true,
"requires": {
"chalk": "^2.4.1",
"coa": "^2.0.2",
"css-select": "^2.0.0",
"css-select-base-adapter": "^0.1.1",
"css-tree": "1.0.0-alpha.28",
"css-url-regex": "^1.1.0",
"csso": "^3.5.1",
"js-yaml": "^3.13.1",
"mkdirp": "~0.5.1",
"object.values": "^1.1.0",
"sax": "~1.2.4",
"stable": "^0.1.8",
"unquote": "~1.1.1",
"util.promisify": "~1.0.0"
},
"dependencies": {
"css-select-base-adapter": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
"integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
"dev": true
},
"css-tree": {
"version": "1.0.0-alpha.28",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz",
"integrity": "sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
},
"css-url-regex": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz",
"integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=",
"dev": true
},
"object.values": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
"integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.12.0",
"function-bind": "^1.1.1",
"has": "^1.0.3"
}
},
"stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
},
"unquote": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
"integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
"dev": true
}
}
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep add keep keep keep keep keep | <mask> "version": "3.0.0",
<mask> "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
<mask> "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
<mask> },
<mask> "has-value": {
<mask> "version": "1.0.0",
<mask> "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
<mask> "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
<mask> "dev": true,
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> add "unquote": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
"integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
"dev": true
}, </s> remove "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
</s> add "resolved": "", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "4.2.3",
"resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.3.tgz",
"integrity": "sha512-Kjhohco0esHQnOiqqdJeNz/5fyPkOMD/d6XVjwTAoPGUFh0mCollPUTUTa2OZy4dYNAqlPIQdTiNzJTWdd9Htw==",
</s> add "version": "4.3.0",
"resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz",
"integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==", </s> remove "version": "1.5.2",
"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
"dev": true
</s> add "version": "2.6.3",
"resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
"integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
"dev": true,
"requires": {
"lodash": "^4.17.14"
} | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
<mask> "dev": true
<mask> },
<mask> "kind-of": {
<mask> "version": "6.0.2",
<mask> "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
<mask> "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
<mask> "dev": true
<mask> },
<mask> "micromatch": {
<mask> "version": "3.1.10",
<mask> "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep add keep keep keep keep keep | <mask> "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
<mask> "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
<mask> },
<mask> "jsesc": {
<mask> "version": "1.3.0",
<mask> "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
<mask> "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
<mask> "dev": true
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> add "object-inspect": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
"integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
"dev": true
}, </s> add "unquote": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
"integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
"dev": true
}, </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep replace replace replace keep keep keep replace keep keep keep keep | <mask> }
<mask> },
<mask> "loader-fs-cache": {
<mask> "version": "1.0.1",
<mask> "resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.1.tgz",
<mask> "integrity": "sha1-VuC/CL2XCLJqdltoUJhAyN7J/bw=",
<mask> "dev": true,
<mask> "requires": {
<mask> "find-cache-dir": "^0.1.1",
<mask> "mkdirp": "0.5.1"
<mask> },
<mask> "dependencies": {
<mask> "find-cache-dir": {
<mask> "version": "0.1.1",
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove },
"dependencies": {
"coa": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
"integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
"dev": true,
"requires": {
"@types/q": "^1.5.1",
"chalk": "^2.4.1",
"q": "^1.1.2"
}
},
"css-select": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz",
"integrity": "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==",
"dev": true,
"requires": {
"boolbase": "^1.0.0",
"css-what": "^2.1.2",
"domutils": "^1.7.0",
"nth-check": "^1.0.2"
},
"dependencies": {
"css-what": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
"integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
"dev": true
},
"domutils": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
"dev": true,
"requires": {
"dom-serializer": "0",
"domelementtype": "1"
}
},
"nth-check": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
"integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
"dev": true,
"requires": {
"boolbase": "~1.0.0"
}
}
}
},
"csso": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz",
"integrity": "sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==",
"dev": true,
"requires": {
"css-tree": "1.0.0-alpha.29"
},
"dependencies": {
"css-tree": {
"version": "1.0.0-alpha.29",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz",
"integrity": "sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
}
}
},
"esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
},
"js-yaml": {
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"dev": true,
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
}
},
"source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
"dev": true
},
"svgo": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.2.tgz",
"integrity": "sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA==",
"dev": true,
"requires": {
"chalk": "^2.4.1",
"coa": "^2.0.2",
"css-select": "^2.0.0",
"css-select-base-adapter": "^0.1.1",
"css-tree": "1.0.0-alpha.28",
"css-url-regex": "^1.1.0",
"csso": "^3.5.1",
"js-yaml": "^3.13.1",
"mkdirp": "~0.5.1",
"object.values": "^1.1.0",
"sax": "~1.2.4",
"stable": "^0.1.8",
"unquote": "~1.1.1",
"util.promisify": "~1.0.0"
},
"dependencies": {
"css-select-base-adapter": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
"integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
"dev": true
},
"css-tree": {
"version": "1.0.0-alpha.28",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz",
"integrity": "sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
},
"css-url-regex": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz",
"integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=",
"dev": true
},
"object.values": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
"integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.12.0",
"function-bind": "^1.1.1",
"has": "^1.0.3"
}
},
"stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
},
"unquote": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
"integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
"dev": true
}
}
}
</s> add </s> add },
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true </s> remove "version": "1.5.2",
"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
"dev": true
</s> add "version": "2.6.3",
"resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
"integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
"dev": true,
"requires": {
"lodash": "^4.17.14"
} </s> add "esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
}, </s> add "stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
}, | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> "unist-util-visit": "^1.1.0"
<mask> }
<mask> },
<mask> "mdn-data": {
<mask> "version": "1.1.4",
<mask> "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz",
<mask> "integrity": "sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==",
<mask> "dev": true
<mask> },
<mask> "media-typer": {
<mask> "version": "0.3.0",
<mask> "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove },
"dependencies": {
"coa": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
"integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
"dev": true,
"requires": {
"@types/q": "^1.5.1",
"chalk": "^2.4.1",
"q": "^1.1.2"
}
},
"css-select": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz",
"integrity": "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==",
"dev": true,
"requires": {
"boolbase": "^1.0.0",
"css-what": "^2.1.2",
"domutils": "^1.7.0",
"nth-check": "^1.0.2"
},
"dependencies": {
"css-what": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
"integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
"dev": true
},
"domutils": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
"dev": true,
"requires": {
"dom-serializer": "0",
"domelementtype": "1"
}
},
"nth-check": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
"integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
"dev": true,
"requires": {
"boolbase": "~1.0.0"
}
}
}
},
"csso": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz",
"integrity": "sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==",
"dev": true,
"requires": {
"css-tree": "1.0.0-alpha.29"
},
"dependencies": {
"css-tree": {
"version": "1.0.0-alpha.29",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz",
"integrity": "sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
}
}
},
"esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
},
"js-yaml": {
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"dev": true,
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
}
},
"source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
"dev": true
},
"svgo": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.2.tgz",
"integrity": "sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA==",
"dev": true,
"requires": {
"chalk": "^2.4.1",
"coa": "^2.0.2",
"css-select": "^2.0.0",
"css-select-base-adapter": "^0.1.1",
"css-tree": "1.0.0-alpha.28",
"css-url-regex": "^1.1.0",
"csso": "^3.5.1",
"js-yaml": "^3.13.1",
"mkdirp": "~0.5.1",
"object.values": "^1.1.0",
"sax": "~1.2.4",
"stable": "^0.1.8",
"unquote": "~1.1.1",
"util.promisify": "~1.0.0"
},
"dependencies": {
"css-select-base-adapter": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
"integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
"dev": true
},
"css-tree": {
"version": "1.0.0-alpha.28",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz",
"integrity": "sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
},
"css-url-regex": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz",
"integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=",
"dev": true
},
"object.values": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
"integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.12.0",
"function-bind": "^1.1.1",
"has": "^1.0.3"
}
},
"stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
},
"unquote": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
"integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
"dev": true
}
}
}
</s> add </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> add "stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
}, </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> "to-regex": "^3.0.2"
<mask> },
<mask> "dependencies": {
<mask> "kind-of": {
<mask> "version": "6.0.2",
<mask> "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
<mask> "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
<mask> "dev": true
<mask> }
<mask> }
<mask> },
<mask> "miller-rabin": {
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> "brace-expansion": "^1.1.7"
<mask> }
<mask> },
<mask> "minimist": {
<mask> "version": "0.0.8",
<mask> "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
<mask> "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
<mask> "dev": true
<mask> },
<mask> "minimist-options": {
<mask> "version": "3.0.2",
<mask> "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "minimist": "1.1.x"
},
"dependencies": {
"minimist": {
"version": "1.1.3",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
"integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
"dev": true
}
</s> add "minimist": "^1.2.5" </s> remove "version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
</s> add "version": "1.2.5",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", </s> remove "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
</s> add "resolved": "", </s> remove "version": "0.5.1",
"resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
</s> add "version": "0.5.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", </s> remove "version": "4.2.3",
"resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.3.tgz",
"integrity": "sha512-Kjhohco0esHQnOiqqdJeNz/5fyPkOMD/d6XVjwTAoPGUFh0mCollPUTUTa2OZy4dYNAqlPIQdTiNzJTWdd9Htw==",
</s> add "version": "4.3.0",
"resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz",
"integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep keep replace replace replace keep keep replace keep keep keep keep | <mask> }
<mask> }
<mask> },
<mask> "mkdirp": {
<mask> "version": "0.5.1",
<mask> "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
<mask> "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
<mask> "dev": true,
<mask> "requires": {
<mask> "minimist": "0.0.8"
<mask> }
<mask> },
<mask> "move-concurrently": {
<mask> "version": "1.0.1",
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "minimist": "1.1.x"
},
"dependencies": {
"minimist": {
"version": "1.1.3",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
"integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
"dev": true
}
</s> add "minimist": "^1.2.5" </s> remove "version": "1.0.1",
"resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.1.tgz",
"integrity": "sha1-VuC/CL2XCLJqdltoUJhAyN7J/bw=",
</s> add "version": "1.0.3",
"resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz",
"integrity": "sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA==", </s> add "esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
}, </s> add "stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
}, </s> remove "version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
</s> add "version": "1.2.5",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
<mask> "dev": true
<mask> },
<mask> "kind-of": {
<mask> "version": "6.0.2",
<mask> "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
<mask> "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
<mask> "dev": true
<mask> }
<mask> }
<mask> },
<mask> "natural-compare": {
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep add keep keep keep keep keep keep | <mask> "dev": true
<mask> },
<mask> "object-keys": {
<mask> "version": "1.0.12",
<mask> "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
<mask> "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
<mask> "dev": true
<mask> },
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> add "object.assign": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
"integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
"dev": true,
"requires": {
"define-properties": "^1.1.2",
"function-bind": "^1.1.1",
"has-symbols": "^1.0.0",
"object-keys": "^1.0.11"
}
}, </s> add "unquote": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
"integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
"dev": true
}, </s> add "stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
}, </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep add keep keep keep keep keep keep | <mask> "dev": true
<mask> }
<mask> }
<mask> },
<mask> "object.getownpropertydescriptors": {
<mask> "version": "2.0.3",
<mask> "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
<mask> "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
<mask> "dev": true,
<mask> "requires": {
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove },
"dependencies": {
"coa": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
"integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
"dev": true,
"requires": {
"@types/q": "^1.5.1",
"chalk": "^2.4.1",
"q": "^1.1.2"
}
},
"css-select": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz",
"integrity": "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==",
"dev": true,
"requires": {
"boolbase": "^1.0.0",
"css-what": "^2.1.2",
"domutils": "^1.7.0",
"nth-check": "^1.0.2"
},
"dependencies": {
"css-what": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
"integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
"dev": true
},
"domutils": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
"dev": true,
"requires": {
"dom-serializer": "0",
"domelementtype": "1"
}
},
"nth-check": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
"integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
"dev": true,
"requires": {
"boolbase": "~1.0.0"
}
}
}
},
"csso": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz",
"integrity": "sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==",
"dev": true,
"requires": {
"css-tree": "1.0.0-alpha.29"
},
"dependencies": {
"css-tree": {
"version": "1.0.0-alpha.29",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz",
"integrity": "sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
}
}
},
"esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
},
"js-yaml": {
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"dev": true,
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
}
},
"source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
"dev": true
},
"svgo": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.2.tgz",
"integrity": "sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA==",
"dev": true,
"requires": {
"chalk": "^2.4.1",
"coa": "^2.0.2",
"css-select": "^2.0.0",
"css-select-base-adapter": "^0.1.1",
"css-tree": "1.0.0-alpha.28",
"css-url-regex": "^1.1.0",
"csso": "^3.5.1",
"js-yaml": "^3.13.1",
"mkdirp": "~0.5.1",
"object.values": "^1.1.0",
"sax": "~1.2.4",
"stable": "^0.1.8",
"unquote": "~1.1.1",
"util.promisify": "~1.0.0"
},
"dependencies": {
"css-select-base-adapter": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
"integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
"dev": true
},
"css-tree": {
"version": "1.0.0-alpha.28",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz",
"integrity": "sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
},
"css-url-regex": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz",
"integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=",
"dev": true
},
"object.values": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
"integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.12.0",
"function-bind": "^1.1.1",
"has": "^1.0.3"
}
},
"stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
},
"unquote": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
"integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
"dev": true
}
}
}
</s> add </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> add "esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
}, | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep keep replace replace replace keep keep replace replace replace | <mask> "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
<mask> "dev": true
<mask> },
<mask> "portfinder": {
<mask> "version": "1.0.20",
<mask> "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz",
<mask> "integrity": "sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==",
<mask> "dev": true,
<mask> "requires": {
<mask> "async": "^1.5.2",
<mask> "debug": "^2.2.0",
<mask> "mkdirp": "0.5.x"
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "version": "1.5.2",
"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
"dev": true
</s> add "version": "2.6.3",
"resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
"integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
"dev": true,
"requires": {
"lodash": "^4.17.14"
} </s> remove "version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
</s> add "version": "3.2.6",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", </s> remove },
"dependencies": {
"coa": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
"integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
"dev": true,
"requires": {
"@types/q": "^1.5.1",
"chalk": "^2.4.1",
"q": "^1.1.2"
}
},
"css-select": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz",
"integrity": "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==",
"dev": true,
"requires": {
"boolbase": "^1.0.0",
"css-what": "^2.1.2",
"domutils": "^1.7.0",
"nth-check": "^1.0.2"
},
"dependencies": {
"css-what": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
"integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
"dev": true
},
"domutils": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
"dev": true,
"requires": {
"dom-serializer": "0",
"domelementtype": "1"
}
},
"nth-check": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
"integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
"dev": true,
"requires": {
"boolbase": "~1.0.0"
}
}
}
},
"csso": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz",
"integrity": "sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==",
"dev": true,
"requires": {
"css-tree": "1.0.0-alpha.29"
},
"dependencies": {
"css-tree": {
"version": "1.0.0-alpha.29",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz",
"integrity": "sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
}
}
},
"esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
},
"js-yaml": {
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"dev": true,
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
}
},
"source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
"dev": true
},
"svgo": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.2.tgz",
"integrity": "sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA==",
"dev": true,
"requires": {
"chalk": "^2.4.1",
"coa": "^2.0.2",
"css-select": "^2.0.0",
"css-select-base-adapter": "^0.1.1",
"css-tree": "1.0.0-alpha.28",
"css-url-regex": "^1.1.0",
"csso": "^3.5.1",
"js-yaml": "^3.13.1",
"mkdirp": "~0.5.1",
"object.values": "^1.1.0",
"sax": "~1.2.4",
"stable": "^0.1.8",
"unquote": "~1.1.1",
"util.promisify": "~1.0.0"
},
"dependencies": {
"css-select-base-adapter": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
"integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
"dev": true
},
"css-tree": {
"version": "1.0.0-alpha.28",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz",
"integrity": "sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
},
"css-url-regex": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz",
"integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=",
"dev": true
},
"object.values": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
"integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.12.0",
"function-bind": "^1.1.1",
"has": "^1.0.3"
}
},
"stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
},
"unquote": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
"integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
"dev": true
}
}
}
</s> add </s> add "object-inspect": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
"integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
"dev": true
}, </s> add "esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
}, | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep replace replace replace replace keep keep replace replace replace keep keep keep keep | <mask> },
<mask> "dependencies": {
<mask> "async": {
<mask> "version": "1.5.2",
<mask> "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
<mask> "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
<mask> "dev": true
<mask> },
<mask> "debug": {
<mask> "version": "2.6.9",
<mask> "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
<mask> "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
<mask> "dev": true,
<mask> "requires": {
<mask> "ms": "2.0.0"
<mask> }
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "async": "^1.5.2",
"debug": "^2.2.0",
"mkdirp": "0.5.x"
</s> add "async": "^2.6.2",
"debug": "^3.1.1",
"mkdirp": "^0.5.1" </s> remove "ms": "2.0.0"
</s> add "ms": "^2.1.1" </s> remove "version": "1.0.20",
"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz",
"integrity": "sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==",
</s> add "version": "1.0.25",
"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz",
"integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==", </s> add },
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true </s> remove },
"dependencies": {
"coa": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
"integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
"dev": true,
"requires": {
"@types/q": "^1.5.1",
"chalk": "^2.4.1",
"q": "^1.1.2"
}
},
"css-select": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz",
"integrity": "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==",
"dev": true,
"requires": {
"boolbase": "^1.0.0",
"css-what": "^2.1.2",
"domutils": "^1.7.0",
"nth-check": "^1.0.2"
},
"dependencies": {
"css-what": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
"integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
"dev": true
},
"domutils": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
"dev": true,
"requires": {
"dom-serializer": "0",
"domelementtype": "1"
}
},
"nth-check": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
"integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
"dev": true,
"requires": {
"boolbase": "~1.0.0"
}
}
}
},
"csso": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz",
"integrity": "sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==",
"dev": true,
"requires": {
"css-tree": "1.0.0-alpha.29"
},
"dependencies": {
"css-tree": {
"version": "1.0.0-alpha.29",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz",
"integrity": "sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
}
}
},
"esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
},
"js-yaml": {
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"dev": true,
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
}
},
"source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
"dev": true
},
"svgo": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.2.tgz",
"integrity": "sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA==",
"dev": true,
"requires": {
"chalk": "^2.4.1",
"coa": "^2.0.2",
"css-select": "^2.0.0",
"css-select-base-adapter": "^0.1.1",
"css-tree": "1.0.0-alpha.28",
"css-url-regex": "^1.1.0",
"csso": "^3.5.1",
"js-yaml": "^3.13.1",
"mkdirp": "~0.5.1",
"object.values": "^1.1.0",
"sax": "~1.2.4",
"stable": "^0.1.8",
"unquote": "~1.1.1",
"util.promisify": "~1.0.0"
},
"dependencies": {
"css-select-base-adapter": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
"integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
"dev": true
},
"css-tree": {
"version": "1.0.0-alpha.28",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz",
"integrity": "sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
},
"css-url-regex": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz",
"integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=",
"dev": true
},
"object.values": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
"integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.12.0",
"function-bind": "^1.1.1",
"has": "^1.0.3"
}
},
"stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
},
"unquote": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
"integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
"dev": true
}
}
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep keep replace keep keep keep keep keep | <mask> "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
<mask> "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
<mask> "dev": true,
<mask> "requires": {
<mask> "ms": "2.0.0"
<mask> }
<mask> }
<mask> }
<mask> },
<mask> "posix-character-classes": {
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
</s> add "version": "3.2.6",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", </s> add },
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true </s> remove "version": "1.5.2",
"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
"dev": true
</s> add "version": "2.6.3",
"resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
"integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
"dev": true,
"requires": {
"lodash": "^4.17.14"
} </s> remove "version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
</s> add "version": "1.2.5",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", </s> remove "version": "0.5.1",
"resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
</s> add "version": "0.5.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", </s> remove },
"dependencies": {
"coa": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
"integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
"dev": true,
"requires": {
"@types/q": "^1.5.1",
"chalk": "^2.4.1",
"q": "^1.1.2"
}
},
"css-select": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz",
"integrity": "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==",
"dev": true,
"requires": {
"boolbase": "^1.0.0",
"css-what": "^2.1.2",
"domutils": "^1.7.0",
"nth-check": "^1.0.2"
},
"dependencies": {
"css-what": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
"integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
"dev": true
},
"domutils": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
"dev": true,
"requires": {
"dom-serializer": "0",
"domelementtype": "1"
}
},
"nth-check": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
"integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
"dev": true,
"requires": {
"boolbase": "~1.0.0"
}
}
}
},
"csso": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz",
"integrity": "sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==",
"dev": true,
"requires": {
"css-tree": "1.0.0-alpha.29"
},
"dependencies": {
"css-tree": {
"version": "1.0.0-alpha.29",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz",
"integrity": "sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
}
}
},
"esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
},
"js-yaml": {
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"dev": true,
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
}
},
"source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
"dev": true
},
"svgo": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.2.tgz",
"integrity": "sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA==",
"dev": true,
"requires": {
"chalk": "^2.4.1",
"coa": "^2.0.2",
"css-select": "^2.0.0",
"css-select-base-adapter": "^0.1.1",
"css-tree": "1.0.0-alpha.28",
"css-url-regex": "^1.1.0",
"csso": "^3.5.1",
"js-yaml": "^3.13.1",
"mkdirp": "~0.5.1",
"object.values": "^1.1.0",
"sax": "~1.2.4",
"stable": "^0.1.8",
"unquote": "~1.1.1",
"util.promisify": "~1.0.0"
},
"dependencies": {
"css-select-base-adapter": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
"integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
"dev": true
},
"css-tree": {
"version": "1.0.0-alpha.28",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz",
"integrity": "sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
},
"css-url-regex": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz",
"integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=",
"dev": true
},
"object.values": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
"integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.12.0",
"function-bind": "^1.1.1",
"has": "^1.0.3"
}
},
"stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
},
"unquote": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
"integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
"dev": true
}
}
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep add keep keep keep keep keep | <mask> "requires": {
<mask> "ms": "^2.1.1"
<mask> }
<mask> }
<mask> }
<mask> },
<mask> "posix-character-classes": {
<mask> "version": "0.1.1",
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "ms": "2.0.0"
</s> add "ms": "^2.1.1" </s> remove "version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
</s> add "version": "3.2.6",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", </s> remove "version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
</s> add "version": "1.2.5",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", </s> remove },
"dependencies": {
"coa": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
"integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
"dev": true,
"requires": {
"@types/q": "^1.5.1",
"chalk": "^2.4.1",
"q": "^1.1.2"
}
},
"css-select": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz",
"integrity": "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==",
"dev": true,
"requires": {
"boolbase": "^1.0.0",
"css-what": "^2.1.2",
"domutils": "^1.7.0",
"nth-check": "^1.0.2"
},
"dependencies": {
"css-what": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
"integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
"dev": true
},
"domutils": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
"dev": true,
"requires": {
"dom-serializer": "0",
"domelementtype": "1"
}
},
"nth-check": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
"integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
"dev": true,
"requires": {
"boolbase": "~1.0.0"
}
}
}
},
"csso": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz",
"integrity": "sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==",
"dev": true,
"requires": {
"css-tree": "1.0.0-alpha.29"
},
"dependencies": {
"css-tree": {
"version": "1.0.0-alpha.29",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz",
"integrity": "sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
}
}
},
"esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
},
"js-yaml": {
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"dev": true,
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
}
},
"source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
"dev": true
},
"svgo": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.2.tgz",
"integrity": "sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA==",
"dev": true,
"requires": {
"chalk": "^2.4.1",
"coa": "^2.0.2",
"css-select": "^2.0.0",
"css-select-base-adapter": "^0.1.1",
"css-tree": "1.0.0-alpha.28",
"css-url-regex": "^1.1.0",
"csso": "^3.5.1",
"js-yaml": "^3.13.1",
"mkdirp": "~0.5.1",
"object.values": "^1.1.0",
"sax": "~1.2.4",
"stable": "^0.1.8",
"unquote": "~1.1.1",
"util.promisify": "~1.0.0"
},
"dependencies": {
"css-select-base-adapter": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
"integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
"dev": true
},
"css-tree": {
"version": "1.0.0-alpha.28",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz",
"integrity": "sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==",
"dev": true,
"requires": {
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
},
"css-url-regex": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz",
"integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=",
"dev": true
},
"object.values": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
"integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.12.0",
"function-bind": "^1.1.1",
"has": "^1.0.3"
}
},
"stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
},
"unquote": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
"integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
"dev": true
}
}
}
</s> add </s> remove "version": "0.5.1",
"resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
</s> add "version": "0.5.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
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 replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> "postcss": "6.x",
<mask> "postcss-value-parser": "3.x",
<mask> "svgo": "1.x",
<mask> "xmldoc": "1.x"
<mask> },
<mask> "dependencies": {
<mask> "coa": {
<mask> "version": "2.0.2",
<mask> "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
<mask> "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
<mask> "dev": true,
<mask> "requires": {
<mask> "@types/q": "^1.5.1",
<mask> "chalk": "^2.4.1",
<mask> "q": "^1.1.2"
<mask> }
<mask> },
<mask> "css-select": {
<mask> "version": "2.0.2",
<mask> "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz",
<mask> "integrity": "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==",
<mask> "dev": true,
<mask> "requires": {
<mask> "boolbase": "^1.0.0",
<mask> "css-what": "^2.1.2",
<mask> "domutils": "^1.7.0",
<mask> "nth-check": "^1.0.2"
<mask> },
<mask> "dependencies": {
<mask> "css-what": {
<mask> "version": "2.1.3",
<mask> "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
<mask> "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
<mask> "dev": true
<mask> },
<mask> "domutils": {
<mask> "version": "1.7.0",
<mask> "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
<mask> "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
<mask> "dev": true,
<mask> "requires": {
<mask> "dom-serializer": "0",
<mask> "domelementtype": "1"
<mask> }
<mask> },
<mask> "nth-check": {
<mask> "version": "1.0.2",
<mask> "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
<mask> "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
<mask> "dev": true,
<mask> "requires": {
<mask> "boolbase": "~1.0.0"
<mask> }
<mask> }
<mask> }
<mask> },
<mask> "csso": {
<mask> "version": "3.5.1",
<mask> "resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz",
<mask> "integrity": "sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==",
<mask> "dev": true,
<mask> "requires": {
<mask> "css-tree": "1.0.0-alpha.29"
<mask> },
<mask> "dependencies": {
<mask> "css-tree": {
<mask> "version": "1.0.0-alpha.29",
<mask> "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz",
<mask> "integrity": "sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==",
<mask> "dev": true,
<mask> "requires": {
<mask> "mdn-data": "~1.1.0",
<mask> "source-map": "^0.5.3"
<mask> }
<mask> }
<mask> }
<mask> },
<mask> "esprima": {
<mask> "version": "4.0.1",
<mask> "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
<mask> "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
<mask> "dev": true
<mask> },
<mask> "js-yaml": {
<mask> "version": "3.13.1",
<mask> "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
<mask> "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
<mask> "dev": true,
<mask> "requires": {
<mask> "argparse": "^1.0.7",
<mask> "esprima": "^4.0.0"
<mask> }
<mask> },
<mask> "source-map": {
<mask> "version": "0.5.7",
<mask> "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
<mask> "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
<mask> "dev": true
<mask> },
<mask> "svgo": {
<mask> "version": "1.2.2",
<mask> "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.2.tgz",
<mask> "integrity": "sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA==",
<mask> "dev": true,
<mask> "requires": {
<mask> "chalk": "^2.4.1",
<mask> "coa": "^2.0.2",
<mask> "css-select": "^2.0.0",
<mask> "css-select-base-adapter": "^0.1.1",
<mask> "css-tree": "1.0.0-alpha.28",
<mask> "css-url-regex": "^1.1.0",
<mask> "csso": "^3.5.1",
<mask> "js-yaml": "^3.13.1",
<mask> "mkdirp": "~0.5.1",
<mask> "object.values": "^1.1.0",
<mask> "sax": "~1.2.4",
<mask> "stable": "^0.1.8",
<mask> "unquote": "~1.1.1",
<mask> "util.promisify": "~1.0.0"
<mask> },
<mask> "dependencies": {
<mask> "css-select-base-adapter": {
<mask> "version": "0.1.1",
<mask> "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
<mask> "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
<mask> "dev": true
<mask> },
<mask> "css-tree": {
<mask> "version": "1.0.0-alpha.28",
<mask> "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz",
<mask> "integrity": "sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==",
<mask> "dev": true,
<mask> "requires": {
<mask> "mdn-data": "~1.1.0",
<mask> "source-map": "^0.5.3"
<mask> }
<mask> },
<mask> "css-url-regex": {
<mask> "version": "1.1.0",
<mask> "resolved": "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz",
<mask> "integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=",
<mask> "dev": true
<mask> },
<mask> "object.values": {
<mask> "version": "1.1.0",
<mask> "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
<mask> "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
<mask> "dev": true,
<mask> "requires": {
<mask> "define-properties": "^1.1.3",
<mask> "es-abstract": "^1.12.0",
<mask> "function-bind": "^1.1.1",
<mask> "has": "^1.0.3"
<mask> }
<mask> },
<mask> "stable": {
<mask> "version": "0.1.8",
<mask> "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
<mask> "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
<mask> "dev": true
<mask> },
<mask> "unquote": {
<mask> "version": "1.1.1",
<mask> "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
<mask> "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
<mask> "dev": true
<mask> }
<mask> }
<mask> }
<mask> }
<mask> },
<mask> "postcss-syntax": {
<mask> "version": "0.36.2",
<mask> "resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz",
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> add "coa": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
"integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
"dev": true,
"requires": {
"@types/q": "^1.5.1",
"chalk": "^2.4.1",
"q": "^1.1.2"
}
}, </s> add "js-yaml": {
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"dev": true,
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
}
}, </s> add "esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
}, </s> add "stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
}, </s> add "object.assign": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
"integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
"dev": true,
"requires": {
"define-properties": "^1.1.2",
"function-bind": "^1.1.1",
"has-symbols": "^1.0.0",
"object-keys": "^1.0.11"
}
}, </s> remove "minimist": "1.1.x"
},
"dependencies": {
"minimist": {
"version": "1.1.3",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
"integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
"dev": true
}
</s> add "minimist": "^1.2.5" | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
keep keep keep keep replace replace keep keep keep keep keep | <mask> "dev": true
<mask> },
<mask> "kind-of": {
<mask> "version": "6.0.2",
<mask> "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
<mask> "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
<mask> "dev": true
<mask> }
<mask> }
<mask> },
<mask> "snapdragon-util": {
</s> + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", </s> remove "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", | https://github.com/AdguardTeam/AdGuardHome/commit/3b0914715ee0be2a5b6236729b9976193db9bb17 | client/package-lock.json |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.