docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
sequencelengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
<code>tls://unfiltered.adguard-dns.com</code>: <Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_TLS"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-TLS
</a>,
]}
>
example_upstream_dot
</Trans> | <mask> <li>
<mask> <code>tcp://unfiltered.adguard-dns.com</code>: <Trans>example_upstream_tcp_hostname</Trans>
<mask> </li>
<mask> <li>
<mask> <code>tls://unfiltered.adguard-dns.com</code>:
<mask> <span>
<mask> <Trans
<mask> components={[
<mask> <a
<mask> href="https://en.wikipedia.org/wiki/DNS_over_TLS"
<mask> target="_blank"
<mask> rel="noopener noreferrer"
<mask> key="0"
<mask> >
<mask> DNS-over-TLS
<mask> </a>,
<mask> ]}
<mask> >
<mask> example_upstream_dot
<mask> </Trans>
<mask> </span>
<mask> </li>
<mask> <li>
<mask> <code>https://unfiltered.adguard-dns.com/dns-query</code>:
<mask> <span>
<mask> <Trans
</s> Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <[email protected]>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace870102633a2b8323c5f448ed38b65f4b482
Author: Ainar Garipov <[email protected]>
Date: Thu Aug 18 19:49:07 2022 +0300
all: imp upstream examples </s> remove <code>https://unfiltered.adguard-dns.com/dns-query</code>:
<span>
<Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_doh
</Trans>
</span>
</s> add <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"
key="0"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_doh
</Trans> </s> remove <code>quic://unfiltered.adguard-dns.com:784</code>:
<span>
<Trans
components={[
<a
href="https://datatracker.ietf.org/doc/html/rfc9250"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-QUIC
</a>,
]}
>
example_upstream_doq
</Trans>
</span>
</s> add <code>quic://unfiltered.adguard-dns.com</code>: <Trans
components={[
<a
href="https://datatracker.ietf.org/doc/html/rfc9250"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-QUIC
</a>,
]}
>
example_upstream_doq
</Trans> </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"
target="_blank"
rel="noopener noreferrer"
key="0"
>
Link
</a>,
]}
>
example_upstream_reserved
</Trans>
</span>
</s> add <code>[/example.local/]94.140.14.140</code>: <Trans
components={[
<a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams-for-domains"
target="_blank"
rel="noopener noreferrer"
key="0"
>
Link
</a>,
]}
>
example_upstream_reserved
</Trans> </s> remove <code>sdns://...</code>:
<span>
<Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS Stamps
</a>,
<a
href="https://dnscrypt.info/"
target="_blank"
rel="noopener noreferrer"
key="1"
>
DNSCrypt
</a>,
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="2"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_sdns
</Trans>
</span>
</s> add <code>sdns://...</code>: <Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS Stamps
</a>,
<a
href="https://dnscrypt.info/"
target="_blank"
rel="noopener noreferrer"
key="1"
>
DNSCrypt
</a>,
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="2"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_sdns
</Trans> </s> remove <code>tcp://94.140.14.140</code>: <Trans>example_upstream_tcp</Trans>
</s> add <code>tcp://94.140.14.140</code>, <code>tcp://[2a10:50c0::1:ff]</code>: <Trans>example_upstream_tcp</Trans>
</li>
<li>
<code>tcp://94.140.14.140:53</code>, <code>tcp://[2a10:50c0::1:ff]:53</code>: <Trans>example_upstream_tcp_port</Trans> | [
"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"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | client/src/components/Settings/Dns/Upstream/Examples.js |
<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"
key="0"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_doh
</Trans> | <mask> </Trans>
<mask> </span>
<mask> </li>
<mask> <li>
<mask> <code>https://unfiltered.adguard-dns.com/dns-query</code>:
<mask> <span>
<mask> <Trans
<mask> components={[
<mask> <a
<mask> href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
<mask> target="_blank"
<mask> rel="noopener noreferrer"
<mask> key="0"
<mask> >
<mask> DNS-over-HTTPS
<mask> </a>,
<mask> ]}
<mask> >
<mask> example_upstream_doh
<mask> </Trans>
<mask> </span>
<mask> </li>
<mask> <li>
<mask> <code>quic://unfiltered.adguard-dns.com:784</code>:
<mask> <span>
<mask> <Trans
</s> Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <[email protected]>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace870102633a2b8323c5f448ed38b65f4b482
Author: Ainar Garipov <[email protected]>
Date: Thu Aug 18 19:49:07 2022 +0300
all: imp upstream examples </s> remove <code>sdns://...</code>:
<span>
<Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS Stamps
</a>,
<a
href="https://dnscrypt.info/"
target="_blank"
rel="noopener noreferrer"
key="1"
>
DNSCrypt
</a>,
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="2"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_sdns
</Trans>
</span>
</s> add <code>sdns://...</code>: <Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS Stamps
</a>,
<a
href="https://dnscrypt.info/"
target="_blank"
rel="noopener noreferrer"
key="1"
>
DNSCrypt
</a>,
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="2"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_sdns
</Trans> </s> remove <code>quic://unfiltered.adguard-dns.com:784</code>:
<span>
<Trans
components={[
<a
href="https://datatracker.ietf.org/doc/html/rfc9250"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-QUIC
</a>,
]}
>
example_upstream_doq
</Trans>
</span>
</s> add <code>quic://unfiltered.adguard-dns.com</code>: <Trans
components={[
<a
href="https://datatracker.ietf.org/doc/html/rfc9250"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-QUIC
</a>,
]}
>
example_upstream_doq
</Trans> </s> remove <code>tls://unfiltered.adguard-dns.com</code>:
<span>
<Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_TLS"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-TLS
</a>,
]}
>
example_upstream_dot
</Trans>
</span>
</s> add <code>tls://unfiltered.adguard-dns.com</code>: <Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_TLS"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-TLS
</a>,
]}
>
example_upstream_dot
</Trans> </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"
target="_blank"
rel="noopener noreferrer"
key="0"
>
Link
</a>,
]}
>
example_upstream_reserved
</Trans>
</span>
</s> add <code>[/example.local/]94.140.14.140</code>: <Trans
components={[
<a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams-for-domains"
target="_blank"
rel="noopener noreferrer"
key="0"
>
Link
</a>,
]}
>
example_upstream_reserved
</Trans> </s> remove <code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>:
<span>
<Trans>example_upstream_comment</Trans>
</span>
</s> add <code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>: <Trans>
example_upstream_comment
</Trans> | [
"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"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | client/src/components/Settings/Dns/Upstream/Examples.js |
<code>quic://unfiltered.adguard-dns.com</code>: <Trans
components={[
<a
href="https://datatracker.ietf.org/doc/html/rfc9250"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-QUIC
</a>,
]}
>
example_upstream_doq
</Trans> | <mask> </Trans>
<mask> </span>
<mask> </li>
<mask> <li>
<mask> <code>quic://unfiltered.adguard-dns.com:784</code>:
<mask> <span>
<mask> <Trans
<mask> components={[
<mask> <a
<mask> href="https://datatracker.ietf.org/doc/html/rfc9250"
<mask> target="_blank"
<mask> rel="noopener noreferrer"
<mask> key="0"
<mask> >
<mask> DNS-over-QUIC
<mask> </a>,
<mask> ]}
<mask> >
<mask> example_upstream_doq
<mask> </Trans>
<mask> </span>
<mask> </li>
<mask> <li>
<mask> <code>sdns://...</code>:
<mask> <span>
<mask> <Trans
</s> Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <[email protected]>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace870102633a2b8323c5f448ed38b65f4b482
Author: Ainar Garipov <[email protected]>
Date: Thu Aug 18 19:49:07 2022 +0300
all: imp upstream examples </s> remove <code>https://unfiltered.adguard-dns.com/dns-query</code>:
<span>
<Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_doh
</Trans>
</span>
</s> add <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"
key="0"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_doh
</Trans> </s> remove <code>sdns://...</code>:
<span>
<Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS Stamps
</a>,
<a
href="https://dnscrypt.info/"
target="_blank"
rel="noopener noreferrer"
key="1"
>
DNSCrypt
</a>,
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="2"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_sdns
</Trans>
</span>
</s> add <code>sdns://...</code>: <Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS Stamps
</a>,
<a
href="https://dnscrypt.info/"
target="_blank"
rel="noopener noreferrer"
key="1"
>
DNSCrypt
</a>,
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="2"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_sdns
</Trans> </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"
target="_blank"
rel="noopener noreferrer"
key="0"
>
Link
</a>,
]}
>
example_upstream_reserved
</Trans>
</span>
</s> add <code>[/example.local/]94.140.14.140</code>: <Trans
components={[
<a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams-for-domains"
target="_blank"
rel="noopener noreferrer"
key="0"
>
Link
</a>,
]}
>
example_upstream_reserved
</Trans> </s> remove <code>tls://unfiltered.adguard-dns.com</code>:
<span>
<Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_TLS"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-TLS
</a>,
]}
>
example_upstream_dot
</Trans>
</span>
</s> add <code>tls://unfiltered.adguard-dns.com</code>: <Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_TLS"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-TLS
</a>,
]}
>
example_upstream_dot
</Trans> </s> remove <code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>:
<span>
<Trans>example_upstream_comment</Trans>
</span>
</s> add <code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>: <Trans>
example_upstream_comment
</Trans> | [
"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"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | client/src/components/Settings/Dns/Upstream/Examples.js |
<code>sdns://...</code>: <Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS Stamps
</a>,
<a
href="https://dnscrypt.info/"
target="_blank"
rel="noopener noreferrer"
key="1"
>
DNSCrypt
</a>,
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="2"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_sdns
</Trans> | <mask> </Trans>
<mask> </span>
<mask> </li>
<mask> <li>
<mask> <code>sdns://...</code>:
<mask> <span>
<mask> <Trans
<mask> components={[
<mask> <a
<mask> href="https://dnscrypt.info/stamps/"
<mask> target="_blank"
<mask> rel="noopener noreferrer"
<mask> key="0"
<mask> >
<mask> DNS Stamps
<mask> </a>,
<mask> <a
<mask> href="https://dnscrypt.info/"
<mask> target="_blank"
<mask> rel="noopener noreferrer"
<mask> key="1"
<mask> >
<mask> DNSCrypt
<mask> </a>,
<mask> <a
<mask> href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
<mask> target="_blank"
<mask> rel="noopener noreferrer"
<mask> key="2"
<mask> >
<mask> DNS-over-HTTPS
<mask> </a>,
<mask> ]}
<mask> >
<mask> example_upstream_sdns
<mask> </Trans>
<mask> </span>
<mask> </li>
<mask> <li>
<mask> <code>[/example.local/]94.140.14.140</code>:
<mask> <span>
<mask> <Trans
</s> Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <[email protected]>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace870102633a2b8323c5f448ed38b65f4b482
Author: Ainar Garipov <[email protected]>
Date: Thu Aug 18 19:49:07 2022 +0300
all: imp upstream examples </s> remove <code>https://unfiltered.adguard-dns.com/dns-query</code>:
<span>
<Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_doh
</Trans>
</span>
</s> add <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"
key="0"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_doh
</Trans> </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"
target="_blank"
rel="noopener noreferrer"
key="0"
>
Link
</a>,
]}
>
example_upstream_reserved
</Trans>
</span>
</s> add <code>[/example.local/]94.140.14.140</code>: <Trans
components={[
<a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams-for-domains"
target="_blank"
rel="noopener noreferrer"
key="0"
>
Link
</a>,
]}
>
example_upstream_reserved
</Trans> </s> remove <code>quic://unfiltered.adguard-dns.com:784</code>:
<span>
<Trans
components={[
<a
href="https://datatracker.ietf.org/doc/html/rfc9250"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-QUIC
</a>,
]}
>
example_upstream_doq
</Trans>
</span>
</s> add <code>quic://unfiltered.adguard-dns.com</code>: <Trans
components={[
<a
href="https://datatracker.ietf.org/doc/html/rfc9250"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-QUIC
</a>,
]}
>
example_upstream_doq
</Trans> </s> remove <code>tls://unfiltered.adguard-dns.com</code>:
<span>
<Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_TLS"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-TLS
</a>,
]}
>
example_upstream_dot
</Trans>
</span>
</s> add <code>tls://unfiltered.adguard-dns.com</code>: <Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_TLS"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-TLS
</a>,
]}
>
example_upstream_dot
</Trans> </s> remove * `quic://unfiltered.adguard-dns.com:784`: encrypted DNS-over-QUIC
(experimental).
</s> add * `quic://unfiltered.adguard-dns.com`: encrypted DNS-over-QUIC. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | client/src/components/Settings/Dns/Upstream/Examples.js |
<code>[/example.local/]94.140.14.140</code>: <Trans
components={[
<a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams-for-domains"
target="_blank"
rel="noopener noreferrer"
key="0"
>
Link
</a>,
]}
>
example_upstream_reserved
</Trans> | <mask> </Trans>
<mask> </span>
<mask> </li>
<mask> <li>
<mask> <code>[/example.local/]94.140.14.140</code>:
<mask> <span>
<mask> <Trans
<mask> components={[
<mask> <a
<mask> href="https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams-for-domains"
<mask> target="_blank"
<mask> rel="noopener noreferrer"
<mask> key="0"
<mask> >
<mask> Link
<mask> </a>,
<mask> ]}
<mask> >
<mask> example_upstream_reserved
<mask> </Trans>
<mask> </span>
<mask> </li>
<mask> <li>
<mask> <code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>:
<mask> <span>
<mask> <Trans>example_upstream_comment</Trans>
</s> Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <[email protected]>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace870102633a2b8323c5f448ed38b65f4b482
Author: Ainar Garipov <[email protected]>
Date: Thu Aug 18 19:49:07 2022 +0300
all: imp upstream examples </s> remove <code>sdns://...</code>:
<span>
<Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS Stamps
</a>,
<a
href="https://dnscrypt.info/"
target="_blank"
rel="noopener noreferrer"
key="1"
>
DNSCrypt
</a>,
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="2"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_sdns
</Trans>
</span>
</s> add <code>sdns://...</code>: <Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS Stamps
</a>,
<a
href="https://dnscrypt.info/"
target="_blank"
rel="noopener noreferrer"
key="1"
>
DNSCrypt
</a>,
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="2"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_sdns
</Trans> </s> remove <code>quic://unfiltered.adguard-dns.com:784</code>:
<span>
<Trans
components={[
<a
href="https://datatracker.ietf.org/doc/html/rfc9250"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-QUIC
</a>,
]}
>
example_upstream_doq
</Trans>
</span>
</s> add <code>quic://unfiltered.adguard-dns.com</code>: <Trans
components={[
<a
href="https://datatracker.ietf.org/doc/html/rfc9250"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-QUIC
</a>,
]}
>
example_upstream_doq
</Trans> </s> remove <code>https://unfiltered.adguard-dns.com/dns-query</code>:
<span>
<Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_doh
</Trans>
</span>
</s> add <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"
key="0"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_doh
</Trans> </s> remove <code>tls://unfiltered.adguard-dns.com</code>:
<span>
<Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_TLS"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-TLS
</a>,
]}
>
example_upstream_dot
</Trans>
</span>
</s> add <code>tls://unfiltered.adguard-dns.com</code>: <Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_TLS"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-TLS
</a>,
]}
>
example_upstream_dot
</Trans> </s> remove <code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>:
<span>
<Trans>example_upstream_comment</Trans>
</span>
</s> add <code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>: <Trans>
example_upstream_comment
</Trans> | [
"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"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | client/src/components/Settings/Dns/Upstream/Examples.js |
<code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>: <Trans>
example_upstream_comment
</Trans> | <mask> </Trans>
<mask> </span>
<mask> </li>
<mask> <li>
<mask> <code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>:
<mask> <span>
<mask> <Trans>example_upstream_comment</Trans>
<mask> </span>
<mask> </li>
<mask> </ol>
<mask> </div>
<mask> );
<mask>
</s> Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <[email protected]>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace870102633a2b8323c5f448ed38b65f4b482
Author: Ainar Garipov <[email protected]>
Date: Thu Aug 18 19:49:07 2022 +0300
all: imp upstream examples </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"
target="_blank"
rel="noopener noreferrer"
key="0"
>
Link
</a>,
]}
>
example_upstream_reserved
</Trans>
</span>
</s> add <code>[/example.local/]94.140.14.140</code>: <Trans
components={[
<a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams-for-domains"
target="_blank"
rel="noopener noreferrer"
key="0"
>
Link
</a>,
]}
>
example_upstream_reserved
</Trans> </s> remove <code>https://unfiltered.adguard-dns.com/dns-query</code>:
<span>
<Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_doh
</Trans>
</span>
</s> add <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"
key="0"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_doh
</Trans> </s> remove <code>quic://unfiltered.adguard-dns.com:784</code>:
<span>
<Trans
components={[
<a
href="https://datatracker.ietf.org/doc/html/rfc9250"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-QUIC
</a>,
]}
>
example_upstream_doq
</Trans>
</span>
</s> add <code>quic://unfiltered.adguard-dns.com</code>: <Trans
components={[
<a
href="https://datatracker.ietf.org/doc/html/rfc9250"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-QUIC
</a>,
]}
>
example_upstream_doq
</Trans> </s> remove <code>tls://unfiltered.adguard-dns.com</code>:
<span>
<Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_TLS"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-TLS
</a>,
]}
>
example_upstream_dot
</Trans>
</span>
</s> add <code>tls://unfiltered.adguard-dns.com</code>: <Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_TLS"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-TLS
</a>,
]}
>
example_upstream_dot
</Trans> </s> remove <code>sdns://...</code>:
<span>
<Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS Stamps
</a>,
<a
href="https://dnscrypt.info/"
target="_blank"
rel="noopener noreferrer"
key="1"
>
DNSCrypt
</a>,
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="2"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_sdns
</Trans>
</span>
</s> add <code>sdns://...</code>: <Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS Stamps
</a>,
<a
href="https://dnscrypt.info/"
target="_blank"
rel="noopener noreferrer"
key="1"
>
DNSCrypt
</a>,
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="2"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_sdns
</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | client/src/components/Settings/Dns/Upstream/Examples.js |
export const DNS_OVER_QUIC_PORT = 853; | <mask> export const STANDARD_DNS_PORT = 53;
<mask> export const STANDARD_WEB_PORT = 80;
<mask> export const STANDARD_HTTPS_PORT = 443;
<mask> export const DNS_OVER_TLS_PORT = 853;
<mask> export const DNS_OVER_QUIC_PORT = 784;
<mask> export const MAX_PORT = 65535;
<mask>
<mask> export const EMPTY_DATE = '0001-01-01T00:00:00Z';
<mask>
<mask> export const DEBOUNCE_TIMEOUT = 300;
</s> Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <[email protected]>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace870102633a2b8323c5f448ed38b65f4b482
Author: Ainar Garipov <[email protected]>
Date: Thu Aug 18 19:49:07 2022 +0300
all: imp upstream examples </s> remove <code>sdns://...</code>:
<span>
<Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS Stamps
</a>,
<a
href="https://dnscrypt.info/"
target="_blank"
rel="noopener noreferrer"
key="1"
>
DNSCrypt
</a>,
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="2"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_sdns
</Trans>
</span>
</s> add <code>sdns://...</code>: <Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS Stamps
</a>,
<a
href="https://dnscrypt.info/"
target="_blank"
rel="noopener noreferrer"
key="1"
>
DNSCrypt
</a>,
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="2"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_sdns
</Trans> </s> remove <code>94.140.14.140</code>: {props.t('example_upstream_regular')}
</s> add <code>94.140.14.140</code>, <code>2a10:50c0::1:ff</code>: {props.t('example_upstream_regular')}
</li>
<li>
<code>94.140.14.140:53</code>, <code>[2a10:50c0::1:ff]:53</code>: {props.t('example_upstream_regular_port')} </s> remove <code>tcp://94.140.14.140</code>: <Trans>example_upstream_tcp</Trans>
</s> add <code>tcp://94.140.14.140</code>, <code>tcp://[2a10:50c0::1:ff]</code>: <Trans>example_upstream_tcp</Trans>
</li>
<li>
<code>tcp://94.140.14.140:53</code>, <code>tcp://[2a10:50c0::1:ff]:53</code>: <Trans>example_upstream_tcp_port</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | client/src/helpers/constants.js |
'port_dns_over_quic': 853 | <mask> 'description': >
<mask> Validatable TLS settings.
<mask> 'example':
<mask> 'certificate_path': '/etc/ssl/example.com.cert'
<mask> 'port_dns_over_quic': 784
<mask> 'port_dns_over_tls': 853
<mask> 'port_https': 443
<mask> 'private_key_path': '/etc/ssl/example.com.key'
<mask> 'server_name': 'dns.example.com'
<mask> 'properties':
</s> Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <[email protected]>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace870102633a2b8323c5f448ed38b65f4b482
Author: Ainar Garipov <[email protected]>
Date: Thu Aug 18 19:49:07 2022 +0300
all: imp upstream examples </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>
<Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS Stamps
</a>,
<a
href="https://dnscrypt.info/"
target="_blank"
rel="noopener noreferrer"
key="1"
>
DNSCrypt
</a>,
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="2"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_sdns
</Trans>
</span>
</s> add <code>sdns://...</code>: <Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS Stamps
</a>,
<a
href="https://dnscrypt.info/"
target="_blank"
rel="noopener noreferrer"
key="1"
>
DNSCrypt
</a>,
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="2"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_sdns
</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | openapi/v1.yaml |
'default': 853 | <mask> Should not be sent if `certificate` is sent. Otherwise, must be
<mask> sent.
<mask> 'type': 'string'
<mask> 'port_dns_over_quic':
<mask> 'default': 784
<mask> 'description': >
<mask> The DNS-over-QUIC port. If `0`, DNS-over-QUIC is disabled.
<mask> 'format': 'int64'
<mask> 'maximum': 65535
<mask> 'minimum': 0
</s> Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <[email protected]>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace870102633a2b8323c5f448ed38b65f4b482
Author: Ainar Garipov <[email protected]>
Date: Thu Aug 18 19:49:07 2022 +0300
all: imp upstream examples </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 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | openapi/v1.yaml |
'port_dns_over_quic': 853 | <mask> TLS and encryption settings.
<mask> 'example':
<mask> 'certificate_path': '/etc/ssl/example.com.cert'
<mask> 'enabled': true
<mask> 'port_dns_over_quic': 784
<mask> 'port_dns_over_tls': 853
<mask> 'port_https': 443
<mask> 'private_key_path': '/etc/ssl/example.com.key'
<mask> 'server_name': 'dns.example.com'
<mask> 'required':
</s> Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <[email protected]>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace870102633a2b8323c5f448ed38b65f4b482
Author: Ainar Garipov <[email protected]>
Date: Thu Aug 18 19:49:07 2022 +0300
all: imp upstream examples </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>:
<span>
<Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_doh
</Trans>
</span>
</s> add <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"
key="0"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_doh
</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | openapi/v1.yaml |
'default': 853 | <mask> over HTTPS, and the DNS server will listen requests over
<mask> DNS-over-TLS and other protocols.
<mask> 'type': 'boolean'
<mask> 'port_dns_over_quic':
<mask> 'default': 784
<mask> 'description': >
<mask> The DNS-over-QUIC port. If `0`, DNS-over-QUIC is disabled.
<mask> 'format': 'int64'
<mask> 'maximum': 65535
<mask> 'minimum': 0
</s> Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <[email protected]>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace870102633a2b8323c5f448ed38b65f4b482
Author: Ainar Garipov <[email protected]>
Date: Thu Aug 18 19:49:07 2022 +0300
all: imp upstream examples </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`: encrypted DNS-over-QUIC
(experimental).
</s> add * `quic://unfiltered.adguard-dns.com`: encrypted DNS-over-QUIC. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | openapi/v1.yaml |
* `quic://unfiltered.adguard-dns.com`: encrypted DNS-over-QUIC. | <mask>
<mask> * `https://unfiltered.adguard-dns.com/dns-query`: encrypted
<mask> DNS-over-HTTPS.
<mask>
<mask> * `quic://unfiltered.adguard-dns.com:784`: encrypted DNS-over-QUIC
<mask> (experimental).
<mask>
<mask> * `tcp://94.140.14.140`: plain DNS-over-TCP.
<mask>
<mask> * `sdns://...`: DNS Stamps for DNSCrypt or DNS-over-HTTPS
<mask> resolvers.
</s> Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <[email protected]>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace870102633a2b8323c5f448ed38b65f4b482
Author: Ainar Garipov <[email protected]>
Date: Thu Aug 18 19:49:07 2022 +0300
all: imp upstream examples </s> remove <code>sdns://...</code>:
<span>
<Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS Stamps
</a>,
<a
href="https://dnscrypt.info/"
target="_blank"
rel="noopener noreferrer"
key="1"
>
DNSCrypt
</a>,
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="2"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_sdns
</Trans>
</span>
</s> add <code>sdns://...</code>: <Trans
components={[
<a
href="https://dnscrypt.info/stamps/"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS Stamps
</a>,
<a
href="https://dnscrypt.info/"
target="_blank"
rel="noopener noreferrer"
key="1"
>
DNSCrypt
</a>,
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="2"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_sdns
</Trans> </s> remove 'default': 784
</s> add 'default': 853 </s> remove <code>https://unfiltered.adguard-dns.com/dns-query</code>:
<span>
<Trans
components={[
<a
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_doh
</Trans>
</span>
</s> add <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"
key="0"
>
DNS-over-HTTPS
</a>,
]}
>
example_upstream_doh
</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | openapi/v1.yaml |
#
# TODO(a.garipov): Remove the old, non-standard 784 and 8853 ports for
# DNS-over-QUIC in a future release. | <mask> # 6060 : TCP : HTTP (pprof)
<mask> # 8853 : UDP : DNS-over-QUIC (experimental)
<mask> EXPOSE 53/tcp 53/udp 67/udp 68/udp 80/tcp 443/tcp 443/udp 784/udp\
<mask> 853/tcp 853/udp 3000/tcp 3000/udp 3001/tcp 3001/udp 5443/tcp\
<mask> 5443/udp 6060/tcp 8853/udp
<mask>
</s> Pull request #1572: 4640-imp-upstream-doc
Updates #4640.
Squashed commit of the following:
commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <[email protected]>
Date: Fri Aug 19 17:17:44 2022 +0300
Merge branch 'master' into 4640-imp-upstream-doc
commit 7bace870102633a2b8323c5f448ed38b65f4b482
Author: Ainar Garipov <[email protected]>
Date: Thu Aug 18 19:49:07 2022 +0300
all: imp upstream examples </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={[
<a
href="https://datatracker.ietf.org/doc/html/rfc9250"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-QUIC
</a>,
]}
>
example_upstream_doq
</Trans>
</span>
</s> add <code>quic://unfiltered.adguard-dns.com</code>: <Trans
components={[
<a
href="https://datatracker.ietf.org/doc/html/rfc9250"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-QUIC
</a>,
]}
>
example_upstream_doq
</Trans> </s> remove * `quic://unfiltered.adguard-dns.com:784`: encrypted DNS-over-QUIC
(experimental).
</s> add * `quic://unfiltered.adguard-dns.com`: encrypted DNS-over-QUIC. | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d | scripts/make/Dockerfile |
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
}
}
| <mask> httpError(w, http.StatusBadRequest, "Failed to parse new upstreams config json: %s", err)
<mask> return
<mask> }
<mask>
<mask> config.DNS.UpstreamDNS = defaultDNS
<mask> if len(newconfig.Upstreams) > 0 {
<mask> config.DNS.UpstreamDNS = newconfig.Upstreams
<mask> }
<mask>
<mask> // bootstrap servers are plain DNS only.
</s> [change] control: add upstreams validation </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 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 return fmt.Errorf("%s is not valid IP", ip)
</s> add return fmt.Errorf("%s is not a valid IP", ip) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c | control.go |
// bootstrap servers are plain DNS only. | <mask> if len(newconfig.Upstreams) > 0 {
<mask> config.DNS.UpstreamDNS = newconfig.Upstreams
<mask> }
<mask>
<mask> // bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice
<mask> for _, host := range newconfig.BootstrapDNS {
<mask> err := checkPlainDNS(host)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", host, err)
<mask> return
</s> [change] control: add upstreams validation </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> remove return fmt.Errorf("%s is not valid IP", ip)
</s> add return fmt.Errorf("%s is not a valid IP", ip) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c | control.go |
if err := checkPlainDNS(host); err != nil { | <mask> }
<mask>
<mask> // bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice
<mask> for _, host := range newconfig.BootstrapDNS {
<mask> err := checkPlainDNS(host)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", host, err)
<mask> return
<mask> }
<mask> }
<mask>
</s> [change] control: add upstreams validation </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.ParseIP(host) != nil {
</s> add if net.ParseIP(upstream) != nil { </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) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c | control.go |
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")
}
return checkPlainDNS(upstream)
}
| <mask> }
<mask>
<mask> // checkPlainDNS checks if host is plain DNS
<mask> func checkPlainDNS(upstream string) error {
<mask> // Check if host is ip without port
<mask> if net.ParseIP(upstream) != nil {
<mask> return nil
</s> [change] control: add upstreams validation </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 err := checkPlainDNS(host)
if err != nil {
</s> add if err := checkPlainDNS(host); err != nil { </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. | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c | control.go |
func checkPlainDNS(upstream string) error { | <mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> // checkPlainDNS checks if host is plain DNS
<mask> func checkPlainDNS(host string) error {
<mask> // Check if host is ip without port
<mask> if net.ParseIP(host) != nil {
<mask> return nil
<mask> }
<mask>
</s> [change] control: add upstreams validation </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> 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. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c | control.go |
if net.ParseIP(upstream) != nil { | <mask>
<mask> // checkPlainDNS checks if host is plain DNS
<mask> func checkPlainDNS(host string) error {
<mask> // Check if host is ip without port
<mask> if net.ParseIP(host) != nil {
<mask> return nil
<mask> }
<mask>
<mask> // Check if host is ip with port
<mask> ip, port, err := net.SplitHostPort(host)
</s> [change] control: add upstreams validation </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); err != nil { </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. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c | control.go |
ip, port, err := net.SplitHostPort(upstream) | <mask> return nil
<mask> }
<mask>
<mask> // Check if host is ip with port
<mask> ip, port, err := net.SplitHostPort(host)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> if net.ParseIP(ip) == nil {
</s> [change] control: add upstreams validation </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> remove err := checkPlainDNS(host)
if err != nil {
</s> add if err := checkPlainDNS(host); err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c | control.go |
return fmt.Errorf("%s is not a valid IP", ip) | <mask> return err
<mask> }
<mask>
<mask> if net.ParseIP(ip) == nil {
<mask> return fmt.Errorf("%s is not valid IP", ip)
<mask> }
<mask>
<mask> _, err = strconv.ParseInt(port, 0, 64)
<mask> if err != nil {
<mask> return fmt.Errorf("%s is not valid port: %s", port, err)
</s> [change] control: add upstreams validation </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 if err := checkPlainDNS(host); err != nil { </s> remove if net.ParseIP(host) != nil {
</s> add if net.ParseIP(upstream) != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c | control.go |
return fmt.Errorf("%s is not a valid port: %s", port, err) | <mask> }
<mask>
<mask> _, err = strconv.ParseInt(port, 0, 64)
<mask> if err != nil {
<mask> return fmt.Errorf("%s is not valid port: %s", port, err)
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
</s> [change] control: add upstreams validation </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(host); err != nil { </s> remove if net.ParseIP(host) != nil {
</s> add if net.ParseIP(upstream) != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c | control.go |
// RequestFilteringSettings is custom filtering settings | <mask> const defaultParentalURL = "%s://%s/check-parental-control-hash?prefixes=%s&sensitivity=%d"
<mask> const defaultParentalSensitivity = 13 // use "TEEN" by default
<mask> const maxDialCacheSize = 2 // the number of host names for safebrowsing and parental control
<mask>
<mask> // Custom filtering settings
<mask> type RequestFilteringSettings struct {
<mask> FilteringEnabled bool
<mask> SafeSearchEnabled bool
<mask> SafeBrowsingEnabled bool
<mask> ParentalEnabled bool
</s> + dnsforward: use Rewrites table </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 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsfilter/dnsfilter.go |
// RewriteEntry is a rewrite array element
type RewriteEntry struct {
Domain string `yaml:"domain"`
Answer string `yaml:"answer"` // IP address or canonical name
}
| <mask> }
<mask>
<mask> // Config allows you to configure DNS filtering with New() or just change variables directly.
<mask> type Config struct {
<mask> ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
<mask> ParentalEnabled bool `yaml:"parental_enabled"`
<mask> UsePlainHTTP bool `yaml:"-"` // use plain HTTP for requests to parental and safe browsing servers
</s> + dnsforward: use Rewrites table </s> remove // Custom filtering settings
</s> add // RequestFilteringSettings is custom filtering settings | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsfilter/dnsfilter.go |
Rewrites []RewriteEntry `yaml:"rewrites"`
| <mask> SafeBrowsingCacheSize int `yaml:"safebrowsing_cache_size"`
<mask> SafeSearchCacheSize int `yaml:"safesearch_cache_size"`
<mask> ParentalCacheSize int `yaml:"parental_cache_size"`
<mask>
<mask> // Filtering callback function
<mask> FilterHandler func(clientAddr string, settings *RequestFilteringSettings) `yaml:"-"`
<mask> }
<mask>
<mask> type privateConfig struct {
<mask> parentalServer string // access via methods
</s> + dnsforward: use Rewrites table </s> remove // Custom filtering settings
</s> add // RequestFilteringSettings is custom filtering settings | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsfilter/dnsfilter.go |
// ReasonRewrite - rewrite rule was applied
ReasonRewrite | <mask> // FilteredSafeSearch - the host was replaced with safesearch variant
<mask> FilteredSafeSearch
<mask> )
<mask>
<mask> func (i Reason) String() string {
<mask> names := []string{
</s> + dnsforward: use Rewrites table </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 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsfilter/dnsfilter.go |
"Rewrite", | <mask> "FilteredSafeBrowsing",
<mask> "FilteredParental",
<mask> "FilteredInvalid",
<mask> "FilteredSafeSearch",
<mask> }
<mask> if uint(i) >= uint(len(names)) {
<mask> return ""
<mask> }
<mask> return names[i]
<mask> }
</s> + dnsforward: use Rewrites table </s> remove var res dnsfilter.Result
</s> add if host != origHost {
log.Debug("Rewrite: not supported: CNAME for %s is %s", origHost, host)
}
| [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsfilter/dnsfilter.go |
// for ReasonRewrite:
CanonName string `json:",omitempty"` // CNAME value
IPList []net.IP `json:",omitempty"` // list of IP addresses | <mask> IP net.IP `json:",omitempty"` // Not nil only in the case of a hosts file syntax
<mask> FilterID int64 `json:",omitempty"` // Filter ID the rule belongs to
<mask> }
<mask>
<mask> // Matched can be used to see if any match at all was found, no matter filtered or not
<mask> func (r Reason) Matched() bool {
<mask> return r != NotFilteredNotFound
</s> + dnsforward: use Rewrites table </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 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsfilter/dnsfilter.go |
result = d.processRewrites(host, qtype)
if result.Reason == ReasonRewrite {
return result, nil
}
| <mask>
<mask> var result Result
<mask> var err error
<mask> // try filter lists first
<mask> if setts.FilteringEnabled {
<mask> result, err = d.matchHost(host, qtype)
<mask> if err != nil {
</s> + dnsforward: use Rewrites table </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[0].Name, ".")
origHost := host | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsfilter/dnsfilter.go |
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)
}
| <mask>
<mask> if d.Res == nil {
<mask> // request was not filtered so let it be processed further
<mask> err = p.Resolve(d)
<mask> if err != nil {
<mask> return err
<mask> }
</s> + dnsforward: use Rewrites table </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[0].Name, ".")
origHost := host | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsforward/dnsforward.go |
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
}
} | <mask> return err
<mask> }
<mask> }
<mask>
<mask> shouldLog := true
<mask> msg := d.Req
<mask>
</s> + dnsforward: use Rewrites table </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 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsforward/dnsforward.go |
var res dnsfilter.Result
req := d.Req
host := strings.TrimSuffix(req.Question[0].Name, ".")
origHost := host | <mask> }
<mask>
<mask> // filterDNSRequest applies the dnsFilter and sets d.Res if the request was filtered
<mask> func (s *Server) filterDNSRequest(d *proxy.DNSContext) (*dnsfilter.Result, error) {
<mask> msg := d.Req
<mask> host := strings.TrimSuffix(msg.Question[0].Name, ".")
<mask>
<mask> s.RLock()
<mask> protectionEnabled := s.conf.ProtectionEnabled
<mask> dnsFilter := s.dnsFilter
<mask> s.RUnlock()
</s> + dnsforward: use Rewrites table | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsforward/dnsforward.go |
if host != origHost {
log.Debug("Rewrite: not supported: CNAME for %s is %s", origHost, host)
}
| <mask> if !protectionEnabled {
<mask> return nil, nil
<mask> }
<mask>
<mask> var res dnsfilter.Result
<mask> var err error
<mask>
<mask> clientAddr := ""
<mask> if d.Addr != nil {
<mask> clientAddr, _, _ = net.SplitHostPort(d.Addr.String())
</s> + dnsforward: use Rewrites table </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 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsforward/dnsforward.go |
// 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 answer
}
| <mask>
<mask> return &resp
<mask> }
<mask>
<mask> func (s *Server) genNXDomain(request *dns.Msg) *dns.Msg {
<mask> resp := dns.Msg{}
<mask> resp.SetRcode(request, dns.RcodeNameError)
<mask> resp.RecursionAvailable = true
</s> + dnsforward: use Rewrites table </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 for %s is %s", origHost, host)
}
| [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec | dnsforward/dnsforward.go |
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")
}
}
| <mask> }
<mask> }
<mask>
<mask> func TestParseService(t *testing.T) {
<mask> if testParseOk(t).serviceControlAction != "" {
<mask> t.Fatal("empty is no service command")
<mask> }
</s> * (home): added tests for no-mem-optimization flag </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: "config",
workDir: "work",
pidFile: "pid",
disableUpdate: true,
disableMemoryOptimization: true,
}, "-c", "config", "-w", "work", "-s", "run", "--pidfile", "pid", "--no-check-update", "--no-mem-optimization") | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1c88667306e7a52d36a6a1cbf3eca86fd612bd7f | home/options_test.go |
func TestSerializeDisableMemoryOptimization(t *testing.T) {
testSerialize(t, options{disableMemoryOptimization: true}, "--no-mem-optimization")
}
| <mask> func TestSerializeGLInet(t *testing.T) {
<mask> testSerialize(t, options{glinetMode: true}, "--glinet")
<mask> }
<mask>
<mask> func TestSerializeMultiple(t *testing.T) {
<mask> testSerialize(t, options{
<mask> serviceControlAction: "run",
<mask> configFilename: "config",
<mask> workDir: "work",
<mask> pidFile: "pid",
</s> * (home): added tests for no-mem-optimization flag </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: "config",
workDir: "work",
pidFile: "pid",
disableUpdate: true,
disableMemoryOptimization: true,
}, "-c", "config", "-w", "work", "-s", "run", "--pidfile", "pid", "--no-check-update", "--no-mem-optimization") | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1c88667306e7a52d36a6a1cbf3eca86fd612bd7f | home/options_test.go |
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-optimization") | <mask> }
<mask>
<mask> func TestSerializeMultiple(t *testing.T) {
<mask> testSerialize(t, options{
<mask> serviceControlAction: "run",
<mask> configFilename: "config",
<mask> workDir: "work",
<mask> pidFile: "pid",
<mask> disableUpdate: true,
<mask> }, "-c", "config", "-w", "work", "-s", "run", "--pidfile", "pid", "--no-check-update")
<mask> }
</s> * (home): added tests for no-mem-optimization flag | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1c88667306e7a52d36a6a1cbf3eca86fd612bd7f | home/options_test.go |
const (
safeBrowsingBlockHost = "standard-block.dns.adguard.com"
parentalBlockHost = "family-block.dns.adguard.com"
)
| <mask> sync.RWMutex
<mask> ServerConfig
<mask> }
<mask>
<mask> // uncomment this block to have tracing of locks
<mask> /*
<mask> func (s *Server) Lock() {
<mask> pc := make([]uintptr, 10) // at least 1 entry needed
<mask> runtime.Callers(2, pc)
<mask> f := runtime.FuncForPC(pc[0])
</s> Resolve into a stub page when blocked by parental or safebrowsing.
Closes #475. </s> remove upstream := s.chooseUpstream()
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1c89e1df32d5fcb9d69156c9bfcc1680f733d1dd | dnsforward/dnsforward.go |
// we need upstream to resolve A records
upstream := s.chooseUpstream()
| <mask> return s.genNotImpl(msg), nil, nil, nil
<mask> }
<mask>
<mask> host := strings.TrimSuffix(msg.Question[0].Name, ".")
<mask> // use dnsfilter before cache -- changed settings or filters would require cache invalidation otherwise
<mask> var res dnsfilter.Result
<mask> var err error
</s> Resolve into a stub page when blocked by parental or safebrowsing.
Closes #475. </s> remove upstream := s.chooseUpstream()
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1c89e1df32d5fcb9d69156c9bfcc1680f733d1dd | dnsforward/dnsforward.go |
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
} | <mask> log.Printf("dnsfilter failed to check host '%s': %s", host, err)
<mask> return s.genServerFailure(msg), &res, nil, err
<mask> } else if res.IsFiltered {
<mask> log.Printf("Host %s is filtered, reason - '%s', matched rule: '%s'", host, res.Reason, res.Rule)
<mask> return s.genNXDomain(msg), &res, nil, nil
<mask> }
<mask> }
<mask>
<mask> {
</s> Resolve into a stub page when blocked by parental or safebrowsing.
Closes #475. </s> remove upstream := s.chooseUpstream()
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1c89e1df32d5fcb9d69156c9bfcc1680f733d1dd | dnsforward/dnsforward.go |
<mask> }
<mask> }
<mask>
<mask> // TODO: replace with single-socket implementation
<mask> upstream := s.chooseUpstream()
<mask> reply, err := upstream.Exchange(msg)
<mask> if err != nil {
<mask> log.Printf("talking to upstream failed for host '%s': %s", host, err)
<mask> return s.genServerFailure(msg), &res, upstream, err
<mask> }
</s> Resolve into a stub page when blocked by parental or safebrowsing.
Closes #475. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1c89e1df32d5fcb9d69156c9bfcc1680f733d1dd | dnsforward/dnsforward.go |
|
safebrowsingCache gcache.Cache
parentalCache gcache.Cache | <mask>
<mask> // these variables need to survive coredns reload
<mask> var (
<mask> stats Stats
<mask> safebrowsingCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
<mask> parentalCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
<mask> )
<mask>
<mask> // Result holds state of hostname check
<mask> type Result struct {
<mask> IsFiltered bool
</s> dnsfilter -- lazily initialize safebrowsing and parental lookup cache </s> remove d.transport.CloseIdleConnections()
</s> add if d != nil && d.transport != nil {
d.transport.CloseIdleConnections()
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1cc1e3749df6ccefb741232d7949fd5893d84f66 | dnsfilter/dnsfilter.go |
if safebrowsingCache == nil {
safebrowsingCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
} | <mask> return result, nil
<mask> }
<mask> result, err := d.lookupCommon(host, &stats.Safebrowsing, safebrowsingCache, true, format, handleBody)
<mask> return result, err
<mask> }
<mask>
<mask> func (d *Dnsfilter) checkParental(host string) (Result, error) {
<mask> // prevent recursion -- checking the host of parental safety server makes no sense
</s> dnsfilter -- lazily initialize safebrowsing and parental lookup cache </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(defaultCacheTime).Build()
</s> add safebrowsingCache gcache.Cache
parentalCache gcache.Cache | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1cc1e3749df6ccefb741232d7949fd5893d84f66 | dnsfilter/dnsfilter.go |
if parentalCache == nil {
parentalCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
} | <mask> return result, nil
<mask> }
<mask> result, err := d.lookupCommon(host, &stats.Parental, parentalCache, false, format, handleBody)
<mask> return result, err
<mask> }
<mask>
<mask> // real implementation of lookup/check
</s> dnsfilter -- lazily initialize safebrowsing and parental lookup cache </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(defaultCacheTime).Build()
</s> add safebrowsingCache gcache.Cache
parentalCache gcache.Cache | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1cc1e3749df6ccefb741232d7949fd5893d84f66 | dnsfilter/dnsfilter.go |
if d != nil && d.transport != nil {
d.transport.CloseIdleConnections()
} | <mask>
<mask> // Destroy is optional if you want to tidy up goroutines without waiting for them to die off
<mask> // right now it closes idle HTTP connections if there are any
<mask> func (d *Dnsfilter) Destroy() {
<mask> d.transport.CloseIdleConnections()
<mask> }
<mask>
<mask> //
<mask> // config manipulation helpers
<mask> //
</s> dnsfilter -- lazily initialize safebrowsing and parental lookup cache </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 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1cc1e3749df6ccefb741232d7949fd5893d84f66 | dnsfilter/dnsfilter.go |
import { formatTime } from '../../helpers/helpers'; | <mask> import { saveAs } from 'file-saver/FileSaver';
<mask> import escapeRegExp from 'lodash/escapeRegExp';
<mask> import endsWith from 'lodash/endsWith';
<mask> import PageTitle from '../ui/PageTitle';
<mask> import Card from '../ui/Card';
<mask> import Loading from '../ui/Loading';
<mask> import Tooltip from '../ui/Tooltip';
<mask> import './Logs.css';
</s> Fix sorting issue and show loader
Closes #362 </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> add {queryLogEnabled && queryLogs.getLogsProcessing && <Loading />}
{queryLogEnabled && !queryLogs.getLogsProcessing && | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820 | client/src/components/Logs/index.js |
Cell: ({ value }) => (<div className="logs__row"><span className="logs__text" title={value}>{formatTime(value)}</span></div>), | <mask> Header: 'Time',
<mask> accessor: 'time',
<mask> maxWidth: 110,
<mask> filterable: false,
<mask> }, {
<mask> Header: 'Domain name',
<mask> accessor: 'domain',
<mask> Cell: (row) => {
<mask> const response = row.value;
</s> Fix sorting issue and show loader
Closes #362 </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> add {queryLogEnabled && queryLogs.getLogsProcessing && <Loading />}
{queryLogEnabled && !queryLogs.getLogsProcessing && | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820 | client/src/components/Logs/index.js |
{queryLogEnabled && queryLogs.getLogsProcessing && <Loading />}
{queryLogEnabled && !queryLogs.getLogsProcessing && | <mask> {this.renderButtons(queryLogEnabled)}
<mask> </div>
<mask> </PageTitle>
<mask> <Card>
<mask> {queryLogEnabled && queryLogs.processing && <Loading />}
<mask> {queryLogEnabled && !queryLogs.processing &&
<mask> this.renderLogs(queryLogs.logs)}
<mask> </Card>
<mask> </Fragment>
<mask> );
<mask> }
</s> Fix sorting issue and show loader
Closes #362 </s> remove time: formatTime(time),
</s> add time, </s> remove const formatTime = (time) => {
</s> add export const formatTime = (time) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820 | client/src/components/Logs/index.js |
export const formatTime = (time) => { | <mask> import round from 'lodash/round';
<mask>
<mask> import { STATS_NAMES } from './constants';
<mask>
<mask> const formatTime = (time) => {
<mask> const parsedTime = dateParse(time);
<mask> return dateFormat(parsedTime, 'HH:mm:ss');
<mask> };
<mask>
<mask> export const normalizeLogs = logs => logs.map((log) => {
</s> Fix sorting issue and show loader
Closes #362 </s> remove time: formatTime(time),
</s> add time, </s> remove {queryLogEnabled && queryLogs.processing && <Loading />}
{queryLogEnabled && !queryLogs.processing &&
</s> add {queryLogEnabled && queryLogs.getLogsProcessing && <Loading />}
{queryLogEnabled && !queryLogs.getLogsProcessing && | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820 | client/src/helpers/helpers.js |
time, | <mask> const { value, type, ttl } = response;
<mask> return `${type}: ${value} (ttl=${ttl})`;
<mask> }) : [];
<mask> return {
<mask> time: formatTime(time),
<mask> domain,
<mask> type,
<mask> response: responsesArray,
<mask> reason,
<mask> client,
</s> Fix sorting issue and show loader
Closes #362 </s> remove const formatTime = (time) => {
</s> add export const formatTime = (time) => { </s> remove {queryLogEnabled && queryLogs.processing && <Loading />}
{queryLogEnabled && !queryLogs.processing &&
</s> add {queryLogEnabled && queryLogs.getLogsProcessing && <Loading />}
{queryLogEnabled && !queryLogs.getLogsProcessing && | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820 | client/src/helpers/helpers.js |
minWidth: 160, | <mask> columns={[
<mask> {
<mask> Header: 'MAC',
<mask> accessor: 'mac',
<mask> Cell: this.cellWrap,
<mask> }, {
<mask> Header: 'IP',
<mask> accessor: 'ip',
<mask> minWidth: 230,
</s> Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110b
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:23:34 2023 +0200
client: fix leases table on mobile | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/Leases.js |
minWidth: 230, | <mask> Cell: this.cellWrap,
<mask> }, {
<mask> Header: 'IP',
<mask> accessor: 'ip',
<mask> Cell: this.cellWrap,
<mask> sortMethod: sortIp,
<mask> }, {
<mask> Header: <Trans>dhcp_table_hostname</Trans>,
<mask> accessor: 'hostname',
<mask> minWidth: 230,
</s> Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110b
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:23:34 2023 +0200
client: fix leases table on mobile | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/Leases.js |
minWidth: 230, | <mask> }, {
<mask> Header: <Trans>dhcp_table_hostname</Trans>,
<mask> accessor: 'hostname',
<mask> Cell: this.cellWrap,
<mask> }, {
<mask> Header: <Trans>dhcp_table_expires</Trans>,
<mask> accessor: 'expires',
</s> Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110b
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:23:34 2023 +0200
client: fix leases table on mobile | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/Leases.js |
minWidth: 130, | <mask> Cell: this.cellWrap,
<mask> }, {
<mask> Header: <Trans>dhcp_table_expires</Trans>,
<mask> accessor: 'expires',
<mask> Cell: this.cellWrap,
<mask> },
<mask> ]}
<mask> pageSize={LEASES_TABLE_DEFAULT_PAGE_SIZE}
<mask> showPageSizeOptions={false}
<mask> showPagination={leases.length > LEASES_TABLE_DEFAULT_PAGE_SIZE}
</s> Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110b
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:23:34 2023 +0200
client: fix leases table on mobile | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/Leases.js |
minWidth: 160, | <mask> {
<mask> Header: 'MAC',
<mask> accessor: 'mac',
<mask> Cell: cellWrap,
<mask> },
<mask> {
<mask> Header: 'IP',
</s> Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110b
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:23:34 2023 +0200
client: fix leases table on mobile | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/StaticLeases/index.js |
minWidth: 230, | <mask> Header: 'IP',
<mask> accessor: 'ip',
<mask> sortMethod: sortIp,
<mask> Cell: cellWrap,
<mask> },
<mask> {
</s> Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110b
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:23:34 2023 +0200
client: fix leases table on mobile | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/StaticLeases/index.js |
minWidth: 230, | <mask> Header: <Trans>dhcp_table_hostname</Trans>,
<mask> accessor: 'hostname',
<mask> Cell: cellWrap,
<mask> },
<mask> {
<mask> Header: <Trans>actions_table_header</Trans>,
<mask> accessor: 'actions',
</s> Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110b
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:23:34 2023 +0200
client: fix leases table on mobile | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/StaticLeases/index.js |
"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.", | <mask> "local_ptr_title": "Private reverse DNS servers",
<mask> "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 resolvers of your OS.",
<mask> "local_ptr_placeholder": "Enter one server address per line",
<mask> "resolve_clients_title": "Enable reverse resolving of clients' IP addresses",
<mask> "resolve_clients_desc": "If enabled, AdGuard Home will attempt to reversely resolve clients' IP addresses into their hostnames by sending PTR queries to corresponding resolvers (private DNS servers for local clients, upstream servers for clients with public IP addresses).",
<mask> "use_private_ptr_resolvers_title": "Use private rDNS resolvers",
<mask> "use_private_ptr_resolvers_desc": "Perform reverse DNS lookups for locally-served addresses using these upstream servers. If disabled, AdGuard Home responds with NXDOMAIN to all such PTR requests except for clients known from DHCP, /etc/hosts, and so on.",
</s> 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 <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </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 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.
localAddrs = aghstrings.FilterOut(localAddrs, ourAddrsSet.Has)
</s> add log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs) </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) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | client/src/__locales/en.json |
const defaultLocalPtrUpstreams = useSelector(
(state) => state.dnsConfig.default_local_ptr_upstreams,
); | <mask> const { t } = useTranslation();
<mask> const upstream_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns);
<mask> const processingTestUpstream = useSelector((state) => state.settings.processingTestUpstream);
<mask> const processingSetConfig = useSelector((state) => state.dnsConfig.processingSetConfig);
<mask>
<mask> const handleUpstreamTest = () => dispatch(testUpstreamWithFormValues());
<mask>
<mask> const testButtonClass = classnames('btn btn-primary btn-standard mr-2', {
<mask> 'btn-loading': processingTestUpstream,
</s> 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 <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </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 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() | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | client/src/components/Settings/Dns/Upstream/Form.js |
<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_resolver</Trans>
) : (
<Trans>local_ptr_no_default_resolver</Trans>
)}
</div> | <mask> <Trans>local_ptr_desc</Trans>
<mask> </div>
<mask> <Field
<mask> id="local_ptr_upstreams"
<mask> name="local_ptr_upstreams"
<mask> component={renderTextareaField}
<mask> type="text"
</s> 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 <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </s> remove '$ref': '#/components/schemas/DNSConfig'
</s> add 'allOf':
- '$ref': '#/components/schemas/DNSConfig'
- 'type': 'object'
'properties':
'default_local_ptr_upstreams':
'type': 'array'
'items':
'type': 'string'
'example':
- '192.168.168.192'
- '10.0.0.10' </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. | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | client/src/components/Settings/Dns/Upstream/Form.js |
// Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use. | <mask> type HostGenFunc func() (host string)
<mask>
<mask> // SystemResolvers helps to work with local resolvers' addresses provided by OS.
<mask> type SystemResolvers interface {
<mask> // Get returns the slice of local resolvers' addresses.
<mask> // It should be safe for concurrent use.
<mask> Get() (rs []string)
<mask> // refresh refreshes the local resolvers' addresses cache. It should be
<mask> // safe for concurrent use.
<mask> refresh() (err error)
<mask> }
</s> 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 <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </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.
localAddrs = aghstrings.FilterOut(localAddrs, ourAddrsSet.Has)
</s> add log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs) </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() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/aghnet/systemresolvers.go |
sysResolvers aghnet.SystemResolvers | <mask> ipset ipsetCtx
<mask> subnetDetector *aghnet.SubnetDetector
<mask> localResolvers *proxy.Proxy
<mask> recDetector *recursionDetector
<mask>
<mask> tableHostToIP hostToIPTable
<mask> tableHostToIPLock sync.Mutex
<mask>
</s> 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 <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </s> remove '$ref': '#/components/schemas/DNSConfig'
</s> add 'allOf':
- '$ref': '#/components/schemas/DNSConfig'
- 'type': 'object'
'properties':
'default_local_ptr_upstreams':
'type': 'array'
'items':
'type': 'string'
'example':
- '192.168.168.192'
- '10.0.0.10' </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. | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
// 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)
}
| <mask> localDomainSuffix: localDomainSuffix,
<mask> recDetector: newRecursionDetector(recursionTTL, cachedRecurrentReqNum),
<mask> }
<mask>
<mask> if p.DHCPServer != nil {
<mask> s.dhcpServer = p.DHCPServer
<mask> s.dhcpServer.SetOnLeaseChanged(s.onDHCPLeaseChanged)
<mask> s.onDHCPLeaseChanged(dhcpd.LeaseChangedAdded)
<mask> }
</s> 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 <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </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.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> remove log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
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 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.
return aghstrings.FilterOut(addrs, ourAddrsSet.Has), nil
}
| <mask>
<mask> return addrs[:i], nil
<mask> }
<mask>
<mask> // setupResolvers initializes the resolvers for local addresses. For internal
<mask> // use only.
<mask> func (s *Server) setupResolvers(localAddrs []string) (err error) {
<mask> bootstraps := s.conf.BootstrapDNS
<mask> if len(localAddrs) == 0 {
</s> 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 <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </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> 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 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. It's not a pointer to the slice
// since there is no need to omit it while decoding from JSON.
DefautLocalPTRUpstreams []string `json:"default_local_ptr_upstreams,omitempty"`
}{
dnsConfig: s.getDNSConfig(),
DefautLocalPTRUpstreams: defLocalPTRUps,
} </s> remove log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
localAddrs = s.sysResolvers.Get() | <mask> // use only.
<mask> func (s *Server) setupResolvers(localAddrs []string) (err error) {
<mask> bootstraps := s.conf.BootstrapDNS
<mask> if len(localAddrs) == 0 {
<mask> var sysRes aghnet.SystemResolvers
<mask> // TODO(e.burkov): Enable the refresher after the actual
<mask> // implementation passes the public testing.
<mask> sysRes, err = aghnet.NewSystemResolvers(0, nil)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> localAddrs = sysRes.Get()
<mask> bootstraps = nil
<mask> }
<mask> log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
<mask>
<mask> var ourAddrs []string
</s> 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 <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </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 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.
localAddrs = aghstrings.FilterOut(localAddrs, ourAddrsSet.Has)
</s> add log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
<mask>
<mask> localAddrs = sysRes.Get()
<mask> bootstraps = nil
<mask> }
<mask> log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
<mask>
<mask> var ourAddrs []string
<mask> ourAddrs, err = s.collectDNSIPAddrs()
<mask> if err != nil {
<mask> return err
</s> 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 <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </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.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </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.
localAddrs = aghstrings.FilterOut(localAddrs, ourAddrsSet.Has)
</s> add log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs) </s> remove enc := json.NewEncoder(w)
if err := enc.Encode(resp); err != nil {
</s> add if err = json.NewEncoder(w).Encode(resp); err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
|
localAddrs, err = s.filterOurDNSAddrs(localAddrs) | <mask> bootstraps = nil
<mask> }
<mask> log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
<mask>
<mask> var ourAddrs []string
<mask> ourAddrs, err = s.collectDNSIPAddrs()
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> ourAddrsSet := aghstrings.NewSet(ourAddrs...)
</s> 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 <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </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 {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </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.
localAddrs = aghstrings.FilterOut(localAddrs, ourAddrsSet.Has)
</s> add log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs) </s> remove enc := json.NewEncoder(w)
if err := enc.Encode(resp); err != nil {
</s> add if err = json.NewEncoder(w).Encode(resp); err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs) | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> ourAddrsSet := aghstrings.NewSet(ourAddrs...)
<mask>
<mask> // TODO(e.burkov): The approach of subtracting sets of strings is not
<mask> // really applicable here since in case of listening on all network
<mask> // interfaces we should check the whole interface's network to cut off
<mask> // all the loopback addresses as well.
<mask> localAddrs = aghstrings.FilterOut(localAddrs, ourAddrsSet.Has)
<mask>
<mask> var upsConfig proxy.UpstreamConfig
<mask> upsConfig, err = proxy.ParseUpstreamsConfig(localAddrs, upstream.Options{
<mask> Bootstrap: bootstraps,
<mask> Timeout: defaultLocalTimeout,
</s> 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 <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </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> remove var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
</s> add localAddrs, err = s.filterOurDNSAddrs(localAddrs) </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 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. It's not a pointer to the slice
// since there is no need to omit it while decoding from JSON.
DefautLocalPTRUpstreams []string `json:"default_local_ptr_upstreams,omitempty"`
}{
dnsConfig: s.getDNSConfig(),
DefautLocalPTRUpstreams: defLocalPTRUps,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
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 is no need to omit it while decoding from JSON.
DefautLocalPTRUpstreams []string `json:"default_local_ptr_upstreams,omitempty"`
}{
dnsConfig: s.getDNSConfig(),
DefautLocalPTRUpstreams: defLocalPTRUps,
} | <mask> }
<mask> }
<mask>
<mask> func (s *Server) handleGetConfig(w http.ResponseWriter, r *http.Request) {
<mask> resp := s.getDNSConfig()
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask>
<mask> enc := json.NewEncoder(w)
<mask> if err := enc.Encode(resp); err != nil {
</s> 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 <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </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 = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </s> remove var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
</s> add localAddrs, err = s.filterOurDNSAddrs(localAddrs) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/http.go |
if err = json.NewEncoder(w).Encode(resp); err != nil { | <mask> resp := s.getDNSConfig()
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask>
<mask> enc := json.NewEncoder(w)
<mask> if err := enc.Encode(resp); err != nil {
<mask> httpError(r, w, http.StatusInternalServerError, "json.Encoder: %s", err)
<mask> return
<mask> }
<mask> }
<mask>
</s> 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 <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </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. It's not a pointer to the slice
// since there is no need to omit it while decoding from JSON.
DefautLocalPTRUpstreams []string `json:"default_local_ptr_upstreams,omitempty"`
}{
dnsConfig: s.getDNSConfig(),
DefautLocalPTRUpstreams: defLocalPTRUps,
} </s> remove var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
</s> add localAddrs, err = s.filterOurDNSAddrs(localAddrs) </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 {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/http.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghnet" | <mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> // fakeSystemResolvers is a mock aghnet.SystemResolvers implementation for tests.
</s> 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 <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </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> 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. It's not a pointer to the slice
// since there is no need to omit it while decoding from JSON.
DefautLocalPTRUpstreams []string `json:"default_local_ptr_upstreams,omitempty"`
}{
dnsConfig: s.getDNSConfig(),
DefautLocalPTRUpstreams: defLocalPTRUps,
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/http_test.go |
// 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.SystemResolvers interface for *fakeSystemResolvers.
// It always returns nil.
func (fsr *fakeSystemResolvers) Get() (rs []string) {
return nil
}
| <mask> )
<mask>
<mask> func loadTestData(t *testing.T, casesFileName string, cases interface{}) {
<mask> t.Helper()
<mask>
<mask> var f *os.File
<mask> f, err := os.Open(filepath.Join("testdata", casesFileName))
</s> 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 <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </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> 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. It's not a pointer to the slice
// since there is no need to omit it while decoding from JSON.
DefautLocalPTRUpstreams []string `json:"default_local_ptr_upstreams,omitempty"`
}{
dnsConfig: s.getDNSConfig(),
DefautLocalPTRUpstreams: defLocalPTRUps,
} </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) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/http_test.go |
s.sysResolvers = &fakeSystemResolvers{}
| <mask> }
<mask> s := createTestServer(t, filterConf, forwardConf, nil)
<mask> require.Nil(t, s.Start())
<mask> t.Cleanup(func() {
<mask> require.Nil(t, s.Stop())
<mask> })
<mask>
</s> 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 <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </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> 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 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. It's not a pointer to the slice
// since there is no need to omit it while decoding from JSON.
DefautLocalPTRUpstreams []string `json:"default_local_ptr_upstreams,omitempty"`
}{
dnsConfig: s.getDNSConfig(),
DefautLocalPTRUpstreams: defLocalPTRUps,
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/http_test.go |
s.sysResolvers = &fakeSystemResolvers{} | <mask> ConfigModified: func() {},
<mask> }
<mask> s := createTestServer(t, filterConf, forwardConf, nil)
<mask>
<mask> defaultConf := s.conf
<mask>
<mask> err := s.Start()
</s> 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 <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </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> 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 enc := json.NewEncoder(w)
if err := enc.Encode(resp); err != nil {
</s> add if err = json.NewEncoder(w).Encode(resp); err != nil { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/http_test.go |
'allOf':
- '$ref': '#/components/schemas/DNSConfig'
- 'type': 'object'
'properties':
'default_local_ptr_upstreams':
'type': 'array'
'items':
'type': 'string'
'example':
- '192.168.168.192'
- '10.0.0.10' | <mask> 'description': 'OK'
<mask> 'content':
<mask> 'application/json':
<mask> 'schema':
<mask> '$ref': '#/components/schemas/DNSConfig'
<mask> '/dns_config':
<mask> 'post':
<mask> 'tags':
<mask> - 'global'
<mask> 'operationId': 'dnsConfig'
</s> 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 <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </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. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | openapi/openapi.yaml |
github.com/AdguardTeam/dnsproxy v0.33.1 | <mask>
<mask> go 1.14
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.33.0
<mask> github.com/AdguardTeam/golibs v0.4.2
<mask> github.com/AdguardTeam/urlfilter v0.12.3
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
<mask> github.com/fsnotify/fsnotify v1.4.9
</s> 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 <[email protected]>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy </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/dnsproxy v0.33.1/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= </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:kt3wY1Lu5MJAnKTfoMR52Cu4gwvna4VTzNOiT8tY73s=
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf/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 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39 | go.mod |
github.com/joomcode/errorx v1.0.3 // indirect | <mask> github.com/fsnotify/fsnotify v1.4.9
<mask> github.com/gobuffalo/packr v1.30.1
<mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
<mask> github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8
<mask> github.com/kardianos/service v1.1.0
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
<mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065
<mask> github.com/miekg/dns v1.1.35
<mask> github.com/rogpeppe/go-internal v1.5.2 // indirect
</s> 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 <[email protected]>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy </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:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf h1:kt3wY1Lu5MJAnKTfoMR52Cu4gwvna4VTzNOiT8tY73s=
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </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/dnsproxy v0.33.1/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= </s> remove golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
</s> add golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39 | go.mod |
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf | <mask> go.etcd.io/bbolt v1.3.4
<mask> golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
<mask> golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
<mask> golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
<mask> golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
<mask> golang.org/x/text v0.3.4 // indirect
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0
<mask> gopkg.in/yaml.v2 v2.3.0
<mask> gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
</s> 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 <[email protected]>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy </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:kt3wY1Lu5MJAnKTfoMR52Cu4gwvna4VTzNOiT8tY73s=
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </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/dnsproxy v0.33.1/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= </s> remove github.com/AdguardTeam/dnsproxy v0.33.0
</s> add github.com/AdguardTeam/dnsproxy v0.33.1 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39 | go.mod |
github.com/AdguardTeam/dnsproxy v0.33.1 h1:rEAS1fBEQ3JslzsfkcyMRV96OeBWFnKzXvksduI0ous=
github.com/AdguardTeam/dnsproxy v0.33.1/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= | <mask> dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
<mask> dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
<mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
<mask> git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
<mask> github.com/AdguardTeam/dnsproxy v0.33.0 h1:bYNf20QgvkclPm+w5YSakFQbrrlcD3MpUwkQPLMwhwU=
<mask> github.com/AdguardTeam/dnsproxy v0.33.0/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2 h1:7M28oTZFoFwNmp8eGPb3ImmYbxGaJLyQXeIFVHjME0o=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
<mask> github.com/AdguardTeam/urlfilter v0.12.3 h1:FMjQG0eTgrr8xA3z2zaLVcCgGdpzoECPGWwgPjtwPNs=
</s> 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 <[email protected]>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy </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:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf h1:kt3wY1Lu5MJAnKTfoMR52Cu4gwvna4VTzNOiT8tY73s=
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf/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 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39 | go.sum |
github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw=
github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo= | <mask> github.com/joomcode/errorx v1.0.1 h1:CalpDWz14ZHd68fIqluJasJosAewpz2TFaJALrUxjrk=
<mask> github.com/joomcode/errorx v1.0.1/go.mod h1:kgco15ekB6cs+4Xjzo7SPeXzx38PbJzBwbnu9qfVNHQ=
<mask> github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
<mask> github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
<mask> github.com/kardianos/service v1.1.0 h1:QV2SiEeWK42P0aEmGcsAgjApw/lRxkwopvT+Gu6t1/0=
<mask> github.com/kardianos/service v1.1.0/go.mod h1:RrJI2xn5vve/r32U5suTbeaSGoMU6GbNPoj36CVYcHc=
</s> 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 <[email protected]>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy </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:kt3wY1Lu5MJAnKTfoMR52Cu4gwvna4VTzNOiT8tY73s=
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </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/dnsproxy v0.33.1/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= </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
</s> add github.com/AdguardTeam/dnsproxy v0.33.1 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39 | go.sum |
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf h1:kt3wY1Lu5MJAnKTfoMR52Cu4gwvna4VTzNOiT8tY73s=
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | <mask> golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4=
<mask> golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck=
<mask> golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
</s> 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 <[email protected]>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy </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:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA=
</s> add github.com/AdguardTeam/dnsproxy v0.33.1 h1:rEAS1fBEQ3JslzsfkcyMRV96OeBWFnKzXvksduI0ous=
github.com/AdguardTeam/dnsproxy v0.33.1/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= </s> remove github.com/AdguardTeam/dnsproxy v0.33.0
</s> add github.com/AdguardTeam/dnsproxy v0.33.1 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39 | go.sum |
// 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, "getting path: %s", err)
return
}
err = Context.updater.Update() | <mask>
<mask> return
<mask> }
<mask>
<mask> err := Context.updater.Update()
<mask> if err != nil {
<mask> aghhttp.Error(r, w, http.StatusInternalServerError, "%s", err)
<mask>
<mask> return
<mask> }
</s> Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <[email protected]>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding </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())
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.Environ())
if err != nil {
log.Fatalf("restarting: %s", err) </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 cmd := exec.Command(curBinName, os.Args[1:]...)
log.Info("Restarting: %v", cmd.Args)
</s> add cmd := exec.Command(execPath, os.Args[1:]...)
log.Info("restarting: %q %q", execPath, os.Args[1:]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
// 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) | <mask> if f, ok := w.(http.Flusher); ok {
<mask> f.Flush()
<mask> }
<mask>
<mask> // The background context is used because the underlying functions wrap
<mask> // it with timeout and shut down the server, which handles current
<mask> // request. It also should be done in a separate goroutine due to the
<mask> // same reason.
<mask> go func() {
<mask> finishUpdate(context.Background())
<mask> }()
<mask> }
<mask>
<mask> // versionResponse is the response for /control/version.json endpoint.
<mask> type versionResponse struct {
<mask> updater.VersionInfo
</s> Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <[email protected]>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding </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 {
aghhttp.Error(r, w, http.StatusInternalServerError, "getting path: %s", err)
return
}
err = Context.updater.Update() </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 start a new
// instance, because Windows doesn't allow it.
//
// TODO(a.garipov): Recheck the claim above. </s> remove curBinName, err := os.Executable()
if err != nil {
log.Fatalf("executable path request failed: %s", err)
}
</s> add </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.Environ())
if err != nil {
log.Fatalf("restarting: %s", err) </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting: stopping: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
func finishUpdate(ctx context.Context, execPath string) {
var err error
log.Info("stopping all tasks")
| <mask> return c.Enabled && (c.PortHTTPS < 1024 || c.PortDNSOverTLS < 1024 || c.PortDNSOverQUIC < 1024)
<mask> }
<mask>
<mask> // finishUpdate completes an update procedure.
<mask> func finishUpdate(ctx context.Context) {
<mask> log.Info("Stopping all tasks")
<mask> cleanup(ctx)
<mask> cleanupAlways()
<mask>
<mask> curBinName, err := os.Executable()
<mask> if err != nil {
</s> Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <[email protected]>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding </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 backup directory.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/4735.
execPath, err := os.Executable()
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "getting path: %s", err)
return
}
err = Context.updater.Update() </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.Environ())
if err != nil {
log.Fatalf("restarting: %s", err) </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting: stopping: %s", err) </s> remove cmd := exec.Command(curBinName, os.Args[1:]...)
log.Info("Restarting: %v", cmd.Args)
</s> add cmd := exec.Command(execPath, os.Args[1:]...)
log.Info("restarting: %q %q", execPath, os.Args[1:]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
<mask> log.Info("Stopping all tasks")
<mask> cleanup(ctx)
<mask> cleanupAlways()
<mask>
<mask> curBinName, err := os.Executable()
<mask> if err != nil {
<mask> log.Fatalf("executable path request failed: %s", err)
<mask> }
<mask>
<mask> if runtime.GOOS == "windows" {
<mask> if Context.runningAsService {
<mask> // Note:
<mask> // we can't restart the service via "kardianos/service" package - it kills the process first
<mask> // we can't start a new instance - Windows doesn't allow it
</s> Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <[email protected]>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding </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 start a new
// instance, because Windows doesn't allow it.
//
// TODO(a.garipov): Recheck the claim above. </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting: stopping: %s", err) </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 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 {
aghhttp.Error(r, w, http.StatusInternalServerError, "getting path: %s", err)
return
}
err = Context.updater.Update() </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.Environ())
if err != nil {
log.Fatalf("restarting: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
|
// 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. | <mask> }
<mask>
<mask> if runtime.GOOS == "windows" {
<mask> if Context.runningAsService {
<mask> // Note:
<mask> // we can't restart the service via "kardianos/service" package - it kills the process first
<mask> // we can't start a new instance - Windows doesn't allow it
<mask> cmd := exec.Command("cmd", "/c", "net stop AdGuardHome & net start AdGuardHome")
<mask> err = cmd.Start()
<mask> if err != nil {
<mask> log.Fatalf("exec.Command() failed: %s", err)
<mask> }
</s> Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <[email protected]>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding </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 = 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.Environ())
if err != nil {
log.Fatalf("restarting: %s", err) </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 {
aghhttp.Error(r, w, http.StatusInternalServerError, "getting path: %s", err)
return
}
err = Context.updater.Update() </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting:: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
log.Fatalf("restarting: stopping: %s", err) | <mask> // we can't start a new instance - Windows doesn't allow it
<mask> cmd := exec.Command("cmd", "/c", "net stop AdGuardHome & net start AdGuardHome")
<mask> err = cmd.Start()
<mask> if err != nil {
<mask> log.Fatalf("exec.Command() failed: %s", err)
<mask> }
<mask> os.Exit(0)
<mask> }
<mask>
<mask> cmd := exec.Command(curBinName, os.Args[1:]...)
</s> Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <[email protected]>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding </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 start a new
// instance, because Windows doesn't allow it.
//
// TODO(a.garipov): Recheck the claim above. </s> remove curBinName, err := os.Executable()
if err != nil {
log.Fatalf("executable path request failed: %s", err)
}
</s> add </s> remove cmd := exec.Command(curBinName, os.Args[1:]...)
log.Info("Restarting: %v", cmd.Args)
</s> add cmd := exec.Command(execPath, os.Args[1:]...)
log.Info("restarting: %q %q", execPath, os.Args[1:]) </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.Environ())
if err != nil {
log.Fatalf("restarting: %s", err) </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting:: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
cmd := exec.Command(execPath, os.Args[1:]...)
log.Info("restarting: %q %q", execPath, os.Args[1:]) | <mask> }
<mask> os.Exit(0)
<mask> }
<mask>
<mask> cmd := exec.Command(curBinName, os.Args[1:]...)
<mask> log.Info("Restarting: %v", cmd.Args)
<mask> cmd.Stdin = os.Stdin
<mask> cmd.Stdout = os.Stdout
<mask> cmd.Stderr = os.Stderr
<mask> err = cmd.Start()
<mask> if err != nil {
</s> Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <[email protected]>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding </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, 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.Environ())
if err != nil {
log.Fatalf("restarting: %s", err) </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 {
aghhttp.Error(r, w, http.StatusInternalServerError, "getting path: %s", err)
return
}
err = Context.updater.Update() </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 start a new
// instance, because Windows doesn't allow it.
//
// TODO(a.garipov): Recheck the claim above. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
log.Fatalf("restarting:: %s", err) | <mask> cmd.Stdout = os.Stdout
<mask> cmd.Stderr = os.Stderr
<mask> err = cmd.Start()
<mask> if err != nil {
<mask> log.Fatalf("exec.Command() failed: %s", err)
<mask> }
<mask> os.Exit(0)
<mask> } else {
<mask> log.Info("Restarting: %v", os.Args)
<mask> err = syscall.Exec(curBinName, os.Args, os.Environ())
</s> Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <[email protected]>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding </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.Environ())
if err != nil {
log.Fatalf("restarting: %s", err) </s> remove cmd := exec.Command(curBinName, os.Args[1:]...)
log.Info("Restarting: %v", cmd.Args)
</s> add cmd := exec.Command(execPath, os.Args[1:]...)
log.Info("restarting: %q %q", execPath, os.Args[1:]) </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 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, "getting path: %s", err)
return
}
err = Context.updater.Update() </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 start a new
// instance, because Windows doesn't allow it.
//
// TODO(a.garipov): Recheck the claim above. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
}
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) | <mask> if err != nil {
<mask> log.Fatalf("exec.Command() failed: %s", err)
<mask> }
<mask> os.Exit(0)
<mask> } else {
<mask> log.Info("Restarting: %v", os.Args)
<mask> err = syscall.Exec(curBinName, os.Args, os.Environ())
<mask> if err != nil {
<mask> log.Fatalf("syscall.Exec() failed: %s", err)
<mask> }
<mask> // Unreachable code
<mask> }
<mask> }
</s> Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <[email protected]>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding </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 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, "getting path: %s", err)
return
}
err = Context.updater.Update() </s> remove cmd := exec.Command(curBinName, os.Args[1:]...)
log.Info("Restarting: %v", cmd.Args)
</s> add cmd := exec.Command(execPath, os.Args[1:]...)
log.Info("restarting: %q %q", execPath, os.Args[1:]) </s> remove curBinName, err := os.Executable()
if err != nil {
log.Fatalf("executable path request failed: %s", err)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
func getReversedSlice(input [statsHistoryElements]float64, start int, end int) []float64 { | <mask>
<mask> // --------------------------
<mask> // helper functions for stats
<mask> // --------------------------
<mask> func getSlice(input [statsHistoryElements]float64, start int, end int) []float64 {
<mask> output := make([]float64, 0)
<mask> for i := start; i <= end; i++ {
<mask> output = append(output, input[i])
<mask> }
<mask> return output
</s> Fix invalid element order for historical stats -- in API declaration values are from oldest to newest, not other way around. </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], start, end)
sum := getReversedSlice(stats.entries[processingTimeSum], start, end) </s> remove "dns_queries": getSlice(stats.entries[totalRequests], start, end),
"blocked_filtering": getSlice(stats.entries[filteredLists], start, end),
"replaced_safebrowsing": getSlice(stats.entries[filteredSafebrowsing], start, end),
"replaced_safesearch": getSlice(stats.entries[filteredSafesearch], start, end),
"replaced_parental": getSlice(stats.entries[filteredParental], start, end),
</s> add "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.entries[filteredSafesearch], start, end),
"replaced_parental": getReversedSlice(stats.entries[filteredParental], start, end), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1f0fdef8d6b2ce324e7009bb3f95626d87438d61 | helpers.go |
output = append([]float64{input[i]}, output...) | <mask> // --------------------------
<mask> func getSlice(input [statsHistoryElements]float64, start int, end int) []float64 {
<mask> output := make([]float64, 0)
<mask> for i := start; i <= end; i++ {
<mask> output = append(output, input[i])
<mask> }
<mask> return output
<mask> }
<mask>
<mask> func generateMapFromStats(stats *periodicStats, start int, end int) map[string]interface{} {
</s> Fix invalid element order for historical stats -- in API declaration values are from oldest to newest, not other way around. </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[processingTimeSum], start, end)
</s> add count := getReversedSlice(stats.entries[processingTimeCount], start, end)
sum := getReversedSlice(stats.entries[processingTimeSum], start, end) </s> remove "dns_queries": getSlice(stats.entries[totalRequests], start, end),
"blocked_filtering": getSlice(stats.entries[filteredLists], start, end),
"replaced_safebrowsing": getSlice(stats.entries[filteredSafebrowsing], start, end),
"replaced_safesearch": getSlice(stats.entries[filteredSafesearch], start, end),
"replaced_parental": getSlice(stats.entries[filteredParental], start, end),
</s> add "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.entries[filteredSafesearch], start, end),
"replaced_parental": getReversedSlice(stats.entries[filteredParental], start, end), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1f0fdef8d6b2ce324e7009bb3f95626d87438d61 | helpers.go |
count := getReversedSlice(stats.entries[processingTimeCount], start, end)
sum := getReversedSlice(stats.entries[processingTimeSum], start, end) | <mask> end = clamp(end, 0, statsHistoryElements)
<mask>
<mask> avgProcessingTime := make([]float64, 0)
<mask>
<mask> count := getSlice(stats.entries[processingTimeCount], start, end)
<mask> sum := getSlice(stats.entries[processingTimeSum], start, end)
<mask> for i := 0; i < len(count); i++ {
<mask> var avg float64
<mask> if count[i] != 0 {
<mask> avg = sum[i] / count[i]
<mask> avg *= 1000
</s> Fix invalid element order for historical stats -- in API declaration values are from oldest to newest, not other way around. </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 "dns_queries": getSlice(stats.entries[totalRequests], start, end),
"blocked_filtering": getSlice(stats.entries[filteredLists], start, end),
"replaced_safebrowsing": getSlice(stats.entries[filteredSafebrowsing], start, end),
"replaced_safesearch": getSlice(stats.entries[filteredSafesearch], start, end),
"replaced_parental": getSlice(stats.entries[filteredParental], start, end),
</s> add "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.entries[filteredSafesearch], start, end),
"replaced_parental": getReversedSlice(stats.entries[filteredParental], start, end), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1f0fdef8d6b2ce324e7009bb3f95626d87438d61 | helpers.go |
"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.entries[filteredSafesearch], start, end),
"replaced_parental": getReversedSlice(stats.entries[filteredParental], start, end), | <mask> avgProcessingTime = append(avgProcessingTime, avg)
<mask> }
<mask>
<mask> result := map[string]interface{}{
<mask> "dns_queries": getSlice(stats.entries[totalRequests], start, end),
<mask> "blocked_filtering": getSlice(stats.entries[filteredLists], start, end),
<mask> "replaced_safebrowsing": getSlice(stats.entries[filteredSafebrowsing], start, end),
<mask> "replaced_safesearch": getSlice(stats.entries[filteredSafesearch], start, end),
<mask> "replaced_parental": getSlice(stats.entries[filteredParental], start, end),
<mask> "avg_processing_time": avgProcessingTime,
<mask> }
<mask> return result
<mask> }
<mask>
</s> Fix invalid element order for historical stats -- in API declaration values are from oldest to newest, not other way around. </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 count := getSlice(stats.entries[processingTimeCount], start, end)
sum := getSlice(stats.entries[processingTimeSum], start, end)
</s> add count := getReversedSlice(stats.entries[processingTimeCount], start, end)
sum := getReversedSlice(stats.entries[processingTimeSum], start, end) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1f0fdef8d6b2ce324e7009bb3f95626d87438d61 | helpers.go |
if (payload && versionCompare(currentVersion, payload.new_version) === -1) { | <mask> [actions.getVersionFailure]: state => ({ ...state, processingVersion: false }),
<mask> [actions.getVersionSuccess]: (state, { payload }) => {
<mask> const currentVersion = state.dnsVersion === 'undefined' ? 0 : state.dnsVersion;
<mask>
<mask> if (payload && versionCompare(currentVersion, payload.version) === -1) {
<mask> const {
<mask> version,
<mask> announcement_url: announcementUrl,
<mask> new_version: newVersion,
<mask> can_autoupdate: canAutoUpdate,
</s> - client: fix versions check </s> remove version,
</s> add </s> remove version,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1f164c70059a8f2f8d6e33b805243dbcd6ce4702 | client/src/reducers/index.js |
<mask> const currentVersion = state.dnsVersion === 'undefined' ? 0 : state.dnsVersion;
<mask>
<mask> if (payload && versionCompare(currentVersion, payload.version) === -1) {
<mask> const {
<mask> version,
<mask> announcement_url: announcementUrl,
<mask> new_version: newVersion,
<mask> can_autoupdate: canAutoUpdate,
<mask> } = payload;
<mask>
</s> - client: fix versions check </s> remove version,
</s> add </s> remove if (payload && versionCompare(currentVersion, payload.version) === -1) {
</s> add if (payload && versionCompare(currentVersion, payload.new_version) === -1) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1f164c70059a8f2f8d6e33b805243dbcd6ce4702 | client/src/reducers/index.js |
|
<mask> } = payload;
<mask>
<mask> const newState = {
<mask> ...state,
<mask> version,
<mask> announcementUrl,
<mask> newVersion,
<mask> canAutoUpdate,
<mask> isUpdateAvailable: true,
<mask> };
</s> - client: fix versions check </s> remove if (payload && versionCompare(currentVersion, payload.version) === -1) {
</s> add if (payload && versionCompare(currentVersion, payload.new_version) === -1) { </s> remove version,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1f164c70059a8f2f8d6e33b805243dbcd6ce4702 | client/src/reducers/index.js |
|
if (runtime.GOOS == "linux" || runtime.GOOS == "darwin") &&
config.RlimitNoFile != 0 {
setRlimit(config.RlimitNoFile)
}
| <mask> log.Fatal(err)
<mask> }
<mask>
<mask> // override bind host/port from the console
<mask> if args.bindHost != "" {
<mask> config.BindHost = args.bindHost
<mask> }
<mask> if args.bindPort != 0 {
</s> + config: add "rlimit_nofile" setting - Maximum number of opened fd's per process </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 `yaml:"auth_pass"` // AuthPass is the basic auth password
Language string `yaml:"language"` // two-letter ISO 639-1 language code
</s> add 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"` // AuthPass is the basic auth password
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
| [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1f1e26f67b00ee4983c65e4e3aabf59a488f687b | app.go |
// 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: %v", err)
}
}
| <mask> }
<mask> }
<mask>
<mask> func cleanup() {
<mask> log.Info("Stopping AdGuard Home")
<mask>
<mask> err := stopDNSServer()
<mask> if err != nil {
<mask> log.Error("Couldn't stop DNS server: %s", err)
</s> + config: add "rlimit_nofile" setting - Maximum number of opened fd's per process </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 `yaml:"auth_pass"` // AuthPass is the basic auth password
Language string `yaml:"language"` // two-letter ISO 639-1 language code
</s> add 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"` // AuthPass is the basic auth password
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
| [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1f1e26f67b00ee4983c65e4e3aabf59a488f687b | app.go |
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"` // AuthPass is the basic auth password
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
| <mask> ourConfigFilename string // Config filename (can be overridden via the command line arguments)
<mask> ourWorkingDir string // Location of our directory, used to protect against CWD being somewhere else
<mask> firstRun bool // if set to true, don't run any services except HTTP web inteface, and serve only first-run html
<mask>
<mask> BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
<mask> BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
<mask> AuthName string `yaml:"auth_name"` // AuthName is the basic auth username
<mask> AuthPass string `yaml:"auth_pass"` // AuthPass is the basic auth password
<mask> Language string `yaml:"language"` // two-letter ISO 639-1 language code
<mask> DNS dnsConfig `yaml:"dns"`
<mask> TLS tlsConfig `yaml:"tls"`
<mask> Filters []filter `yaml:"filters"`
<mask> UserRules []string `yaml:"user_rules"`
<mask> DHCP dhcpd.ServerConfig `yaml:"dhcp"`
</s> + config: add "rlimit_nofile" setting - Maximum number of opened fd's per process | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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.