code_before stringlengths 16 1.81M | edits stringlengths 4 328k | next_edit stringlengths 0 76.5k | code_after stringlengths 3 49.9M | label_window listlengths 4 1.81k | instruction stringlengths 20 51.9k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|---|---|---|
<li>
<code>tcp://unfiltered.adguard-dns.com</code>: <Trans>example_upstream_tcp_hostname</Trans>
</li>
<li>
<code>tls://unfiltered.adguard-dns.com</code>:
<span>
<Trans
compone... | </s> remove <code>https://unfiltered.adguard-dns.com/dns-query</code>:
<span>
<Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
... | <code>tls://unfiltered.adguard-dns.com</code>: <Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_TLS"
target="_blank"
rel="noopener noreferrer"
... | <li>
<code>tcp://unfiltered.adguard-dns.com</code>: <Trans>example_upstream_tcp_hostname</Trans>
</li>
<li>
<code>tls://unfiltered.adguard-dns.com</code>: <Trans
components={[
<a
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace... | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | client/src/components/Settings/Dns/Upstream/Examples.js |
</Trans>
</span>
</li>
<li>
<code>https://unfiltered.adguard-dns.com/dns-query</code>:
<span>
<Trans
components={[
<a
... | </s> remove <code>sdns://...</code>:
<span>
<Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
... | <code>https://unfiltered.adguard-dns.com/dns-query</code>: <Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"... | </Trans>
</span>
</li>
<li>
<code>https://unfiltered.adguard-dns.com/dns-query</code>: <Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace... | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | client/src/components/Settings/Dns/Upstream/Examples.js |
</Trans>
</span>
</li>
<li>
<code>quic://unfiltered.adguard-dns.com:784</code>:
<span>
<Trans
components={[
<a
... | </s> remove <code>https://unfiltered.adguard-dns.com/dns-query</code>:
<span>
<Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
... | <code>quic://unfiltered.adguard-dns.com</code>: <Trans
components={[
<a
href="https://datatracker.ietf.org/doc/html/rfc9250"
target="_blank"
rel="noopener noreferrer"
... | </Trans>
</span>
</li>
<li>
<code>quic://unfiltered.adguard-dns.com</code>: <Trans
components={[
<a
href="https://datatracker.ietf.org/doc/html/rfc9250"
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace... | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | client/src/components/Settings/Dns/Upstream/Examples.js |
</Trans>
</span>
</li>
<li>
<code>sdns://...</code>:
<span>
<Trans
components={[
<a
href="https://dnscry... | </s> remove <code>https://unfiltered.adguard-dns.com/dns-query</code>:
<span>
<Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
... | <code>sdns://...</code>: <Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
rel="noopener noreferrer"
key="0"
... | </Trans>
</span>
</li>
<li>
<code>sdns://...</code>: <Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace... | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | client/src/components/Settings/Dns/Upstream/Examples.js |
</Trans>
</span>
</li>
<li>
<code>[/example.local/]94.140.14.140</code>:
<span>
<Trans
components={[
<a
... | </s> remove <code>sdns://...</code>:
<span>
<Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
... | <code>[/example.local/]94.140.14.140</code>: <Trans
components={[
<a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams-for-domains"
target="_blank"
... | </Trans>
</span>
</li>
<li>
<code>[/example.local/]94.140.14.140</code>: <Trans
components={[
<a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace... | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | client/src/components/Settings/Dns/Upstream/Examples.js |
</Trans>
</span>
</li>
<li>
<code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>:
<span>
<Trans>example_upstream_comment</Trans>
</span>
</li>
</ol>
... | </s> remove <code>[/example.local/]94.140.14.140</code>:
<span>
<Trans
components={[
<a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams-for-domains"
... | <code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>: <Trans>
example_upstream_comment
</Trans> | </Trans>
</span>
</li>
<li>
<code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>: <Trans>
example_upstream_comment
</Trans>
<code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>: <Trans>
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace... | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | client/src/components/Settings/Dns/Upstream/Examples.js |
export const STANDARD_DNS_PORT = 53;
export const STANDARD_WEB_PORT = 80;
export const STANDARD_HTTPS_PORT = 443;
export const DNS_OVER_TLS_PORT = 853;
export const DNS_OVER_QUIC_PORT = 784;
export const MAX_PORT = 65535;
export const EMPTY_DATE = '0001-01-01T00:00:00Z';
export const DEBOUNCE_TIME... | </s> remove <code>sdns://...</code>:
<span>
<Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
... | export const DNS_OVER_QUIC_PORT = 853; | export const STANDARD_DNS_PORT = 53;
export const STANDARD_WEB_PORT = 80;
export const STANDARD_HTTPS_PORT = 443;
export const DNS_OVER_TLS_PORT = 853;
export const DNS_OVER_QUIC_PORT = 853;
export const MAX_PORT = 65535;
export const EMPTY_DATE = '0001-01-01T00:00:00Z';
export const DEBOUNCE_TIMEOU... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace... | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | client/src/helpers/constants.js |
'description': >
Validatable TLS settings.
'example':
'certificate_path': '/etc/ssl/example.com.cert'
'port_dns_over_quic': 784
'port_dns_over_tls': 853
'port_https': 443
'private_key_path': '/etc/ssl/example.com.key'
'server_name': '... | </s> remove 'port_dns_over_quic': 784
</s> add 'port_dns_over_quic': 853 </s> remove 'default': 784
</s> add 'default': 853 </s> remove 'default': 784
</s> add 'default': 853 </s> remove <code>sdns://...</code>:
<span>
... | 'port_dns_over_quic': 853 | 'description': >
Validatable TLS settings.
'example':
'certificate_path': '/etc/ssl/example.com.cert'
'port_dns_over_quic': 853
'port_dns_over_tls': 853
'port_https': 443
'private_key_path': '/etc/ssl/example.com.key'
'server_name': 'dn... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace... | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | openapi/v1.yaml |
Should not be sent if `certificate` is sent. Otherwise, must be
sent.
'type': 'string'
'port_dns_over_quic':
'default': 784
'description': >
The DNS-over-QUIC port. If `0`, DNS-over-QUIC is disabled.
'format': 'int64'
... | </s> remove 'default': 784
</s> add 'default': 853 </s> remove 'port_dns_over_quic': 784
</s> add 'port_dns_over_quic': 853 </s> remove 'port_dns_over_quic': 784
</s> add 'port_dns_over_quic': 853 | 'default': 853 | Should not be sent if `certificate` is sent. Otherwise, must be
sent.
'type': 'string'
'port_dns_over_quic':
'default': 853
'description': >
The DNS-over-QUIC port. If `0`, DNS-over-QUIC is disabled.
'format': 'int64'
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace... | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | openapi/v1.yaml |
TLS and encryption settings.
'example':
'certificate_path': '/etc/ssl/example.com.cert'
'enabled': true
'port_dns_over_quic': 784
'port_dns_over_tls': 853
'port_https': 443
'private_key_path': '/etc/ssl/example.com.key'
... | </s> remove 'port_dns_over_quic': 784
</s> add 'port_dns_over_quic': 853 </s> remove 'default': 784
</s> add 'default': 853 </s> remove 'default': 784
</s> add 'default': 853 </s> remove <code>https://unfiltered.adguard-dns.com/dns-query</code>:... | 'port_dns_over_quic': 853 | TLS and encryption settings.
'example':
'certificate_path': '/etc/ssl/example.com.cert'
'enabled': true
'port_dns_over_quic': 853
'port_dns_over_tls': 853
'port_https': 443
'private_key_path': '/etc/ssl/example.com.key'
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace... | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | openapi/v1.yaml |
over HTTPS, and the DNS server will listen requests over
DNS-over-TLS and other protocols.
'type': 'boolean'
'port_dns_over_quic':
'default': 784
'description': >
The DNS-over-QUIC port. If `0`, DNS-over-QUIC is disabled.
... | </s> remove 'default': 784
</s> add 'default': 853 </s> remove 'port_dns_over_quic': 784
</s> add 'port_dns_over_quic': 853 </s> remove 'port_dns_over_quic': 784
</s> add 'port_dns_over_quic': 853 </s> remove * `quic://unfiltered.adguard-dns.com:784`:... | 'default': 853 | over HTTPS, and the DNS server will listen requests over
DNS-over-TLS and other protocols.
'type': 'boolean'
'port_dns_over_quic':
'default': 853
'description': >
The DNS-over-QUIC port. If `0`, DNS-over-QUIC is disabled.
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace... | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | openapi/v1.yaml |
* `https://unfiltered.adguard-dns.com/dns-query`: encrypted
DNS-over-HTTPS.
* `quic://unfiltered.adguard-dns.com:784`: encrypted DNS-over-QUIC
(experimental).
* `tcp://94.140.14.140`: plain DNS-over-TCP.
* `sdns://...`: DNS Stamps... | </s> remove <code>sdns://...</code>:
<span>
<Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
... | * `quic://unfiltered.adguard-dns.com`: encrypted DNS-over-QUIC. |
* `https://unfiltered.adguard-dns.com/dns-query`: encrypted
DNS-over-HTTPS.
* `quic://unfiltered.adguard-dns.com`: encrypted DNS-over-QUIC.
* `quic://unfiltered.adguard-dns.com`: encrypted DNS-over-QUIC.
* `tcp://94.140.14.140`: plain DNS-over-TCP.
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace... | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | openapi/v1.yaml |
# 6060 : TCP : HTTP (pprof)
# 8853 : UDP : DNS-over-QUIC (experimental)
EXPOSE 53/tcp 53/udp 67/udp 68/udp 80/tcp 443/tcp 443/udp 784/udp\
853/tcp 853/udp 3000/tcp 3000/udp 3001/tcp 3001/udp 5443/tcp\
5443/udp 6060/tcp 8853/udp
| </s> remove 'default': 784
</s> add 'default': 853 </s> remove 'default': 784
</s> add 'default': 853 </s> remove <code>quic://unfiltered.adguard-dns.com:784</code>:
<span>
<Trans
components={[
... | #
# TODO(a.garipov): Remove the old, non-standard 784 and 8853 ports for
# DNS-over-QUIC in a future release. | # 6060 : TCP : HTTP (pprof)
# 8853 : UDP : DNS-over-QUIC (experimental)
#
# TODO(a.garipov): Remove the old, non-standard 784 and 8853 ports for
# DNS-over-QUIC in a future release.
EXPOSE 53/tcp 53/udp 67/udp 68/udp 80/tcp 443/tcp 443/udp 784/udp\
853/tcp 853/udp 3000/tcp 3000/udp 3001/tcp 3001/... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace... | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | scripts/make/Dockerfile |
httpError(w, http.StatusBadRequest, "Failed to parse new upstreams config json: %s", err)
return
}
config.DNS.UpstreamDNS = defaultDNS
if len(newconfig.Upstreams) > 0 {
config.DNS.UpstreamDNS = newconfig.Upstreams
}
// bootstrap servers are plain DNS only.
| </s> remove // bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice
</s> add // bootstrap servers are plain DNS only. </s> remove err := checkPlainDNS(host)
if err != nil {
</s> add if err := checkPlainDNS(host); err != nil { </s> remove re... | for _, u := range newconfig.Upstreams {
if err = validateUpstream(u); err != nil {
httpError(w, http.StatusBadRequest, "%s can not be used as upstream cause: %s", u, err)
return
}
}
| httpError(w, http.StatusBadRequest, "Failed to parse new upstreams config json: %s", err)
return
}
for _, u := range newconfig.Upstreams {
if err = validateUpstream(u); err != nil {
httpError(w, http.StatusBadRequest, "%s can not be used as upstream cause: %s", u, err)
return
}
}
config.DN... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | [change] control: add upstreams validation | https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c | control.go |
if len(newconfig.Upstreams) > 0 {
config.DNS.UpstreamDNS = newconfig.Upstreams
}
// bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice
for _, host := range newconfig.BootstrapDNS {
err := checkPlainDNS(host)
if err != nil {... | </s> remove err := checkPlainDNS(host)
if err != nil {
</s> add if err := checkPlainDNS(host); err != nil { </s> remove if net.ParseIP(host) != nil {
</s> add if net.ParseIP(upstream) != nil { </s> remove ip, port, err := net.SplitHostPort(host)
</s> add ip, port, err := net.SplitHostPort(upstream) </s> re... | // bootstrap servers are plain DNS only. | if len(newconfig.Upstreams) > 0 {
config.DNS.UpstreamDNS = newconfig.Upstreams
}
// bootstrap servers are plain DNS only.
for _, host := range newconfig.BootstrapDNS {
err := checkPlainDNS(host)
if err != nil {
httpError(w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause:... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | [change] control: add upstreams validation | https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c | control.go |
}
// bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice
for _, host := range newconfig.BootstrapDNS {
err := checkPlainDNS(host)
if err != nil {
httpError(w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: ... | </s> remove // bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice
</s> add // bootstrap servers are plain DNS only. </s> remove ip, port, err := net.SplitHostPort(host)
</s> add ip, port, err := net.SplitHostPort(upstream) </s> remove if net.P... | if err := checkPlainDNS(host); err != nil { | }
// bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice
for _, host := range newconfig.BootstrapDNS {
if err := checkPlainDNS(host); err != nil {
if err := checkPlainDNS(host); err != nil {
httpError(w, http.StatusBadRequest, "%s... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | [change] control: add upstreams validation | https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c | control.go |
}
// checkPlainDNS checks if host is plain DNS
func checkPlainDNS(upstream string) error {
// Check if host is ip without port
if net.ParseIP(upstream) != nil {
return nil
| </s> remove func checkPlainDNS(host string) error {
</s> add func checkPlainDNS(upstream string) error { </s> remove if net.ParseIP(host) != nil {
</s> add if net.ParseIP(upstream) != nil { </s> remove ip, port, err := net.SplitHostPort(host)
</s> add ip, port, err := net.SplitHostPort(upstream) </s> remove er... | func validateUpstream(upstream string) error {
if strings.HasPrefix(upstream, "tls://") || strings.HasPrefix(upstream, "https://") || strings.HasPrefix(upstream, "sdns://") || strings.HasPrefix(upstream, "tcp://") {
return nil
}
if strings.Contains(upstream, "://") {
return fmt.Errorf("wrong protocol")
}
ret... | }
func validateUpstream(upstream string) error {
if strings.HasPrefix(upstream, "tls://") || strings.HasPrefix(upstream, "https://") || strings.HasPrefix(upstream, "sdns://") || strings.HasPrefix(upstream, "tcp://") {
return nil
}
if strings.Contains(upstream, "://") {
return fmt.Errorf("wrong protocol")
... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | [change] control: add upstreams validation | https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c | control.go |
httpUpdateConfigReloadDNSReturnOK(w, r)
}
// checkPlainDNS checks if host is plain DNS
func checkPlainDNS(host string) error {
// Check if host is ip without port
if net.ParseIP(host) != nil {
return nil
}
| </s> remove if net.ParseIP(host) != nil {
</s> add if net.ParseIP(upstream) != nil { </s> remove ip, port, err := net.SplitHostPort(host)
</s> add ip, port, err := net.SplitHostPort(upstream) </s> remove err := checkPlainDNS(host)
if err != nil {
</s> add if err := checkPlainDNS(host); err != nil { </s> re... | func checkPlainDNS(upstream string) error { | httpUpdateConfigReloadDNSReturnOK(w, r)
}
// checkPlainDNS checks if host is plain DNS
func checkPlainDNS(upstream string) error {
// Check if host is ip without port
if net.ParseIP(host) != nil {
return nil
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | [change] control: add upstreams validation | https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c | control.go |
// checkPlainDNS checks if host is plain DNS
func checkPlainDNS(host string) error {
// Check if host is ip without port
if net.ParseIP(host) != nil {
return nil
}
// Check if host is ip with port
ip, port, err := net.SplitHostPort(host)
| </s> remove func checkPlainDNS(host string) error {
</s> add func checkPlainDNS(upstream string) error { </s> remove ip, port, err := net.SplitHostPort(host)
</s> add ip, port, err := net.SplitHostPort(upstream) </s> remove err := checkPlainDNS(host)
if err != nil {
</s> add if err := checkPlainDNS(host); er... | if net.ParseIP(upstream) != nil { |
// checkPlainDNS checks if host is plain DNS
func checkPlainDNS(host string) error {
// Check if host is ip without port
if net.ParseIP(upstream) != nil {
return nil
}
// Check if host is ip with port
ip, port, err := net.SplitHostPort(host) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | [change] control: add upstreams validation | https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c | control.go |
return nil
}
// Check if host is ip with port
ip, port, err := net.SplitHostPort(host)
if err != nil {
return err
}
if net.ParseIP(ip) == nil {
| </s> remove if net.ParseIP(host) != nil {
</s> add if net.ParseIP(upstream) != nil { </s> remove return fmt.Errorf("%s is not valid IP", ip)
</s> add return fmt.Errorf("%s is not a valid IP", ip) </s> remove func checkPlainDNS(host string) error {
</s> add func checkPlainDNS(upstream string) error { </s> remov... | ip, port, err := net.SplitHostPort(upstream) | return nil
}
// Check if host is ip with port
ip, port, err := net.SplitHostPort(upstream)
if err != nil {
return err
}
if net.ParseIP(ip) == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | [change] control: add upstreams validation | https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c | control.go |
return err
}
if net.ParseIP(ip) == nil {
return fmt.Errorf("%s is not valid IP", ip)
}
_, err = strconv.ParseInt(port, 0, 64)
if err != nil {
return fmt.Errorf("%s is not valid port: %s", port, err)
| </s> remove return fmt.Errorf("%s is not valid port: %s", port, err)
</s> add return fmt.Errorf("%s is not a valid port: %s", port, err) </s> remove ip, port, err := net.SplitHostPort(host)
</s> add ip, port, err := net.SplitHostPort(upstream) </s> remove err := checkPlainDNS(host)
if err != nil {
</s> add... | return fmt.Errorf("%s is not a valid IP", ip) | return err
}
if net.ParseIP(ip) == nil {
return fmt.Errorf("%s is not a valid IP", ip)
}
_, err = strconv.ParseInt(port, 0, 64)
if err != nil {
return fmt.Errorf("%s is not valid port: %s", port, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | [change] control: add upstreams validation | https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c | control.go |
}
_, err = strconv.ParseInt(port, 0, 64)
if err != nil {
return fmt.Errorf("%s is not valid port: %s", port, err)
}
return nil
}
| </s> remove return fmt.Errorf("%s is not valid IP", ip)
</s> add return fmt.Errorf("%s is not a valid IP", ip) </s> remove ip, port, err := net.SplitHostPort(host)
</s> add ip, port, err := net.SplitHostPort(upstream) </s> remove err := checkPlainDNS(host)
if err != nil {
</s> add if err := checkPlainDNS... | return fmt.Errorf("%s is not a valid port: %s", port, err) | }
_, err = strconv.ParseInt(port, 0, 64)
if err != nil {
return fmt.Errorf("%s is not a valid port: %s", port, err)
}
return nil
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | [change] control: add upstreams validation | https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c | control.go |
const defaultParentalURL = "%s://%s/check-parental-control-hash?prefixes=%s&sensitivity=%d"
const defaultParentalSensitivity = 13 // use "TEEN" by default
const maxDialCacheSize = 2 // the number of host names for safebrowsing and parental control
// Custom filtering settings
type RequestFilteri... | </s> remove msg := d.Req
host := strings.TrimSuffix(msg.Question[0].Name, ".")
</s> add var res dnsfilter.Result
req := d.Req
host := strings.TrimSuffix(req.Question[0].Name, ".")
origHost := host | // RequestFilteringSettings is custom filtering settings | const defaultParentalURL = "%s://%s/check-parental-control-hash?prefixes=%s&sensitivity=%d"
const defaultParentalSensitivity = 13 // use "TEEN" by default
const maxDialCacheSize = 2 // the number of host names for safebrowsing and parental control
// RequestFilteringSettings is custom filtering sett... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + dnsforward: use Rewrites table | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsfilter/dnsfilter.go |
}
// Config allows you to configure DNS filtering with New() or just change variables directly.
type Config struct {
ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
UsePlainHTTP bool `yaml:"-"` // ... | </s> remove // Custom filtering settings
</s> add // RequestFilteringSettings is custom filtering settings | // RewriteEntry is a rewrite array element
type RewriteEntry struct {
Domain string `yaml:"domain"`
Answer string `yaml:"answer"` // IP address or canonical name
}
| }
// RewriteEntry is a rewrite array element
type RewriteEntry struct {
Domain string `yaml:"domain"`
Answer string `yaml:"answer"` // IP address or canonical name
}
// Config allows you to configure DNS filtering with New() or just change variables directly.
type Config struct {
ParentalSensitivity int ... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + dnsforward: use Rewrites table | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsfilter/dnsfilter.go |
SafeBrowsingCacheSize int `yaml:"safebrowsing_cache_size"`
SafeSearchCacheSize int `yaml:"safesearch_cache_size"`
ParentalCacheSize int `yaml:"parental_cache_size"`
// Filtering callback function
FilterHandler func(clientAddr string, settings *RequestFilteringSettings) `yaml:"-"`
}
type p... | </s> remove // Custom filtering settings
</s> add // RequestFilteringSettings is custom filtering settings | Rewrites []RewriteEntry `yaml:"rewrites"`
| SafeBrowsingCacheSize int `yaml:"safebrowsing_cache_size"`
SafeSearchCacheSize int `yaml:"safesearch_cache_size"`
ParentalCacheSize int `yaml:"parental_cache_size"`
Rewrites []RewriteEntry `yaml:"rewrites"`
// Filtering callback function
FilterHandler func(clientAddr string, settings *RequestF... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + dnsforward: use Rewrites table | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsfilter/dnsfilter.go |
// FilteredSafeSearch - the host was replaced with safesearch variant
FilteredSafeSearch
)
func (i Reason) String() string {
names := []string{
| </s> remove // Custom filtering settings
</s> add // RequestFilteringSettings is custom filtering settings </s> remove msg := d.Req
host := strings.TrimSuffix(msg.Question[0].Name, ".")
</s> add var res dnsfilter.Result
req := d.Req
host := strings.TrimSuffix(req.Question[0].Name, ".")
origHost := host | // ReasonRewrite - rewrite rule was applied
ReasonRewrite | // FilteredSafeSearch - the host was replaced with safesearch variant
FilteredSafeSearch
// ReasonRewrite - rewrite rule was applied
ReasonRewrite
)
func (i Reason) String() string {
names := []string{ | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | + dnsforward: use Rewrites table | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsfilter/dnsfilter.go |
"FilteredSafeBrowsing",
"FilteredParental",
"FilteredInvalid",
"FilteredSafeSearch",
}
if uint(i) >= uint(len(names)) {
return ""
}
return names[i]
}
| </s> remove var res dnsfilter.Result
</s> add if host != origHost {
log.Debug("Rewrite: not supported: CNAME for %s is %s", origHost, host)
}
| "Rewrite", | "FilteredSafeBrowsing",
"FilteredParental",
"FilteredInvalid",
"FilteredSafeSearch",
"Rewrite",
}
if uint(i) >= uint(len(names)) {
return ""
}
return names[i]
} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + dnsforward: use Rewrites table | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsfilter/dnsfilter.go |
IP net.IP `json:",omitempty"` // Not nil only in the case of a hosts file syntax
FilterID int64 `json:",omitempty"` // Filter ID the rule belongs to
}
// Matched can be used to see if any match at all was found, no matter filtered or not
func (r Reason) Matched() bool {
return r != NotFilte... | </s> remove // Custom filtering settings
</s> add // RequestFilteringSettings is custom filtering settings </s> remove msg := d.Req
host := strings.TrimSuffix(msg.Question[0].Name, ".")
</s> add var res dnsfilter.Result
req := d.Req
host := strings.TrimSuffix(req.Question[0].Name, ".")
origHost := host | // for ReasonRewrite:
CanonName string `json:",omitempty"` // CNAME value
IPList []net.IP `json:",omitempty"` // list of IP addresses | IP net.IP `json:",omitempty"` // Not nil only in the case of a hosts file syntax
FilterID int64 `json:",omitempty"` // Filter ID the rule belongs to
// for ReasonRewrite:
CanonName string `json:",omitempty"` // CNAME value
IPList []net.IP `json:",omitempty"` // list of IP addresses
}
// ... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + dnsforward: use Rewrites table | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsfilter/dnsfilter.go |
var result Result
var err error
// try filter lists first
if setts.FilteringEnabled {
result, err = d.matchHost(host, qtype)
if err != nil {
| </s> remove var res dnsfilter.Result
</s> add if host != origHost {
log.Debug("Rewrite: not supported: CNAME for %s is %s", origHost, host)
}
</s> remove msg := d.Req
host := strings.TrimSuffix(msg.Question[0].Name, ".")
</s> add var res dnsfilter.Result
req := d.Req
host := strings.TrimSuffix(req.Question... | result = d.processRewrites(host, qtype)
if result.Reason == ReasonRewrite {
return result, nil
}
|
var result Result
var err error
result = d.processRewrites(host, qtype)
if result.Reason == ReasonRewrite {
return result, nil
}
// try filter lists first
if setts.FilteringEnabled {
result, err = d.matchHost(host, qtype)
if err != nil { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | + dnsforward: use Rewrites table | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsfilter/dnsfilter.go |
if d.Res == nil {
// request was not filtered so let it be processed further
err = p.Resolve(d)
if err != nil {
return err
}
| </s> remove var res dnsfilter.Result
</s> add if host != origHost {
log.Debug("Rewrite: not supported: CNAME for %s is %s", origHost, host)
}
</s> remove msg := d.Req
host := strings.TrimSuffix(msg.Question[0].Name, ".")
</s> add var res dnsfilter.Result
req := d.Req
host := strings.TrimSuffix(req.Question... | answer := []dns.RR{}
originalQuestion := d.Req.Question[0]
if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
// resolve canonical name, not the original host name
d.Req.Question[0].Name = dns.Fqdn(res.CanonName)
}
|
if d.Res == nil {
answer := []dns.RR{}
originalQuestion := d.Req.Question[0]
if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
// resolve canonical name, not the original host name
d.Req.Question[0].Name = dns.Fqdn... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + dnsforward: use Rewrites table | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsforward/dnsforward.go |
return err
}
}
shouldLog := true
msg := d.Req
| </s> remove msg := d.Req
host := strings.TrimSuffix(msg.Question[0].Name, ".")
</s> add var res dnsfilter.Result
req := d.Req
host := strings.TrimSuffix(req.Question[0].Name, ".")
origHost := host | if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = originalQuestion
d.Res.Question[0] = originalQuestion
if len(d.Res.Answer) != 0 {
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer
}
} | return err
}
if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = originalQuestion
d.Res.Question[0] = originalQuestion
if len(d.Res.Answer) != 0 {
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer
}
}
}
shouldLo... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + dnsforward: use Rewrites table | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsforward/dnsforward.go |
}
// filterDNSRequest applies the dnsFilter and sets d.Res if the request was filtered
func (s *Server) filterDNSRequest(d *proxy.DNSContext) (*dnsfilter.Result, error) {
msg := d.Req
host := strings.TrimSuffix(msg.Question[0].Name, ".")
s.RLock()
protectionEnabled := s.conf.ProtectionEnabled
... | </s> | var res dnsfilter.Result
req := d.Req
host := strings.TrimSuffix(req.Question[0].Name, ".")
origHost := host | }
// filterDNSRequest applies the dnsFilter and sets d.Res if the request was filtered
func (s *Server) filterDNSRequest(d *proxy.DNSContext) (*dnsfilter.Result, error) {
var res dnsfilter.Result
req := d.Req
host := strings.TrimSuffix(req.Question[0].Name, ".")
origHost := host
var res dnsfilter.Result
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + dnsforward: use Rewrites table | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsforward/dnsforward.go |
if !protectionEnabled {
return nil, nil
}
var res dnsfilter.Result
var err error
clientAddr := ""
if d.Addr != nil {
clientAddr, _, _ = net.SplitHostPort(d.Addr.String())
| </s> remove msg := d.Req
host := strings.TrimSuffix(msg.Question[0].Name, ".")
</s> add var res dnsfilter.Result
req := d.Req
host := strings.TrimSuffix(req.Question[0].Name, ".")
origHost := host | if host != origHost {
log.Debug("Rewrite: not supported: CNAME for %s is %s", origHost, host)
}
| if !protectionEnabled {
return nil, nil
}
if host != origHost {
log.Debug("Rewrite: not supported: CNAME for %s is %s", origHost, host)
}
var err error
clientAddr := ""
if d.Addr != nil {
clientAddr, _, _ = net.SplitHostPort(d.Addr.String()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + dnsforward: use Rewrites table | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsforward/dnsforward.go |
return &resp
}
func (s *Server) genNXDomain(request *dns.Msg) *dns.Msg {
resp := dns.Msg{}
resp.SetRcode(request, dns.RcodeNameError)
resp.RecursionAvailable = true
| </s> remove msg := d.Req
host := strings.TrimSuffix(msg.Question[0].Name, ".")
</s> add var res dnsfilter.Result
req := d.Req
host := strings.TrimSuffix(req.Question[0].Name, ".")
origHost := host </s> remove var res dnsfilter.Result
</s> add if host != origHost {
log.Debug("Rewrite: not supported: CNAME fo... | // Make a CNAME response
func (s *Server) genCNAMEAnswer(req *dns.Msg, cname string) *dns.CNAME {
answer := new(dns.CNAME)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeCNAME,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
}
answer.Target = dns.Fqdn(cname)
return answ... |
return &resp
}
// Make a CNAME response
func (s *Server) genCNAMEAnswer(req *dns.Msg, cname string) *dns.CNAME {
answer := new(dns.CNAME)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeCNAME,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
}
answer.Target = dn... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | + dnsforward: use Rewrites table | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsforward/dnsforward.go |
}
}
func TestParseService(t *testing.T) {
if testParseOk(t).serviceControlAction != "" {
t.Fatal("empty is no service command")
}
| </s> remove serviceControlAction: "run",
configFilename: "config",
workDir: "work",
pidFile: "pid",
disableUpdate: true,
}, "-c", "config", "-w", "work", "-s", "run", "--pidfile", "pid", "--no-check-update")
</s> add serviceControlAction: "run",
configFilename... | func TestParseDisableMemoryOptimization(t *testing.T) {
if testParseOk(t).disableMemoryOptimization {
t.Fatal("empty is not disable update")
}
if !testParseOk(t, "--no-mem-optimization").disableMemoryOptimization {
t.Fatal("--no-mem-optimization is disable update")
}
}
| }
}
func TestParseDisableMemoryOptimization(t *testing.T) {
if testParseOk(t).disableMemoryOptimization {
t.Fatal("empty is not disable update")
}
if !testParseOk(t, "--no-mem-optimization").disableMemoryOptimization {
t.Fatal("--no-mem-optimization is disable update")
}
}
func TestParseService(t *te... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | * (home): added tests for no-mem-optimization flag | https://github.com/AdguardTeam/AdGuardHome/commit/1c88667306e7a52d36a6a1cbf3eca86fd612bd7f | home/options_test.go |
func TestSerializeGLInet(t *testing.T) {
testSerialize(t, options{glinetMode: true}, "--glinet")
}
func TestSerializeMultiple(t *testing.T) {
testSerialize(t, options{
serviceControlAction: "run",
configFilename: "config",
workDir: "work",
pidFile: ... | </s> remove serviceControlAction: "run",
configFilename: "config",
workDir: "work",
pidFile: "pid",
disableUpdate: true,
}, "-c", "config", "-w", "work", "-s", "run", "--pidfile", "pid", "--no-check-update")
</s> add serviceControlAction: "run",
configFilename... | func TestSerializeDisableMemoryOptimization(t *testing.T) {
testSerialize(t, options{disableMemoryOptimization: true}, "--no-mem-optimization")
}
| func TestSerializeGLInet(t *testing.T) {
testSerialize(t, options{glinetMode: true}, "--glinet")
}
func TestSerializeDisableMemoryOptimization(t *testing.T) {
testSerialize(t, options{disableMemoryOptimization: true}, "--no-mem-optimization")
}
func TestSerializeMultiple(t *testing.T) {
testSerialize(t... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * (home): added tests for no-mem-optimization flag | https://github.com/AdguardTeam/AdGuardHome/commit/1c88667306e7a52d36a6a1cbf3eca86fd612bd7f | home/options_test.go |
}
func TestSerializeMultiple(t *testing.T) {
testSerialize(t, options{
serviceControlAction: "run",
configFilename: "config",
workDir: "work",
pidFile: "pid",
disableUpdate: true,
}, "-c", "config", "-w", "work", "-s", "run", "--pidfile", "pid", "-... | </s> | serviceControlAction: "run",
configFilename: "config",
workDir: "work",
pidFile: "pid",
disableUpdate: true,
disableMemoryOptimization: true,
}, "-c", "config", "-w", "work", "-s", "run", "--pidfile", "pid", "--no-check-update", "--no-mem-opti... | }
func TestSerializeMultiple(t *testing.T) {
testSerialize(t, options{
serviceControlAction: "run",
configFilename: "config",
workDir: "work",
pidFile: "pid",
disableUpdate: true,
disableMemoryOptimization: true,
}, "-c", "config", "... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep"
] | * (home): added tests for no-mem-optimization flag | https://github.com/AdguardTeam/AdGuardHome/commit/1c88667306e7a52d36a6a1cbf3eca86fd612bd7f | home/options_test.go |
sync.RWMutex
ServerConfig
}
// uncomment this block to have tracing of locks
/*
func (s *Server) Lock() {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Callers(2, pc)
f := runtime.FuncForPC(pc[0])
| </s> remove upstream := s.chooseUpstream()
</s> add | const (
safeBrowsingBlockHost = "standard-block.dns.adguard.com"
parentalBlockHost = "family-block.dns.adguard.com"
)
| sync.RWMutex
ServerConfig
}
const (
safeBrowsingBlockHost = "standard-block.dns.adguard.com"
parentalBlockHost = "family-block.dns.adguard.com"
)
// uncomment this block to have tracing of locks
/*
func (s *Server) Lock() {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Calle... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Resolve into a stub page when blocked by parental or safebrowsing.
Closes #475. | https://github.com/AdguardTeam/AdGuardHome/commit/1c89e1df32d5fcb9d69156c9bfcc1680f733d1dd | dnsforward/dnsforward.go |
return s.genNotImpl(msg), nil, nil, nil
}
host := strings.TrimSuffix(msg.Question[0].Name, ".")
// use dnsfilter before cache -- changed settings or filters would require cache invalidation otherwise
var res dnsfilter.Result
var err error
| </s> remove upstream := s.chooseUpstream()
</s> add | // we need upstream to resolve A records
upstream := s.chooseUpstream()
| return s.genNotImpl(msg), nil, nil, nil
}
// we need upstream to resolve A records
upstream := s.chooseUpstream()
host := strings.TrimSuffix(msg.Question[0].Name, ".")
// use dnsfilter before cache -- changed settings or filters would require cache invalidation otherwise
var res dnsfilter.Result
... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Resolve into a stub page when blocked by parental or safebrowsing.
Closes #475. | https://github.com/AdguardTeam/AdGuardHome/commit/1c89e1df32d5fcb9d69156c9bfcc1680f733d1dd | dnsforward/dnsforward.go |
log.Printf("dnsfilter failed to check host '%s': %s", host, err)
return s.genServerFailure(msg), &res, nil, err
} else if res.IsFiltered {
log.Printf("Host %s is filtered, reason - '%s', matched rule: '%s'", host, res.Reason, res.Rule)
return s.genNXDomain(msg), &res, nil, nil
}
}
{... | </s> remove upstream := s.chooseUpstream()
</s> add | switch res.Reason {
case dnsfilter.FilteredSafeBrowsing:
return s.genArecord(msg, safeBrowsingBlockHost, upstream), &res, nil, nil
case dnsfilter.FilteredParental:
return s.genArecord(msg, parentalBlockHost, upstream), &res, nil, nil
} | log.Printf("dnsfilter failed to check host '%s': %s", host, err)
return s.genServerFailure(msg), &res, nil, err
} else if res.IsFiltered {
log.Printf("Host %s is filtered, reason - '%s', matched rule: '%s'", host, res.Reason, res.Rule)
switch res.Reason {
case dnsfilter.FilteredSafeBrowsing:
... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Resolve into a stub page when blocked by parental or safebrowsing.
Closes #475. | https://github.com/AdguardTeam/AdGuardHome/commit/1c89e1df32d5fcb9d69156c9bfcc1680f733d1dd | dnsforward/dnsforward.go |
}
}
// TODO: replace with single-socket implementation
upstream := s.chooseUpstream()
reply, err := upstream.Exchange(msg)
if err != nil {
log.Printf("talking to upstream failed for host '%s': %s", host, err)
return s.genServerFailure(msg), &res, upstream, err
}
| </s> | }
}
// TODO: replace with single-socket implementation
reply, err := upstream.Exchange(msg)
if err != nil {
log.Printf("talking to upstream failed for host '%s': %s", host, err)
return s.genServerFailure(msg), &res, upstream, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Resolve into a stub page when blocked by parental or safebrowsing.
Closes #475. | https://github.com/AdguardTeam/AdGuardHome/commit/1c89e1df32d5fcb9d69156c9bfcc1680f733d1dd | dnsforward/dnsforward.go | |
// these variables need to survive coredns reload
var (
stats Stats
safebrowsingCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
parentalCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
)
// Result holds state of hostna... | </s> remove d.transport.CloseIdleConnections()
</s> add if d != nil && d.transport != nil {
d.transport.CloseIdleConnections()
} | safebrowsingCache gcache.Cache
parentalCache gcache.Cache |
// these variables need to survive coredns reload
var (
stats Stats
safebrowsingCache gcache.Cache
parentalCache gcache.Cache
safebrowsingCache gcache.Cache
parentalCache gcache.Cache
)
// Result holds state of hostname check
type Result struct {
IsFiltered bool | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | dnsfilter -- lazily initialize safebrowsing and parental lookup cache | https://github.com/AdguardTeam/AdGuardHome/commit/1cc1e3749df6ccefb741232d7949fd5893d84f66 | dnsfilter/dnsfilter.go |
return result, nil
}
result, err := d.lookupCommon(host, &stats.Safebrowsing, safebrowsingCache, true, format, handleBody)
return result, err
}
func (d *Dnsfilter) checkParental(host string) (Result, error) {
// prevent recursion -- checking the host of parental safety server makes no sense
| </s> remove d.transport.CloseIdleConnections()
</s> add if d != nil && d.transport != nil {
d.transport.CloseIdleConnections()
} </s> remove safebrowsingCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
parentalCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheT... | if safebrowsingCache == nil {
safebrowsingCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
} | return result, nil
}
if safebrowsingCache == nil {
safebrowsingCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
}
result, err := d.lookupCommon(host, &stats.Safebrowsing, safebrowsingCache, true, format, handleBody)
return result, err
}
func (d *Dnsfilter) checkPar... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | dnsfilter -- lazily initialize safebrowsing and parental lookup cache | https://github.com/AdguardTeam/AdGuardHome/commit/1cc1e3749df6ccefb741232d7949fd5893d84f66 | dnsfilter/dnsfilter.go |
return result, nil
}
result, err := d.lookupCommon(host, &stats.Parental, parentalCache, false, format, handleBody)
return result, err
}
// real implementation of lookup/check
| </s> remove d.transport.CloseIdleConnections()
</s> add if d != nil && d.transport != nil {
d.transport.CloseIdleConnections()
} </s> remove safebrowsingCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
parentalCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheT... | if parentalCache == nil {
parentalCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
} | return result, nil
}
if parentalCache == nil {
parentalCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
}
result, err := d.lookupCommon(host, &stats.Parental, parentalCache, false, format, handleBody)
return result, err
}
// real implementation of lookup/check | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | dnsfilter -- lazily initialize safebrowsing and parental lookup cache | https://github.com/AdguardTeam/AdGuardHome/commit/1cc1e3749df6ccefb741232d7949fd5893d84f66 | dnsfilter/dnsfilter.go |
// Destroy is optional if you want to tidy up goroutines without waiting for them to die off
// right now it closes idle HTTP connections if there are any
func (d *Dnsfilter) Destroy() {
d.transport.CloseIdleConnections()
}
//
// config manipulation helpers
//
| </s> remove safebrowsingCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
parentalCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add safebrowsingCache gcache.Cache
parentalCache gcache.Cache | if d != nil && d.transport != nil {
d.transport.CloseIdleConnections()
} |
// Destroy is optional if you want to tidy up goroutines without waiting for them to die off
// right now it closes idle HTTP connections if there are any
func (d *Dnsfilter) Destroy() {
if d != nil && d.transport != nil {
d.transport.CloseIdleConnections()
}
}
//
// config manipulation helpers
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | dnsfilter -- lazily initialize safebrowsing and parental lookup cache | https://github.com/AdguardTeam/AdGuardHome/commit/1cc1e3749df6ccefb741232d7949fd5893d84f66 | dnsfilter/dnsfilter.go |
import { saveAs } from 'file-saver/FileSaver';
import escapeRegExp from 'lodash/escapeRegExp';
import endsWith from 'lodash/endsWith';
import PageTitle from '../ui/PageTitle';
import Card from '../ui/Card';
import Loading from '../ui/Loading';
import Tooltip from '../ui/Tooltip';
import './Logs.css';
| </s> remove const formatTime = (time) => {
</s> add export const formatTime = (time) => { </s> remove time: formatTime(time),
</s> add time, </s> remove {queryLogEnabled && queryLogs.processing && <Loading />}
{queryLogEnabled && !queryLogs.processing &&
</s> a... | import { formatTime } from '../../helpers/helpers'; | import { saveAs } from 'file-saver/FileSaver';
import escapeRegExp from 'lodash/escapeRegExp';
import endsWith from 'lodash/endsWith';
import { formatTime } from '../../helpers/helpers';
import PageTitle from '../ui/PageTitle';
import Card from '../ui/Card';
import Loading from '../ui/Loading';
import Too... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix sorting issue and show loader
Closes #362 | https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820 | client/src/components/Logs/index.js |
Header: 'Time',
accessor: 'time',
maxWidth: 110,
filterable: false,
}, {
Header: 'Domain name',
accessor: 'domain',
Cell: (row) => {
const response = row.value;
| </s> remove const formatTime = (time) => {
</s> add export const formatTime = (time) => { </s> remove time: formatTime(time),
</s> add time, </s> remove {queryLogEnabled && queryLogs.processing && <Loading />}
{queryLogEnabled && !queryLogs.processing &&
</s> a... | Cell: ({ value }) => (<div className="logs__row"><span className="logs__text" title={value}>{formatTime(value)}</span></div>), | Header: 'Time',
accessor: 'time',
maxWidth: 110,
filterable: false,
Cell: ({ value }) => (<div className="logs__row"><span className="logs__text" title={value}>{formatTime(value)}</span></div>),
}, {
Header: 'Domain name',
... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix sorting issue and show loader
Closes #362 | https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820 | client/src/components/Logs/index.js |
{this.renderButtons(queryLogEnabled)}
</div>
</PageTitle>
<Card>
{queryLogEnabled && queryLogs.processing && <Loading />}
{queryLogEnabled && !queryLogs.processing &&
... | </s> remove time: formatTime(time),
</s> add time, </s> remove const formatTime = (time) => {
</s> add export const formatTime = (time) => { | {queryLogEnabled && queryLogs.getLogsProcessing && <Loading />}
{queryLogEnabled && !queryLogs.getLogsProcessing && | {this.renderButtons(queryLogEnabled)}
</div>
</PageTitle>
<Card>
{queryLogEnabled && queryLogs.getLogsProcessing && <Loading />}
{queryLogEnabled && !queryLogs.getLogsProcessing &&
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix sorting issue and show loader
Closes #362 | https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820 | client/src/components/Logs/index.js |
import round from 'lodash/round';
import { STATS_NAMES } from './constants';
const formatTime = (time) => {
const parsedTime = dateParse(time);
return dateFormat(parsedTime, 'HH:mm:ss');
};
export const normalizeLogs = logs => logs.map((log) => {
| </s> remove time: formatTime(time),
</s> add time, </s> remove {queryLogEnabled && queryLogs.processing && <Loading />}
{queryLogEnabled && !queryLogs.processing &&
</s> add {queryLogEnabled && queryLogs.getLogsProcessing && <Loading />}
... | export const formatTime = (time) => { | import round from 'lodash/round';
import { STATS_NAMES } from './constants';
export const formatTime = (time) => {
const parsedTime = dateParse(time);
return dateFormat(parsedTime, 'HH:mm:ss');
};
export const normalizeLogs = logs => logs.map((log) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix sorting issue and show loader
Closes #362 | https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820 | client/src/helpers/helpers.js |
const { value, type, ttl } = response;
return `${type}: ${value} (ttl=${ttl})`;
}) : [];
return {
time: formatTime(time),
domain,
type,
response: responsesArray,
reason,
client,
| </s> remove const formatTime = (time) => {
</s> add export const formatTime = (time) => { </s> remove {queryLogEnabled && queryLogs.processing && <Loading />}
{queryLogEnabled && !queryLogs.processing &&
</s> add {queryLogEnabled && queryLogs.getLogsProcessi... | time, | const { value, type, ttl } = response;
return `${type}: ${value} (ttl=${ttl})`;
}) : [];
return {
time,
domain,
type,
response: responsesArray,
reason,
client, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix sorting issue and show loader
Closes #362 | https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820 | client/src/helpers/helpers.js |
columns={[
{
Header: 'MAC',
accessor: 'mac',
Cell: this.cellWrap,
}, {
Header: 'IP',
accessor: 'ip',
m... | </s> | minWidth: 160, | columns={[
{
Header: 'MAC',
accessor: 'mac',
minWidth: 160,
Cell: this.cellWrap,
}, {
Header: 'IP',
acce... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110... | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/Leases.js |
Cell: this.cellWrap,
}, {
Header: 'IP',
accessor: 'ip',
Cell: this.cellWrap,
sortMethod: sortIp,
}, {
Header: <Trans>dhc... | </s> | minWidth: 230, | Cell: this.cellWrap,
}, {
Header: 'IP',
accessor: 'ip',
minWidth: 230,
Cell: this.cellWrap,
sortMethod: sortIp,
}, {
... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110... | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/Leases.js |
}, {
Header: <Trans>dhcp_table_hostname</Trans>,
accessor: 'hostname',
Cell: this.cellWrap,
}, {
Header: <Trans>dhcp_table_expires</Trans>,
access... | </s> | minWidth: 230, | }, {
Header: <Trans>dhcp_table_hostname</Trans>,
accessor: 'hostname',
minWidth: 230,
Cell: this.cellWrap,
}, {
Header: <Trans>dhcp_table_expires</T... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110... | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/Leases.js |
Cell: this.cellWrap,
}, {
Header: <Trans>dhcp_table_expires</Trans>,
accessor: 'expires',
Cell: this.cellWrap,
},
]}
pageSize={LEASES_TA... | </s> | minWidth: 130, | Cell: this.cellWrap,
}, {
Header: <Trans>dhcp_table_expires</Trans>,
accessor: 'expires',
minWidth: 130,
Cell: this.cellWrap,
},
]... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110... | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/Leases.js |
{
Header: 'MAC',
accessor: 'mac',
Cell: cellWrap,
},
{
Header: 'IP',
| </s> | minWidth: 160, | {
Header: 'MAC',
accessor: 'mac',
minWidth: 160,
Cell: cellWrap,
},
{
Header: 'IP', | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110... | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/StaticLeases/index.js |
Header: 'IP',
accessor: 'ip',
sortMethod: sortIp,
Cell: cellWrap,
},
{
| </s> | minWidth: 230, | Header: 'IP',
accessor: 'ip',
minWidth: 230,
sortMethod: sortIp,
Cell: cellWrap,
},
{ | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110... | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/StaticLeases/index.js |
Header: <Trans>dhcp_table_hostname</Trans>,
accessor: 'hostname',
Cell: cellWrap,
},
{
Header: <Trans>actions_table_header</Trans>,
accessor: 'act... | </s> | minWidth: 230, | Header: <Trans>dhcp_table_hostname</Trans>,
accessor: 'hostname',
minWidth: 230,
Cell: cellWrap,
},
{
Header: <Trans>actions_table_header</Trans>,
... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110... | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/StaticLeases/index.js |
"local_ptr_title": "Private reverse DNS servers",
"local_ptr_desc": "The DNS servers that AdGuard Home uses for local PTR queries. These servers are used to resolve the hostnames of clients with private IP addresses, for example \"192.168.12.34\", using rDNS. If not set, AdGuard Home uses the default DNS re... | </s> remove // Get returns the slice of local resolvers' addresses.
// It should be safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use. </s> remove ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The approach of sub... | "local_ptr_default_resolver": "By default, AdGuard Home will use the following DNS resolvers: {{ip}}",
"local_ptr_no_default_resolver": "AdGuard Home could not determine suitable private rDNS resolvers for this system.", | "local_ptr_title": "Private reverse DNS servers",
"local_ptr_desc": "The DNS servers that AdGuard Home uses for local PTR queries. These servers are used to resolve the hostnames of clients with private IP addresses, for example \"192.168.12.34\", using rDNS. If not set, AdGuard Home uses the default DNS re... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e4... | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | client/src/__locales/en.json |
const { t } = useTranslation();
const upstream_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns);
const processingTestUpstream = useSelector((state) => state.settings.processingTestUpstream);
const processingSetConfig = useSelector((state) => state.dnsConfig.proces... | </s> remove log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
</s> add </s> remove var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
</s> add localAddrs, err = s.filterOurDNSAddrs(localAddrs) </s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresh... | const defaultLocalPtrUpstreams = useSelector(
(state) => state.dnsConfig.default_local_ptr_upstreams,
); | const { t } = useTranslation();
const upstream_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns);
const processingTestUpstream = useSelector((state) => state.settings.processingTestUpstream);
const processingSetConfig = useSelector((state) => state.dnsConfig.proces... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e4... | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | client/src/components/Settings/Dns/Upstream/Form.js |
<Trans>local_ptr_desc</Trans>
</div>
<Field
id="local_ptr_upstreams"
name="local_ptr_upstreams"
component={renderTextareaField}
type="text"
| </s> remove '$ref': '#/components/schemas/DNSConfig'
</s> add 'allOf':
- '$ref': '#/components/schemas/DNSConfig'
- 'type': 'object'
'properties':
'default_local_ptr_upstreams':
'type': 'array'
... | <div className="form__desc form__desc--top">
{/** TODO: Add internazionalization for "" */}
{defaultLocalPtrUpstreams?.length > 0 ? (
<Trans values={{ ip: defaultLocalPtrUpstreams.map((s) => `"${s}"`).join(', ') }}>local_ptr_default_resolve... | <Trans>local_ptr_desc</Trans>
</div>
<div className="form__desc form__desc--top">
{/** TODO: Add internazionalization for "" */}
{defaultLocalPtrUpstreams?.length > 0 ? (
<Trans values={{ ip: defaultL... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e4... | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | client/src/components/Settings/Dns/Upstream/Form.js |
type HostGenFunc func() (host string)
// SystemResolvers helps to work with local resolvers' addresses provided by OS.
type SystemResolvers interface {
// Get returns the slice of local resolvers' addresses.
// It should be safe for concurrent use.
Get() (rs []string)
// refresh refreshes the local... | </s> remove ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well.
localAd... | // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use. | type HostGenFunc func() (host string)
// SystemResolvers helps to work with local resolvers' addresses provided by OS.
type SystemResolvers interface {
// Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use.
// Get returns the slice of local resolvers' addresses. I... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e4... | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/aghnet/systemresolvers.go |
ipset ipsetCtx
subnetDetector *aghnet.SubnetDetector
localResolvers *proxy.Proxy
recDetector *recursionDetector
tableHostToIP hostToIPTable
tableHostToIPLock sync.Mutex
| </s> remove '$ref': '#/components/schemas/DNSConfig'
</s> add 'allOf':
- '$ref': '#/components/schemas/DNSConfig'
- 'type': 'object'
'properties':
'default_local_ptr_upstreams':
'type': 'array'
... | sysResolvers aghnet.SystemResolvers | ipset ipsetCtx
subnetDetector *aghnet.SubnetDetector
localResolvers *proxy.Proxy
sysResolvers aghnet.SystemResolvers
recDetector *recursionDetector
tableHostToIP hostToIPTable
tableHostToIPLock sync.Mutex
| [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e4... | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
localDomainSuffix: localDomainSuffix,
recDetector: newRecursionDetector(recursionTTL, cachedRecurrentReqNum),
}
if p.DHCPServer != nil {
s.dhcpServer = p.DHCPServer
s.dhcpServer.SetOnLeaseChanged(s.onDHCPLeaseChanged)
s.onDHCPLeaseChanged(dhcpd.LeaseChangedAdded)
}
| </s> remove enc := json.NewEncoder(w)
if err := enc.Encode(resp); err != nil {
</s> add if err = json.NewEncoder(w).Encode(resp); err != nil { </s> remove var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
</s> add localAddrs, err = s.filterOurDNSAddrs(localAddrs) </s> remove var sysRes aghnet.System... | // TODO(e.burkov): Enable the refresher after the actual implementation
// passes the public testing.
s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return nil, fmt.Errorf("initializing system resolvers: %w", err)
}
| localDomainSuffix: localDomainSuffix,
recDetector: newRecursionDetector(recursionTTL, cachedRecurrentReqNum),
}
// TODO(e.burkov): Enable the refresher after the actual implementation
// passes the public testing.
s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return n... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e4... | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
return addrs[:i], nil
}
// setupResolvers initializes the resolvers for local addresses. For internal
// use only.
func (s *Server) setupResolvers(localAddrs []string) (err error) {
bootstraps := s.conf.BootstrapDNS
if len(localAddrs) == 0 {
| </s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </s> ... | func (s *Server) filterOurDNSAddrs(addrs []string) (filtered []string, err error) {
var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
if err != nil {
return nil, err
}
ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The approach of subtracting sets of strings is not
// really appli... |
return addrs[:i], nil
}
func (s *Server) filterOurDNSAddrs(addrs []string) (filtered []string, err error) {
var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
if err != nil {
return nil, err
}
ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The approach of subtracting sets... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e4... | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
// use only.
func (s *Server) setupResolvers(localAddrs []string) (err error) {
bootstraps := s.conf.BootstrapDNS
if len(localAddrs) == 0 {
var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghn... | </s> remove log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
</s> add </s> remove var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
</s> add localAddrs, err = s.filterOurDNSAddrs(localAddrs) </s> remove ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The app... | localAddrs = s.sysResolvers.Get() | // use only.
func (s *Server) setupResolvers(localAddrs []string) (err error) {
bootstraps := s.conf.BootstrapDNS
if len(localAddrs) == 0 {
localAddrs = s.sysResolvers.Get()
localAddrs = s.sysResolvers.Get()
localAddrs = s.sysResolvers.Get()
localAddrs = s.sysResolvers.Get()
localAddrs = s.sysResolv... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e4... | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
localAddrs = sysRes.Get()
bootstraps = nil
}
log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
if err != nil {
return err
| </s> remove var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
</s> add localAddrs, err = s.filterOurDNSAddrs(localAddrs) </s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSyste... |
localAddrs = sysRes.Get()
bootstraps = nil
}
var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
if err != nil {
return err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e4... | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go | |
bootstraps = nil
}
log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
if err != nil {
return err
}
ourAddrsSet := aghstrings.NewSet(ourAddrs...)
| </s> remove log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
</s> add </s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
... | localAddrs, err = s.filterOurDNSAddrs(localAddrs) | bootstraps = nil
}
log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
localAddrs, err = s.filterOurDNSAddrs(localAddrs)
localAddrs, err = s.filterOurDNSAddrs(localAddrs)
if err != nil {
return err
}
ourAddrsSet := aghstrings.NewSet(ourAddrs...) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e4... | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
if err != nil {
return err
}
ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// al... | </s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </s> ... | log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs) | if err != nil {
return err
}
log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
log.Debug("upstreams to resolve PTR for local addres... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e4... | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
}
}
func (s *Server) handleGetConfig(w http.ResponseWriter, r *http.Request) {
resp := s.getDNSConfig()
w.Header().Set("Content-Type", "application/json")
enc := json.NewEncoder(w)
if err := enc.Encode(resp); err != nil {
| </s> remove enc := json.NewEncoder(w)
if err := enc.Encode(resp); err != nil {
</s> add if err = json.NewEncoder(w).Encode(resp); err != nil { </s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = agh... | defLocalPTRUps, err := s.filterOurDNSAddrs(s.sysResolvers.Get())
if err != nil {
log.Debug("getting dns configuration: %s", err)
}
resp := struct {
dnsConfig
// DefautLocalPTRUpstreams is used to pass the addresses from
// systemResolvers to the front-end. It's not a pointer to the slice
// since there ... | }
}
func (s *Server) handleGetConfig(w http.ResponseWriter, r *http.Request) {
defLocalPTRUps, err := s.filterOurDNSAddrs(s.sysResolvers.Get())
if err != nil {
log.Debug("getting dns configuration: %s", err)
}
resp := struct {
dnsConfig
// DefautLocalPTRUpstreams is used to pass the addresses from
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e4... | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/http.go |
resp := s.getDNSConfig()
w.Header().Set("Content-Type", "application/json")
enc := json.NewEncoder(w)
if err := enc.Encode(resp); err != nil {
httpError(r, w, http.StatusInternalServerError, "json.Encoder: %s", err)
return
}
}
| </s> remove resp := s.getDNSConfig()
</s> add defLocalPTRUps, err := s.filterOurDNSAddrs(s.sysResolvers.Get())
if err != nil {
log.Debug("getting dns configuration: %s", err)
}
resp := struct {
dnsConfig
// DefautLocalPTRUpstreams is used to pass the addresses from
// systemResolvers to the front-end. I... | if err = json.NewEncoder(w).Encode(resp); err != nil { | resp := s.getDNSConfig()
w.Header().Set("Content-Type", "application/json")
if err = json.NewEncoder(w).Encode(resp); err != nil {
if err = json.NewEncoder(w).Encode(resp); err != nil {
httpError(r, w, http.StatusInternalServerError, "json.Encoder: %s", err)
return
}
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e4... | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/http.go |
"testing"
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
// fakeSystemResolvers is a mock aghnet.SystemResolvers implementation for tests.
| </s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </s> ... | "github.com/AdguardTeam/AdGuardHome/internal/aghnet" | "testing"
"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
// fakeSystemResolvers is a mock aghnet.SystemResolvers implementation for tests. | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e4... | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/http_test.go |
)
func loadTestData(t *testing.T, casesFileName string, cases interface{}) {
t.Helper()
var f *os.File
f, err := os.Open(filepath.Join("testdata", casesFileName))
| </s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </s> ... | // fakeSystemResolvers is a mock aghnet.SystemResolvers implementation for tests.
type fakeSystemResolvers struct {
// SystemResolvers is embedded here simply to make *fakeSystemResolvers
// an aghnet.SystemResolvers without actually implementing all methods.
aghnet.SystemResolvers
}
// Get implements the aghnet.Sy... | )
// fakeSystemResolvers is a mock aghnet.SystemResolvers implementation for tests.
type fakeSystemResolvers struct {
// SystemResolvers is embedded here simply to make *fakeSystemResolvers
// an aghnet.SystemResolvers without actually implementing all methods.
aghnet.SystemResolvers
}
// Get implements the ag... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e4... | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/http_test.go |
}
s := createTestServer(t, filterConf, forwardConf, nil)
require.Nil(t, s.Start())
t.Cleanup(func() {
require.Nil(t, s.Stop())
})
| </s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </s> ... | s.sysResolvers = &fakeSystemResolvers{}
| }
s := createTestServer(t, filterConf, forwardConf, nil)
s.sysResolvers = &fakeSystemResolvers{}
require.Nil(t, s.Start())
t.Cleanup(func() {
require.Nil(t, s.Stop())
})
| [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e4... | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/http_test.go |
ConfigModified: func() {},
}
s := createTestServer(t, filterConf, forwardConf, nil)
defaultConf := s.conf
err := s.Start()
| </s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </s> ... | s.sysResolvers = &fakeSystemResolvers{} | ConfigModified: func() {},
}
s := createTestServer(t, filterConf, forwardConf, nil)
s.sysResolvers = &fakeSystemResolvers{}
defaultConf := s.conf
err := s.Start() | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e4... | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/http_test.go |
'description': 'OK'
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/DNSConfig'
'/dns_config':
'post':
'tags':
- 'global'
'operationId': 'dnsConfig'
| </s> remove // Get returns the slice of local resolvers' addresses.
// It should be safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use. | 'allOf':
- '$ref': '#/components/schemas/DNSConfig'
- 'type': 'object'
'properties':
'default_local_ptr_upstreams':
'type': 'array'
'items':
'type': 'string'
... | 'description': 'OK'
'content':
'application/json':
'schema':
'allOf':
- '$ref': '#/components/schemas/DNSConfig'
- 'type': 'object'
'properties':
'default_local_ptr_upstreams':
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e4... | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | openapi/openapi.yaml |
go 1.14
require (
github.com/AdguardTeam/dnsproxy v0.33.0
github.com/AdguardTeam/golibs v0.4.2
github.com/AdguardTeam/urlfilter v0.12.3
github.com/NYTimes/gziphandler v1.1.1
github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
github.com/fsnotify/fsnotify v1.4.9
| </s> remove github.com/AdguardTeam/dnsproxy v0.33.0 h1:bYNf20QgvkclPm+w5YSakFQbrrlcD3MpUwkQPLMwhwU=
github.com/AdguardTeam/dnsproxy v0.33.0/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA=
</s> add github.com/AdguardTeam/dnsproxy v0.33.1 h1:rEAS1fBEQ3JslzsfkcyMRV96OeBWFnKzXvksduI0ous=
github.com/AdguardTeam/dnsp... | github.com/AdguardTeam/dnsproxy v0.33.1 |
go 1.14
require (
github.com/AdguardTeam/dnsproxy v0.33.1
github.com/AdguardTeam/golibs v0.4.2
github.com/AdguardTeam/urlfilter v0.12.3
github.com/NYTimes/gziphandler v1.1.1
github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
github.com/fsnotify/fsnotify v1.4.9 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: * all: update dnsproxy
Merge in DNS/adguard-home from update-dnsproxy to master
Squashed commit of the following:
commit 6ed03c2131b93e3882e8f820e110696a41223267
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39 | go.mod |
github.com/fsnotify/fsnotify v1.4.9
github.com/gobuffalo/packr v1.30.1
github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8
github.com/kardianos/service v1.1.0
github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
... | </s> remove github.com/AdguardTeam/dnsproxy v0.33.0
</s> add github.com/AdguardTeam/dnsproxy v0.33.1 </s> remove golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbE... | github.com/joomcode/errorx v1.0.3 // indirect | github.com/fsnotify/fsnotify v1.4.9
github.com/gobuffalo/packr v1.30.1
github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8
github.com/joomcode/errorx v1.0.3 // indirect
github.com/kardianos/service v1.1.0
github.com/mdlayh... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: * all: update dnsproxy
Merge in DNS/adguard-home from update-dnsproxy to master
Squashed commit of the following:
commit 6ed03c2131b93e3882e8f820e110696a41223267
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39 | go.mod |
go.etcd.io/bbolt v1.3.4
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/x... | </s> remove golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf h1:kt3wY1Lu5MJAnKTfoMR52Cu4gwvna4VTzNOi... | golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf | go.etcd.io/bbolt v1.3.4
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf
golang.org/x/text v0.3.4 // indirect
golang.org/x/xer... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: * all: update dnsproxy
Merge in DNS/adguard-home from update-dnsproxy to master
Squashed commit of the following:
commit 6ed03c2131b93e3882e8f820e110696a41223267
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39 | go.mod |
dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mo... | </s> remove github.com/AdguardTeam/dnsproxy v0.33.0
</s> add github.com/AdguardTeam/dnsproxy v0.33.1 </s> remove golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbE... | github.com/AdguardTeam/dnsproxy v0.33.1 h1:rEAS1fBEQ3JslzsfkcyMRV96OeBWFnKzXvksduI0ous=
github.com/AdguardTeam/dnsproxy v0.33.1/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= | dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mo... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: * all: update dnsproxy
Merge in DNS/adguard-home from update-dnsproxy to master
Squashed commit of the following:
commit 6ed03c2131b93e3882e8f820e110696a41223267
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39 | go.sum |
github.com/joomcode/errorx v1.0.1 h1:CalpDWz14ZHd68fIqluJasJosAewpz2TFaJALrUxjrk=
github.com/joomcode/errorx v1.0.1/go.mod h1:kgco15ekB6cs+4Xjzo7SPeXzx38PbJzBwbnu9qfVNHQ=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/jstemmer/go-junit-report v0.0.0-20190106... | </s> remove golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf h1:kt3wY1Lu5MJAnKTfoMR52Cu4gwvna4VTzNOi... | github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw=
github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo= | github.com/joomcode/errorx v1.0.1 h1:CalpDWz14ZHd68fIqluJasJosAewpz2TFaJALrUxjrk=
github.com/joomcode/errorx v1.0.1/go.mod h1:kgco15ekB6cs+4Xjzo7SPeXzx38PbJzBwbnu9qfVNHQ=
github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw=
github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request: * all: update dnsproxy
Merge in DNS/adguard-home from update-dnsproxy to master
Squashed commit of the following:
commit 6ed03c2131b93e3882e8f820e110696a41223267
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39 | go.sum |
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4=
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
... | </s> remove golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
</s> add golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf </s> remove github.com/AdguardTeam/dnsproxy v0.33.0 h1:bYNf20QgvkclPm+w5YSakFQbrrlcD3MpUwkQPLMwhwU=
github.com/AdguardTeam/dnsproxy v0.33.0/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJ... | golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf h1:kt3wY1Lu5MJAnKTfoMR52Cu4gwvna4VTzNOiT8tY73s=
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4=
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: * all: update dnsproxy
Merge in DNS/adguard-home from update-dnsproxy to master
Squashed commit of the following:
commit 6ed03c2131b93e3882e8f820e110696a41223267
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39 | go.sum |
return
}
err := Context.updater.Update()
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "%s", err)
return
}
| </s> remove func finishUpdate(ctx context.Context) {
log.Info("Stopping all tasks")
</s> add func finishUpdate(ctx context.Context, execPath string) {
var err error
log.Info("stopping all tasks")
</s> remove } else {
log.Info("Restarting: %v", os.Args)
err = syscall.Exec(curBinName, os.Args, os.Environ())
... | // Retain the current absolute path of the executable, since the updater is
// likely to change the position current one to the backup directory.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/4735.
execPath, err := os.Executable()
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError,... |
return
}
// Retain the current absolute path of the executable, since the updater is
// likely to change the position current one to the backup directory.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/4735.
execPath, err := os.Executable()
if err != nil {
aghhttp.Error(r, w, http.Stat... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
if f, ok := w.(http.Flusher); ok {
f.Flush()
}
// The background context is used because the underlying functions wrap
// it with timeout and shut down the server, which handles current
// request. It also should be done in a separate goroutine due to the
// same reason.
go func() {
fini... | </s> remove err := Context.updater.Update()
</s> add // Retain the current absolute path of the executable, since the updater is
// likely to change the position current one to the backup directory.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/4735.
execPath, err := os.Executable()
if err != nil ... | // The background context is used because the underlying functions wrap it
// with timeout and shut down the server, which handles current request. It
// also should be done in a separate goroutine for the same reason.
go finishUpdate(context.Background(), execPath) | if f, ok := w.(http.Flusher); ok {
f.Flush()
}
// The background context is used because the underlying functions wrap it
// with timeout and shut down the server, which handles current request. It
// also should be done in a separate goroutine for the same reason.
go finishUpdate(context.Background()... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
return c.Enabled && (c.PortHTTPS < 1024 || c.PortDNSOverTLS < 1024 || c.PortDNSOverQUIC < 1024)
}
// finishUpdate completes an update procedure.
func finishUpdate(ctx context.Context) {
log.Info("Stopping all tasks")
cleanup(ctx)
cleanupAlways()
curBinName, err := os.Executable()
if err !=... | </s> remove curBinName, err := os.Executable()
if err != nil {
log.Fatalf("executable path request failed: %s", err)
}
</s> add </s> remove err := Context.updater.Update()
</s> add // Retain the current absolute path of the executable, since the updater is
// likely to change the position current one to the... | func finishUpdate(ctx context.Context, execPath string) {
var err error
log.Info("stopping all tasks")
| return c.Enabled && (c.PortHTTPS < 1024 || c.PortDNSOverTLS < 1024 || c.PortDNSOverQUIC < 1024)
}
// finishUpdate completes an update procedure.
func finishUpdate(ctx context.Context, execPath string) {
var err error
log.Info("stopping all tasks")
func finishUpdate(ctx context.Context, execPath string) {
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
log.Info("Stopping all tasks")
cleanup(ctx)
cleanupAlways()
curBinName, err := os.Executable()
if err != nil {
log.Fatalf("executable path request failed: %s", err)
}
if runtime.GOOS == "windows" {
if Context.runningAsService {
// Note:
// we can't restart the service via "k... | </s> remove // Note:
// we can't restart the service via "kardianos/service" package - it kills the process first
// we can't start a new instance - Windows doesn't allow it
</s> add // NOTE: We can't restart the service via "kardianos/service"
// package, because it kills the process first we can't sta... | log.Info("Stopping all tasks")
cleanup(ctx)
cleanupAlways()
if runtime.GOOS == "windows" {
if Context.runningAsService {
// Note:
// we can't restart the service via "kardianos/service" package - it kills the process first
// we can't start a new instance - Windows doesn't allow i... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go | |
}
if runtime.GOOS == "windows" {
if Context.runningAsService {
// Note:
// we can't restart the service via "kardianos/service" package - it kills the process first
// we can't start a new instance - Windows doesn't allow it
cmd := exec.Command("cmd", "/c", "net stop AdGuardHome & net s... | </s> remove curBinName, err := os.Executable()
if err != nil {
log.Fatalf("executable path request failed: %s", err)
}
</s> add </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting: stopping: %s", err) </s> remove } else {
log.Info("Restarting: %v", os.Args)
err... | // NOTE: We can't restart the service via "kardianos/service"
// package, because it kills the process first we can't start a new
// instance, because Windows doesn't allow it.
//
// TODO(a.garipov): Recheck the claim above. | }
if runtime.GOOS == "windows" {
if Context.runningAsService {
// NOTE: We can't restart the service via "kardianos/service"
// package, because it kills the process first we can't start a new
// instance, because Windows doesn't allow it.
//
// TODO(a.garipov): Recheck the claim above.
/... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
// we can't start a new instance - Windows doesn't allow it
cmd := exec.Command("cmd", "/c", "net stop AdGuardHome & net start AdGuardHome")
err = cmd.Start()
if err != nil {
log.Fatalf("exec.Command() failed: %s", err)
}
os.Exit(0)
}
cmd := exec.Command(curBinName, os.Arg... | </s> remove // Note:
// we can't restart the service via "kardianos/service" package - it kills the process first
// we can't start a new instance - Windows doesn't allow it
</s> add // NOTE: We can't restart the service via "kardianos/service"
// package, because it kills the process first we can't sta... | log.Fatalf("restarting: stopping: %s", err) | // we can't start a new instance - Windows doesn't allow it
cmd := exec.Command("cmd", "/c", "net stop AdGuardHome & net start AdGuardHome")
err = cmd.Start()
if err != nil {
log.Fatalf("restarting: stopping: %s", err)
}
os.Exit(0)
}
cmd := exec.Command(curBinName, os.Args[1... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
}
os.Exit(0)
}
cmd := exec.Command(curBinName, os.Args[1:]...)
log.Info("Restarting: %v", cmd.Args)
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err = cmd.Start()
if err != nil {
| </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting:: %s", err) </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting: stopping: %s", err) </s> remove } else {
log.Info("Restarting: %v", os.Args)
err = syscall.Exec(curBinName, ... | cmd := exec.Command(execPath, os.Args[1:]...)
log.Info("restarting: %q %q", execPath, os.Args[1:]) | }
os.Exit(0)
}
cmd := exec.Command(execPath, os.Args[1:]...)
log.Info("restarting: %q %q", execPath, os.Args[1:])
cmd := exec.Command(execPath, os.Args[1:]...)
log.Info("restarting: %q %q", execPath, os.Args[1:])
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err = cmd.Start()
if err != nil {
log.Fatalf("exec.Command() failed: %s", err)
}
os.Exit(0)
} else {
log.Info("Restarting: %v", os.Args)
err = syscall.Exec(curBinName, os.Args, os.Environ())
| </s> remove } else {
log.Info("Restarting: %v", os.Args)
err = syscall.Exec(curBinName, os.Args, os.Environ())
if err != nil {
log.Fatalf("syscall.Exec() failed: %s", err)
}
// Unreachable code
</s> add }
log.Info("restarting: %q %q", execPath, os.Args[1:])
err = syscall.Exec(execPath, os.Args, os.En... | log.Fatalf("restarting:: %s", err) | cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err = cmd.Start()
if err != nil {
log.Fatalf("restarting:: %s", err)
}
os.Exit(0)
} else {
log.Info("Restarting: %v", os.Args)
err = syscall.Exec(curBinName, os.Args, os.Environ()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
if err != nil {
log.Fatalf("exec.Command() failed: %s", err)
}
os.Exit(0)
} else {
log.Info("Restarting: %v", os.Args)
err = syscall.Exec(curBinName, os.Args, os.Environ())
if err != nil {
log.Fatalf("syscall.Exec() failed: %s", err)
}
// Unreachable code
}
}
| </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting:: %s", err) </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting: stopping: %s", err) </s> remove err := Context.updater.Update()
</s> add // Retain the current absolute path o... | }
log.Info("restarting: %q %q", execPath, os.Args[1:])
err = syscall.Exec(execPath, os.Args, os.Environ())
if err != nil {
log.Fatalf("restarting: %s", err) | if err != nil {
log.Fatalf("exec.Command() failed: %s", err)
}
os.Exit(0)
}
log.Info("restarting: %q %q", execPath, os.Args[1:])
err = syscall.Exec(execPath, os.Args, os.Environ())
if err != nil {
log.Fatalf("restarting: %s", err)
}
log.Info("restarting: %q %q", execPath, os.Args[1:])
err = ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep"
] | Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
// --------------------------
// helper functions for stats
// --------------------------
func getSlice(input [statsHistoryElements]float64, start int, end int) []float64 {
output := make([]float64, 0)
for i := start; i <= end; i++ {
output = append(output, input[i])
}
return output
| </s> remove output = append(output, input[i])
</s> add output = append([]float64{input[i]}, output...) </s> remove count := getSlice(stats.entries[processingTimeCount], start, end)
sum := getSlice(stats.entries[processingTimeSum], start, end)
</s> add count := getReversedSlice(stats.entries[processingTimeCount... | func getReversedSlice(input [statsHistoryElements]float64, start int, end int) []float64 { |
// --------------------------
// helper functions for stats
// --------------------------
func getReversedSlice(input [statsHistoryElements]float64, start int, end int) []float64 {
output := make([]float64, 0)
for i := start; i <= end; i++ {
output = append(output, input[i])
}
return output | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix invalid element order for historical stats -- in API declaration values are from oldest to newest, not other way around. | https://github.com/AdguardTeam/AdGuardHome/commit/1f0fdef8d6b2ce324e7009bb3f95626d87438d61 | helpers.go |
// --------------------------
func getSlice(input [statsHistoryElements]float64, start int, end int) []float64 {
output := make([]float64, 0)
for i := start; i <= end; i++ {
output = append(output, input[i])
}
return output
}
func generateMapFromStats(stats *periodicStats, start int, end int)... | </s> remove func getSlice(input [statsHistoryElements]float64, start int, end int) []float64 {
</s> add func getReversedSlice(input [statsHistoryElements]float64, start int, end int) []float64 { </s> remove count := getSlice(stats.entries[processingTimeCount], start, end)
sum := getSlice(stats.entries[processingTime... | output = append([]float64{input[i]}, output...) | // --------------------------
func getSlice(input [statsHistoryElements]float64, start int, end int) []float64 {
output := make([]float64, 0)
for i := start; i <= end; i++ {
output = append([]float64{input[i]}, output...)
}
return output
}
func generateMapFromStats(stats *periodicStats, start i... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix invalid element order for historical stats -- in API declaration values are from oldest to newest, not other way around. | https://github.com/AdguardTeam/AdGuardHome/commit/1f0fdef8d6b2ce324e7009bb3f95626d87438d61 | helpers.go |
end = clamp(end, 0, statsHistoryElements)
avgProcessingTime := make([]float64, 0)
count := getSlice(stats.entries[processingTimeCount], start, end)
sum := getSlice(stats.entries[processingTimeSum], start, end)
for i := 0; i < len(count); i++ {
var avg float64
if count[i] != 0 {
avg = s... | </s> remove output = append(output, input[i])
</s> add output = append([]float64{input[i]}, output...) </s> remove func getSlice(input [statsHistoryElements]float64, start int, end int) []float64 {
</s> add func getReversedSlice(input [statsHistoryElements]float64, start int, end int) []float64 { </s> remove "d... | count := getReversedSlice(stats.entries[processingTimeCount], start, end)
sum := getReversedSlice(stats.entries[processingTimeSum], start, end) | end = clamp(end, 0, statsHistoryElements)
avgProcessingTime := make([]float64, 0)
count := getReversedSlice(stats.entries[processingTimeCount], start, end)
sum := getReversedSlice(stats.entries[processingTimeSum], start, end)
count := getReversedSlice(stats.entries[processingTimeCount], start, end)
sum ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix invalid element order for historical stats -- in API declaration values are from oldest to newest, not other way around. | https://github.com/AdguardTeam/AdGuardHome/commit/1f0fdef8d6b2ce324e7009bb3f95626d87438d61 | helpers.go |
avgProcessingTime = append(avgProcessingTime, avg)
}
result := map[string]interface{}{
"dns_queries": getSlice(stats.entries[totalRequests], start, end),
"blocked_filtering": getSlice(stats.entries[filteredLists], start, end),
"replaced_safebrowsing": getSlice(stats.entries[filter... | </s> remove output = append(output, input[i])
</s> add output = append([]float64{input[i]}, output...) </s> remove func getSlice(input [statsHistoryElements]float64, start int, end int) []float64 {
</s> add func getReversedSlice(input [statsHistoryElements]float64, start int, end int) []float64 { </s> remove cou... | "dns_queries": getReversedSlice(stats.entries[totalRequests], start, end),
"blocked_filtering": getReversedSlice(stats.entries[filteredLists], start, end),
"replaced_safebrowsing": getReversedSlice(stats.entries[filteredSafebrowsing], start, end),
"replaced_safesearch": getReversedSlice(stats.en... | avgProcessingTime = append(avgProcessingTime, avg)
}
result := map[string]interface{}{
"dns_queries": getReversedSlice(stats.entries[totalRequests], start, end),
"blocked_filtering": getReversedSlice(stats.entries[filteredLists], start, end),
"replaced_safebrowsing": getReversedSlice(st... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix invalid element order for historical stats -- in API declaration values are from oldest to newest, not other way around. | https://github.com/AdguardTeam/AdGuardHome/commit/1f0fdef8d6b2ce324e7009bb3f95626d87438d61 | helpers.go |
[actions.getVersionFailure]: state => ({ ...state, processingVersion: false }),
[actions.getVersionSuccess]: (state, { payload }) => {
const currentVersion = state.dnsVersion === 'undefined' ? 0 : state.dnsVersion;
if (payload && versionCompare(currentVersion, payload.version) === -1)... | </s> remove version,
</s> add </s> remove version,
</s> add | if (payload && versionCompare(currentVersion, payload.new_version) === -1) { | [actions.getVersionFailure]: state => ({ ...state, processingVersion: false }),
[actions.getVersionSuccess]: (state, { payload }) => {
const currentVersion = state.dnsVersion === 'undefined' ? 0 : state.dnsVersion;
if (payload && versionCompare(currentVersion, payload.new_version) === -... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: fix versions check | https://github.com/AdguardTeam/AdGuardHome/commit/1f164c70059a8f2f8d6e33b805243dbcd6ce4702 | client/src/reducers/index.js |
const currentVersion = state.dnsVersion === 'undefined' ? 0 : state.dnsVersion;
if (payload && versionCompare(currentVersion, payload.version) === -1) {
const {
version,
announcement_url: announcementUrl,
new_version: newVersion,... | </s> remove version,
</s> add </s> remove if (payload && versionCompare(currentVersion, payload.version) === -1) {
</s> add if (payload && versionCompare(currentVersion, payload.new_version) === -1) { | const currentVersion = state.dnsVersion === 'undefined' ? 0 : state.dnsVersion;
if (payload && versionCompare(currentVersion, payload.version) === -1) {
const {
announcement_url: announcementUrl,
new_version: newVersion,
can_aut... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: fix versions check | https://github.com/AdguardTeam/AdGuardHome/commit/1f164c70059a8f2f8d6e33b805243dbcd6ce4702 | client/src/reducers/index.js | |
} = payload;
const newState = {
...state,
version,
announcementUrl,
newVersion,
canAutoUpdate,
isUpdateAvailable: true,
};
| </s> remove if (payload && versionCompare(currentVersion, payload.version) === -1) {
</s> add if (payload && versionCompare(currentVersion, payload.new_version) === -1) { </s> remove version,
</s> add | } = payload;
const newState = {
...state,
announcementUrl,
newVersion,
canAutoUpdate,
isUpdateAvailable: true,
}; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: fix versions check | https://github.com/AdguardTeam/AdGuardHome/commit/1f164c70059a8f2f8d6e33b805243dbcd6ce4702 | client/src/reducers/index.js | |
log.Fatal(err)
}
// override bind host/port from the console
if args.bindHost != "" {
config.BindHost = args.bindHost
}
if args.bindPort != 0 {
| </s> remove BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
AuthName string `yaml:"auth_name"` // AuthName is the basic auth username
AuthPass string ... | if (runtime.GOOS == "linux" || runtime.GOOS == "darwin") &&
config.RlimitNoFile != 0 {
setRlimit(config.RlimitNoFile)
}
| log.Fatal(err)
}
if (runtime.GOOS == "linux" || runtime.GOOS == "darwin") &&
config.RlimitNoFile != 0 {
setRlimit(config.RlimitNoFile)
}
// override bind host/port from the console
if args.bindHost != "" {
config.BindHost = args.bindHost
}
if args.bindPort != 0 { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + config: add "rlimit_nofile" setting - Maximum number of opened fd's per process | https://github.com/AdguardTeam/AdGuardHome/commit/1f1e26f67b00ee4983c65e4e3aabf59a488f687b | app.go |
}
}
func cleanup() {
log.Info("Stopping AdGuard Home")
err := stopDNSServer()
if err != nil {
log.Error("Couldn't stop DNS server: %s", err)
| </s> remove BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
AuthName string `yaml:"auth_name"` // AuthName is the basic auth username
AuthPass string ... | // Set user-specified limit of how many fd's we can use
// https://github.com/AdguardTeam/AdGuardHome/issues/659
func setRlimit(val uint) {
var rlim syscall.Rlimit
rlim.Max = uint64(val)
rlim.Cur = uint64(val)
err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rlim)
if err != nil {
log.Error("Setrlimit() failed: %... | }
}
// Set user-specified limit of how many fd's we can use
// https://github.com/AdguardTeam/AdGuardHome/issues/659
func setRlimit(val uint) {
var rlim syscall.Rlimit
rlim.Max = uint64(val)
rlim.Cur = uint64(val)
err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rlim)
if err != nil {
log.Error("Setrlimit... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + config: add "rlimit_nofile" setting - Maximum number of opened fd's per process | https://github.com/AdguardTeam/AdGuardHome/commit/1f1e26f67b00ee4983c65e4e3aabf59a488f687b | app.go |
ourConfigFilename string // Config filename (can be overridden via the command line arguments)
ourWorkingDir string // Location of our directory, used to protect against CWD being somewhere else
firstRun bool // if set to true, don't run any services except HTTP web inteface, and serve only firs... | </s> | BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
AuthName string `yaml:"auth_name"` // AuthName is the basic auth username
AuthPass string `yaml:"auth_pass"` // Au... | ourConfigFilename string // Config filename (can be overridden via the command line arguments)
ourWorkingDir string // Location of our directory, used to protect against CWD being somewhere else
firstRun bool // if set to true, don't run any services except HTTP web inteface, and serve only firs... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + config: add "rlimit_nofile" setting - Maximum number of opened fd's per process | https://github.com/AdguardTeam/AdGuardHome/commit/1f1e26f67b00ee4983c65e4e3aabf59a488f687b | config.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.