docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
// bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice | <mask> if len(newconfig.Upstreams) > 0 {
<mask> config.DNS.UpstreamDNS = newconfig.Upstreams
<mask> }
<mask>
<mask> // bootstrap servers are plain DNS only. We should remove tls:// https:// and sdns:// hosts from slice
<mask> bootstraps := []string{}
<mask> for _, host := range newconfig.BootstrapDNS {
<mask> err := checkBootstrapDNS(host)
<mask> if err != nil {
<mask> log.Tracef("%s can not be used as bootstrap DNS cause: %s", host, err)
<mask> continue
</s> [change] config, control, openapi: fix issues from reviw </s> remove log.Tracef("%s can not be used as bootstrap DNS cause: %s", host, err)
continue
</s> add httpError(w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", host, err)
return </s> remove bootstraps = append(bootstraps, host)
</s> add </s> remove for _, host := range hosts {
err = checkDNS(host)
</s> add for _, host := range upstreamConfig.Upstreams {
err = checkDNS(host, upstreamConfig.BootstrapDNS) </s> remove if len(bootstraps) > 0 {
config.DNS.BootstrapDNS = bootstraps
</s> add if len(newconfig.BootstrapDNS) > 0 {
config.DNS.BootstrapDNS = newconfig.BootstrapDNS </s> remove func checkDNS(input string) error {
</s> add func checkDNS(input string, bootstrap []string) error {
if len(bootstrap) == 0 {
bootstrap = defaultBootstrap
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f2e547a54e50162caa25b562e49e2846dd92b575 | control.go |
httpError(w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", host, err)
return | <mask> bootstraps := []string{}
<mask> for _, host := range newconfig.BootstrapDNS {
<mask> err := checkBootstrapDNS(host)
<mask> if err != nil {
<mask> log.Tracef("%s can not be used as bootstrap DNS cause: %s", host, err)
<mask> continue
<mask> }
<mask> bootstraps = append(bootstraps, host)
<mask> }
<mask>
<mask> config.DNS.BootstrapDNS = defaultBootstrap
</s> [change] config, control, openapi: fix issues from reviw </s> remove bootstraps = append(bootstraps, host)
</s> add </s> remove // bootstrap servers are plain DNS only. We should remove tls:// https:// and sdns:// hosts from slice
bootstraps := []string{}
</s> add // bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice </s> remove if len(bootstraps) > 0 {
config.DNS.BootstrapDNS = bootstraps
</s> add if len(newconfig.BootstrapDNS) > 0 {
config.DNS.BootstrapDNS = newconfig.BootstrapDNS </s> remove for _, host := range hosts {
err = checkDNS(host)
</s> add for _, host := range upstreamConfig.Upstreams {
err = checkDNS(host, upstreamConfig.BootstrapDNS) </s> remove func checkDNS(input string) error {
</s> add func checkDNS(input string, bootstrap []string) error {
if len(bootstrap) == 0 {
bootstrap = defaultBootstrap
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f2e547a54e50162caa25b562e49e2846dd92b575 | control.go |
<mask> if err != nil {
<mask> log.Tracef("%s can not be used as bootstrap DNS cause: %s", host, err)
<mask> continue
<mask> }
<mask> bootstraps = append(bootstraps, host)
<mask> }
<mask>
<mask> config.DNS.BootstrapDNS = defaultBootstrap
<mask> if len(bootstraps) > 0 {
<mask> config.DNS.BootstrapDNS = bootstraps
</s> [change] config, control, openapi: fix issues from reviw </s> remove log.Tracef("%s can not be used as bootstrap DNS cause: %s", host, err)
continue
</s> add httpError(w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", host, err)
return </s> remove if len(bootstraps) > 0 {
config.DNS.BootstrapDNS = bootstraps
</s> add if len(newconfig.BootstrapDNS) > 0 {
config.DNS.BootstrapDNS = newconfig.BootstrapDNS </s> remove // bootstrap servers are plain DNS only. We should remove tls:// https:// and sdns:// hosts from slice
bootstraps := []string{}
</s> add // bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice </s> remove func checkDNS(input string) error {
</s> add func checkDNS(input string, bootstrap []string) error {
if len(bootstrap) == 0 {
bootstrap = defaultBootstrap
}
</s> remove if len(hosts) == 0 {
</s> add if len(upstreamConfig.Upstreams) == 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f2e547a54e50162caa25b562e49e2846dd92b575 | control.go | |
if len(newconfig.BootstrapDNS) > 0 {
config.DNS.BootstrapDNS = newconfig.BootstrapDNS | <mask> bootstraps = append(bootstraps, host)
<mask> }
<mask>
<mask> config.DNS.BootstrapDNS = defaultBootstrap
<mask> if len(bootstraps) > 0 {
<mask> config.DNS.BootstrapDNS = bootstraps
<mask> }
<mask>
<mask> config.DNS.AllServers = newconfig.AllServers
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
</s> [change] config, control, openapi: fix issues from reviw </s> remove bootstraps = append(bootstraps, host)
</s> add </s> remove log.Tracef("%s can not be used as bootstrap DNS cause: %s", host, err)
continue
</s> add httpError(w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", host, err)
return </s> remove // bootstrap servers are plain DNS only. We should remove tls:// https:// and sdns:// hosts from slice
bootstraps := []string{}
</s> add // bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice </s> remove func checkDNS(input string) error {
</s> add func checkDNS(input string, bootstrap []string) error {
if len(bootstrap) == 0 {
bootstrap = defaultBootstrap
}
</s> remove if len(hosts) == 0 {
</s> add if len(upstreamConfig.Upstreams) == 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f2e547a54e50162caa25b562e49e2846dd92b575 | control.go |
upstreamConfig := upstreamConfig{}
err := json.NewDecoder(r.Body).Decode(&upstreamConfig) | <mask> }
<mask>
<mask> func handleTestUpstreamDNS(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
<mask> hosts := []string{}
<mask> err := json.NewDecoder(r.Body).Decode(&hosts)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Failed to read request body: %s", err)
<mask> return
<mask> }
<mask>
</s> [change] config, control, openapi: fix issues from reviw </s> remove if len(hosts) == 0 {
</s> add if len(upstreamConfig.Upstreams) == 0 { </s> remove func checkDNS(input string) error {
</s> add func checkDNS(input string, bootstrap []string) error {
if len(bootstrap) == 0 {
bootstrap = defaultBootstrap
}
</s> remove log.Tracef("%s can not be used as bootstrap DNS cause: %s", host, err)
continue
</s> add httpError(w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", host, err)
return </s> remove // bootstrap servers are plain DNS only. We should remove tls:// https:// and sdns:// hosts from slice
bootstraps := []string{}
</s> add // bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice </s> remove for _, host := range hosts {
err = checkDNS(host)
</s> add for _, host := range upstreamConfig.Upstreams {
err = checkDNS(host, upstreamConfig.BootstrapDNS) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f2e547a54e50162caa25b562e49e2846dd92b575 | control.go |
if len(upstreamConfig.Upstreams) == 0 { | <mask> httpError(w, http.StatusBadRequest, "Failed to read request body: %s", err)
<mask> return
<mask> }
<mask>
<mask> if len(hosts) == 0 {
<mask> httpError(w, http.StatusBadRequest, "No servers specified")
<mask> return
<mask> }
<mask>
<mask> result := map[string]string{}
</s> [change] config, control, openapi: fix issues from reviw </s> remove hosts := []string{}
err := json.NewDecoder(r.Body).Decode(&hosts)
</s> add upstreamConfig := upstreamConfig{}
err := json.NewDecoder(r.Body).Decode(&upstreamConfig) </s> remove func checkDNS(input string) error {
</s> add func checkDNS(input string, bootstrap []string) error {
if len(bootstrap) == 0 {
bootstrap = defaultBootstrap
}
</s> remove log.Tracef("%s can not be used as bootstrap DNS cause: %s", host, err)
continue
</s> add httpError(w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", host, err)
return </s> remove for _, host := range hosts {
err = checkDNS(host)
</s> add for _, host := range upstreamConfig.Upstreams {
err = checkDNS(host, upstreamConfig.BootstrapDNS) </s> remove if len(bootstraps) > 0 {
config.DNS.BootstrapDNS = bootstraps
</s> add if len(newconfig.BootstrapDNS) > 0 {
config.DNS.BootstrapDNS = newconfig.BootstrapDNS | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f2e547a54e50162caa25b562e49e2846dd92b575 | control.go |
for _, host := range upstreamConfig.Upstreams {
err = checkDNS(host, upstreamConfig.BootstrapDNS) | <mask> }
<mask>
<mask> result := map[string]string{}
<mask>
<mask> for _, host := range hosts {
<mask> err = checkDNS(host)
<mask> if err != nil {
<mask> log.Info("%v", err)
<mask> result[host] = err.Error()
<mask> } else {
<mask> result[host] = "OK"
</s> [change] config, control, openapi: fix issues from reviw </s> remove if len(hosts) == 0 {
</s> add if len(upstreamConfig.Upstreams) == 0 { </s> remove // bootstrap servers are plain DNS only. We should remove tls:// https:// and sdns:// hosts from slice
bootstraps := []string{}
</s> add // bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice </s> remove log.Tracef("%s can not be used as bootstrap DNS cause: %s", host, err)
continue
</s> add httpError(w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", host, err)
return </s> remove func checkDNS(input string) error {
</s> add func checkDNS(input string, bootstrap []string) error {
if len(bootstrap) == 0 {
bootstrap = defaultBootstrap
}
</s> remove hosts := []string{}
err := json.NewDecoder(r.Body).Decode(&hosts)
</s> add upstreamConfig := upstreamConfig{}
err := json.NewDecoder(r.Body).Decode(&upstreamConfig) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f2e547a54e50162caa25b562e49e2846dd92b575 | control.go |
func checkDNS(input string, bootstrap []string) error {
if len(bootstrap) == 0 {
bootstrap = defaultBootstrap
}
| <mask> httpError(w, http.StatusInternalServerError, "Couldn't write body: %s", err)
<mask> }
<mask> }
<mask>
<mask> func checkDNS(input string) error {
<mask> log.Debug("Checking if DNS %s works...", input)
<mask> u, err := upstream.AddressToUpstream(input, upstream.Options{Timeout: dnsforward.DefaultTimeout})
<mask> if err != nil {
<mask> return fmt.Errorf("failed to choose upstream for %s: %s", input, err)
<mask> }
</s> [change] config, control, openapi: fix issues from reviw </s> remove u, err := upstream.AddressToUpstream(input, upstream.Options{Timeout: dnsforward.DefaultTimeout})
</s> add u, err := upstream.AddressToUpstream(input, upstream.Options{Bootstrap: bootstrap, Timeout: dnsforward.DefaultTimeout}) </s> remove if len(hosts) == 0 {
</s> add if len(upstreamConfig.Upstreams) == 0 { </s> remove hosts := []string{}
err := json.NewDecoder(r.Body).Decode(&hosts)
</s> add upstreamConfig := upstreamConfig{}
err := json.NewDecoder(r.Body).Decode(&upstreamConfig) </s> remove log.Tracef("%s can not be used as bootstrap DNS cause: %s", host, err)
continue
</s> add httpError(w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", host, err)
return </s> remove // bootstrap servers are plain DNS only. We should remove tls:// https:// and sdns:// hosts from slice
bootstraps := []string{}
</s> add // bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f2e547a54e50162caa25b562e49e2846dd92b575 | control.go |
u, err := upstream.AddressToUpstream(input, upstream.Options{Bootstrap: bootstrap, Timeout: dnsforward.DefaultTimeout}) | <mask> }
<mask>
<mask> func checkDNS(input string) error {
<mask> log.Debug("Checking if DNS %s works...", input)
<mask> u, err := upstream.AddressToUpstream(input, upstream.Options{Timeout: dnsforward.DefaultTimeout})
<mask> if err != nil {
<mask> return fmt.Errorf("failed to choose upstream for %s: %s", input, err)
<mask> }
<mask>
<mask> req := dns.Msg{}
</s> [change] config, control, openapi: fix issues from reviw </s> remove func checkDNS(input string) error {
</s> add func checkDNS(input string, bootstrap []string) error {
if len(bootstrap) == 0 {
bootstrap = defaultBootstrap
}
</s> remove // bootstrap servers are plain DNS only. We should remove tls:// https:// and sdns:// hosts from slice
bootstraps := []string{}
</s> add // bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice </s> remove hosts := []string{}
err := json.NewDecoder(r.Body).Decode(&hosts)
</s> add upstreamConfig := upstreamConfig{}
err := json.NewDecoder(r.Body).Decode(&upstreamConfig) </s> remove bootstraps = append(bootstraps, host)
</s> add </s> remove if len(hosts) == 0 {
</s> add if len(upstreamConfig.Upstreams) == 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f2e547a54e50162caa25b562e49e2846dd92b575 | control.go |
summary: "Test upstream configuration" | <mask> post:
<mask> tags:
<mask> - global
<mask> operationId: testUpstreamDNS
<mask> summary: "Test upstream DNS"
<mask> consumes:
<mask> - application/json
<mask> parameters:
<mask> - in: "body"
<mask> name: "body"
</s> [change] config, control, openapi: fix issues from reviw </s> remove description: "Upstream servers to be tested"
</s> add description: "Upstream configuration to be tested" </s> remove $ref: "#/definitions/TestUpstreams"
</s> add $ref: "#/definitions/UpstreamsConfig" </s> remove TestUpstreams:
type: "object"
description: "Upstream servers to be tested"
required:
- "upstream_dns"
properties:
upstream_dns:
type: "array"
description: 'Upstream servers, port is optional after colon'
items:
type: "string"
example:
- "tls://1.1.1.1"
- "tls://1.0.0.1"
</s> add </s> remove u, err := upstream.AddressToUpstream(input, upstream.Options{Timeout: dnsforward.DefaultTimeout})
</s> add u, err := upstream.AddressToUpstream(input, upstream.Options{Bootstrap: bootstrap, Timeout: dnsforward.DefaultTimeout}) </s> remove func checkDNS(input string) error {
</s> add func checkDNS(input string, bootstrap []string) error {
if len(bootstrap) == 0 {
bootstrap = defaultBootstrap
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f2e547a54e50162caa25b562e49e2846dd92b575 | openapi/openapi.yaml |
description: "Upstream configuration to be tested" | <mask> - application/json
<mask> parameters:
<mask> - in: "body"
<mask> name: "body"
<mask> description: "Upstream servers to be tested"
<mask> schema:
<mask> $ref: "#/definitions/TestUpstreams"
<mask> responses:
<mask> 200:
<mask> description: 'Status of testing each requested server, with "OK" meaning that server works, any other text means an error.'
</s> [change] config, control, openapi: fix issues from reviw </s> remove $ref: "#/definitions/TestUpstreams"
</s> add $ref: "#/definitions/UpstreamsConfig" </s> remove summary: "Test upstream DNS"
</s> add summary: "Test upstream configuration" </s> remove TestUpstreams:
type: "object"
description: "Upstream servers to be tested"
required:
- "upstream_dns"
properties:
upstream_dns:
type: "array"
description: 'Upstream servers, port is optional after colon'
items:
type: "string"
example:
- "tls://1.1.1.1"
- "tls://1.0.0.1"
</s> add </s> remove var defaultDNS = []string{"tls://1.1.1.1", "tls://1.0.0.1"}
</s> add var defaultDNS = []string{"https://dns.adguard.com/dns-query", "https://dns.cloudflare.com/dns-query"} </s> remove for _, host := range hosts {
err = checkDNS(host)
</s> add for _, host := range upstreamConfig.Upstreams {
err = checkDNS(host, upstreamConfig.BootstrapDNS) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f2e547a54e50162caa25b562e49e2846dd92b575 | openapi/openapi.yaml |
$ref: "#/definitions/UpstreamsConfig" | <mask> - in: "body"
<mask> name: "body"
<mask> description: "Upstream servers to be tested"
<mask> schema:
<mask> $ref: "#/definitions/TestUpstreams"
<mask> responses:
<mask> 200:
<mask> description: 'Status of testing each requested server, with "OK" meaning that server works, any other text means an error.'
<mask> examples:
<mask> application/json:
</s> [change] config, control, openapi: fix issues from reviw </s> remove description: "Upstream servers to be tested"
</s> add description: "Upstream configuration to be tested" </s> remove summary: "Test upstream DNS"
</s> add summary: "Test upstream configuration" </s> remove TestUpstreams:
type: "object"
description: "Upstream servers to be tested"
required:
- "upstream_dns"
properties:
upstream_dns:
type: "array"
description: 'Upstream servers, port is optional after colon'
items:
type: "string"
example:
- "tls://1.1.1.1"
- "tls://1.0.0.1"
</s> add </s> remove var defaultDNS = []string{"tls://1.1.1.1", "tls://1.0.0.1"}
</s> add var defaultDNS = []string{"https://dns.adguard.com/dns-query", "https://dns.cloudflare.com/dns-query"} </s> remove for _, host := range hosts {
err = checkDNS(host)
</s> add for _, host := range upstreamConfig.Upstreams {
err = checkDNS(host, upstreamConfig.BootstrapDNS) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f2e547a54e50162caa25b562e49e2846dd92b575 | openapi/openapi.yaml |
<mask> - "tls://1.0.0.1"
<mask> all_servers:
<mask> type: "boolean"
<mask> description: "If true, parallel queries to all configured upstream servers are enabled"
<mask> TestUpstreams:
<mask> type: "object"
<mask> description: "Upstream servers to be tested"
<mask> required:
<mask> - "upstream_dns"
<mask> properties:
<mask> upstream_dns:
<mask> type: "array"
<mask> description: 'Upstream servers, port is optional after colon'
<mask> items:
<mask> type: "string"
<mask> example:
<mask> - "tls://1.1.1.1"
<mask> - "tls://1.0.0.1"
<mask> Filter:
<mask> type: "object"
<mask> description: "Filter subscription info"
<mask> required:
<mask> - "enabled"
</s> [change] config, control, openapi: fix issues from reviw </s> remove description: "Upstream servers to be tested"
</s> add description: "Upstream configuration to be tested" </s> remove $ref: "#/definitions/TestUpstreams"
</s> add $ref: "#/definitions/UpstreamsConfig" </s> remove summary: "Test upstream DNS"
</s> add summary: "Test upstream configuration" </s> remove // bootstrap servers are plain DNS only. We should remove tls:// https:// and sdns:// hosts from slice
bootstraps := []string{}
</s> add // bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice </s> remove var defaultDNS = []string{"tls://1.1.1.1", "tls://1.0.0.1"}
</s> add var defaultDNS = []string{"https://dns.adguard.com/dns-query", "https://dns.cloudflare.com/dns-query"} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f2e547a54e50162caa25b562e49e2846dd92b575 | openapi/openapi.yaml | |
if errors.Is(err, os.ErrDeadlineExceeded) { | <mask>
<mask> b := make([]byte, 1500)
<mask> n, _, err := c.ReadFrom(b)
<mask> if err != nil {
<mask> if isTimeout(err) {
<mask> log.Debug("dhcpv4: didn't receive dhcp response")
<mask>
<mask> return false, false, nil
<mask> }
<mask>
</s> Pull request: aghnet: fix catching timeout errors
Merge in DNS/adguard-home from fix-is-timeout to master
Squashed commit of the following:
commit b0fefd01f27a835a34e44beb2eb2c34027960a51
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 29 15:57:06 2022 +0300
aghnet: fix catching timeout errors </s> remove if isTimeout(err) {
</s> add if errors.Is(err, os.ErrDeadlineExceeded) { </s> remove
// isTimeout returns true if err is an operation timeout error from net package.
//
// TODO(e.burkov): Consider moving into netutil.
func isTimeout(err error) (ok bool) {
var operr *net.OpError
if errors.As(err, &operr) {
return operr.Timeout()
}
return false
}
</s> add </s> remove return true, false, nil
</s> add return true, false, nil
} </s> remove if !(response.OpCode == dhcpv4.OpcodeBootReply &&
response.HWType == iana.HWTypeEthernet &&
bytes.Equal(response.ClientHWAddr, iface.HardwareAddr) &&
bytes.Equal(response.TransactionID[:], req.TransactionID[:]) &&
response.Options.Has(dhcpv4.OptionDHCPMessageType)) {
log.Debug("dhcpv4: received message from server doesn't match our request")
</s> add switch {
case
response.OpCode != dhcpv4.OpcodeBootReply,
response.HWType != iana.HWTypeEthernet,
!bytes.Equal(response.ClientHWAddr, iface.HardwareAddr),
response.TransactionID != req.TransactionID,
!response.Options.Has(dhcpv4.OptionDHCPMessageType):
log.Debug("dhcpv4: received response doesn't match the request") </s> remove }
log.Tracef("dhcpv4: the packet is from an active dhcp server")
</s> add default:
log.Tracef("dhcpv4: the packet is from an active dhcp server") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f31ffcc5d1bb1789c6b2e59c0ca5c33dc515cb8e | internal/aghnet/dhcp_unix.go |
switch {
case
response.OpCode != dhcpv4.OpcodeBootReply,
response.HWType != iana.HWTypeEthernet,
!bytes.Equal(response.ClientHWAddr, iface.HardwareAddr),
response.TransactionID != req.TransactionID,
!response.Options.Has(dhcpv4.OptionDHCPMessageType):
log.Debug("dhcpv4: received response doesn't match the request") | <mask> }
<mask>
<mask> log.Debug("dhcpv4: received message from server: %s", response.Summary())
<mask>
<mask> if !(response.OpCode == dhcpv4.OpcodeBootReply &&
<mask> response.HWType == iana.HWTypeEthernet &&
<mask> bytes.Equal(response.ClientHWAddr, iface.HardwareAddr) &&
<mask> bytes.Equal(response.TransactionID[:], req.TransactionID[:]) &&
<mask> response.Options.Has(dhcpv4.OptionDHCPMessageType)) {
<mask>
<mask> log.Debug("dhcpv4: received message from server doesn't match our request")
<mask>
<mask> return false, true, nil
<mask> }
<mask>
<mask> log.Tracef("dhcpv4: the packet is from an active dhcp server")
</s> Pull request: aghnet: fix catching timeout errors
Merge in DNS/adguard-home from fix-is-timeout to master
Squashed commit of the following:
commit b0fefd01f27a835a34e44beb2eb2c34027960a51
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 29 15:57:06 2022 +0300
aghnet: fix catching timeout errors </s> remove }
log.Tracef("dhcpv4: the packet is from an active dhcp server")
</s> add default:
log.Tracef("dhcpv4: the packet is from an active dhcp server") </s> remove
// isTimeout returns true if err is an operation timeout error from net package.
//
// TODO(e.burkov): Consider moving into netutil.
func isTimeout(err error) (ok bool) {
var operr *net.OpError
if errors.As(err, &operr) {
return operr.Timeout()
}
return false
}
</s> add </s> remove return true, false, nil
</s> add return true, false, nil
} </s> remove if isTimeout(err) {
</s> add if errors.Is(err, os.ErrDeadlineExceeded) { </s> remove if isTimeout(err) {
</s> add if errors.Is(err, os.ErrDeadlineExceeded) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f31ffcc5d1bb1789c6b2e59c0ca5c33dc515cb8e | internal/aghnet/dhcp_unix.go |
default:
log.Tracef("dhcpv4: the packet is from an active dhcp server") | <mask>
<mask> log.Debug("dhcpv4: received message from server doesn't match our request")
<mask>
<mask> return false, true, nil
<mask> }
<mask>
<mask> log.Tracef("dhcpv4: the packet is from an active dhcp server")
<mask>
<mask> return true, false, nil
<mask> }
<mask>
<mask> // checkOtherDHCPv6 sends a DHCP request to the specified network interface, and
</s> Pull request: aghnet: fix catching timeout errors
Merge in DNS/adguard-home from fix-is-timeout to master
Squashed commit of the following:
commit b0fefd01f27a835a34e44beb2eb2c34027960a51
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 29 15:57:06 2022 +0300
aghnet: fix catching timeout errors </s> remove return true, false, nil
</s> add return true, false, nil
} </s> remove if !(response.OpCode == dhcpv4.OpcodeBootReply &&
response.HWType == iana.HWTypeEthernet &&
bytes.Equal(response.ClientHWAddr, iface.HardwareAddr) &&
bytes.Equal(response.TransactionID[:], req.TransactionID[:]) &&
response.Options.Has(dhcpv4.OptionDHCPMessageType)) {
log.Debug("dhcpv4: received message from server doesn't match our request")
</s> add switch {
case
response.OpCode != dhcpv4.OpcodeBootReply,
response.HWType != iana.HWTypeEthernet,
!bytes.Equal(response.ClientHWAddr, iface.HardwareAddr),
response.TransactionID != req.TransactionID,
!response.Options.Has(dhcpv4.OptionDHCPMessageType):
log.Debug("dhcpv4: received response doesn't match the request") </s> remove
// isTimeout returns true if err is an operation timeout error from net package.
//
// TODO(e.burkov): Consider moving into netutil.
func isTimeout(err error) (ok bool) {
var operr *net.OpError
if errors.As(err, &operr) {
return operr.Timeout()
}
return false
}
</s> add </s> remove if isTimeout(err) {
</s> add if errors.Is(err, os.ErrDeadlineExceeded) { </s> remove if isTimeout(err) {
</s> add if errors.Is(err, os.ErrDeadlineExceeded) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f31ffcc5d1bb1789c6b2e59c0ca5c33dc515cb8e | internal/aghnet/dhcp_unix.go |
return true, false, nil
} | <mask> }
<mask>
<mask> log.Tracef("dhcpv4: the packet is from an active dhcp server")
<mask>
<mask> return true, false, nil
<mask> }
<mask>
<mask> // checkOtherDHCPv6 sends a DHCP request to the specified network interface, and
<mask> // waits for a response for a period defined by defaultDiscoverTime.
<mask> func checkOtherDHCPv6(iface *net.Interface) (ok bool, err error) {
</s> Pull request: aghnet: fix catching timeout errors
Merge in DNS/adguard-home from fix-is-timeout to master
Squashed commit of the following:
commit b0fefd01f27a835a34e44beb2eb2c34027960a51
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 29 15:57:06 2022 +0300
aghnet: fix catching timeout errors </s> remove }
log.Tracef("dhcpv4: the packet is from an active dhcp server")
</s> add default:
log.Tracef("dhcpv4: the packet is from an active dhcp server") </s> remove
// isTimeout returns true if err is an operation timeout error from net package.
//
// TODO(e.burkov): Consider moving into netutil.
func isTimeout(err error) (ok bool) {
var operr *net.OpError
if errors.As(err, &operr) {
return operr.Timeout()
}
return false
}
</s> add </s> remove if !(response.OpCode == dhcpv4.OpcodeBootReply &&
response.HWType == iana.HWTypeEthernet &&
bytes.Equal(response.ClientHWAddr, iface.HardwareAddr) &&
bytes.Equal(response.TransactionID[:], req.TransactionID[:]) &&
response.Options.Has(dhcpv4.OptionDHCPMessageType)) {
log.Debug("dhcpv4: received message from server doesn't match our request")
</s> add switch {
case
response.OpCode != dhcpv4.OpcodeBootReply,
response.HWType != iana.HWTypeEthernet,
!bytes.Equal(response.ClientHWAddr, iface.HardwareAddr),
response.TransactionID != req.TransactionID,
!response.Options.Has(dhcpv4.OptionDHCPMessageType):
log.Debug("dhcpv4: received response doesn't match the request") </s> remove if isTimeout(err) {
</s> add if errors.Is(err, os.ErrDeadlineExceeded) { </s> remove if isTimeout(err) {
</s> add if errors.Is(err, os.ErrDeadlineExceeded) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f31ffcc5d1bb1789c6b2e59c0ca5c33dc515cb8e | internal/aghnet/dhcp_unix.go |
if errors.Is(err, os.ErrDeadlineExceeded) { | <mask> }
<mask>
<mask> n, _, err := c.ReadFrom(b)
<mask> if err != nil {
<mask> if isTimeout(err) {
<mask> log.Debug("dhcpv6: didn't receive dhcp response")
<mask>
<mask> return false, false, nil
<mask> }
<mask>
</s> Pull request: aghnet: fix catching timeout errors
Merge in DNS/adguard-home from fix-is-timeout to master
Squashed commit of the following:
commit b0fefd01f27a835a34e44beb2eb2c34027960a51
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 29 15:57:06 2022 +0300
aghnet: fix catching timeout errors </s> remove if isTimeout(err) {
</s> add if errors.Is(err, os.ErrDeadlineExceeded) { </s> remove
// isTimeout returns true if err is an operation timeout error from net package.
//
// TODO(e.burkov): Consider moving into netutil.
func isTimeout(err error) (ok bool) {
var operr *net.OpError
if errors.As(err, &operr) {
return operr.Timeout()
}
return false
}
</s> add </s> remove return true, false, nil
</s> add return true, false, nil
} </s> remove if !(response.OpCode == dhcpv4.OpcodeBootReply &&
response.HWType == iana.HWTypeEthernet &&
bytes.Equal(response.ClientHWAddr, iface.HardwareAddr) &&
bytes.Equal(response.TransactionID[:], req.TransactionID[:]) &&
response.Options.Has(dhcpv4.OptionDHCPMessageType)) {
log.Debug("dhcpv4: received message from server doesn't match our request")
</s> add switch {
case
response.OpCode != dhcpv4.OpcodeBootReply,
response.HWType != iana.HWTypeEthernet,
!bytes.Equal(response.ClientHWAddr, iface.HardwareAddr),
response.TransactionID != req.TransactionID,
!response.Options.Has(dhcpv4.OptionDHCPMessageType):
log.Debug("dhcpv4: received response doesn't match the request") </s> remove }
log.Tracef("dhcpv4: the packet is from an active dhcp server")
</s> add default:
log.Tracef("dhcpv4: the packet is from an active dhcp server") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f31ffcc5d1bb1789c6b2e59c0ca5c33dc515cb8e | internal/aghnet/dhcp_unix.go |
<mask> log.Tracef("dhcpv6: the packet is from an active dhcp server")
<mask>
<mask> return true, false, nil
<mask> }
<mask>
<mask> // isTimeout returns true if err is an operation timeout error from net package.
<mask> //
<mask> // TODO(e.burkov): Consider moving into netutil.
<mask> func isTimeout(err error) (ok bool) {
<mask> var operr *net.OpError
<mask> if errors.As(err, &operr) {
<mask> return operr.Timeout()
<mask> }
<mask>
<mask> return false
<mask> }
</s> Pull request: aghnet: fix catching timeout errors
Merge in DNS/adguard-home from fix-is-timeout to master
Squashed commit of the following:
commit b0fefd01f27a835a34e44beb2eb2c34027960a51
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 29 15:57:06 2022 +0300
aghnet: fix catching timeout errors </s> remove return true, false, nil
</s> add return true, false, nil
} </s> remove }
log.Tracef("dhcpv4: the packet is from an active dhcp server")
</s> add default:
log.Tracef("dhcpv4: the packet is from an active dhcp server") </s> remove if !(response.OpCode == dhcpv4.OpcodeBootReply &&
response.HWType == iana.HWTypeEthernet &&
bytes.Equal(response.ClientHWAddr, iface.HardwareAddr) &&
bytes.Equal(response.TransactionID[:], req.TransactionID[:]) &&
response.Options.Has(dhcpv4.OptionDHCPMessageType)) {
log.Debug("dhcpv4: received message from server doesn't match our request")
</s> add switch {
case
response.OpCode != dhcpv4.OpcodeBootReply,
response.HWType != iana.HWTypeEthernet,
!bytes.Equal(response.ClientHWAddr, iface.HardwareAddr),
response.TransactionID != req.TransactionID,
!response.Options.Has(dhcpv4.OptionDHCPMessageType):
log.Debug("dhcpv4: received response doesn't match the request") </s> remove if isTimeout(err) {
</s> add if errors.Is(err, os.ErrDeadlineExceeded) { </s> remove if isTimeout(err) {
</s> add if errors.Is(err, os.ErrDeadlineExceeded) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f31ffcc5d1bb1789c6b2e59c0ca5c33dc515cb8e | internal/aghnet/dhcp_unix.go | |
"dns_test_warning_toast": "Server \"{{key}}\" does not respond to test requests and may not work properly", | <mask> "dns_test_ok_toast": "Specified DNS servers are working correctly",
<mask> "dns_test_not_ok_toast": "Server \"{{key}}\": could not be used, please check that you've written it correctly",
<mask> "unblock": "Unblock",
<mask> "block": "Block",
<mask> "disallow_this_client": "Disallow this client",
<mask> "allow_this_client": "Allow this client",
<mask> "block_for_this_client_only": "Block for this client only",
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove var useDefault bool
if useDefault, err = validateUpstream(input); err != nil {
</s> add upstreamAddr, domains, err := separateUpstream(upstreamConfigStr)
if err != nil { </s> remove // No need to check this DNS server.
if !useDefault {
return nil
}
if input, _, err = separateUpstream(input); err != nil {
</s> add useDefault, err := validateUpstream(upstreamAddr, domains)
if err != nil { </s> remove // separateUpstream returns the upstream without the specified domains.
// isDomainSpec is true when the upstream is domains-specific.
func separateUpstream(upstreamStr string) (upstream string, isDomainSpec bool, err error) {
</s> add // separateUpstream returns the upstream and the specified domains. domains is
// nil when the upstream is not domains-specific. Otherwise it may also be
// empty.
func separateUpstream(upstreamStr string) (ups string, domains []string, err error) { </s> remove wantSet: `validating upstream servers: bad ipport address "!!!": ` +
</s> add wantSet: `validating upstream servers: ` +
`validating upstream "!!!": bad ipport address "!!!": ` + | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | client/src/__locales/en.json |
if (message.startsWith('WARNING:')) {
dispatch(addErrorToast({ error: i18next.t('dns_test_warning_toast', { key }) }));
} else if (message !== 'OK') { | <mask> const upstreamResponse = await apiClient.testUpstream(config);
<mask> const testMessages = Object.keys(upstreamResponse)
<mask> .map((key) => {
<mask> const message = upstreamResponse[key];
<mask> if (message !== 'OK') {
<mask> dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
<mask> }
<mask> return message;
<mask> });
<mask>
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove if (testMessages.every((message) => message === 'OK')) {
</s> add if (testMessages.every((message) => message === 'OK' || message.startsWith('WARNING:'))) { </s> remove return fmt.Errorf("failed to choose upstream for %q: %w", input, err)
</s> add return fmt.Errorf("failed to choose upstream for %q: %w", upstreamAddr, err) </s> remove // No need to check this DNS server.
if !useDefault {
return nil
}
if input, _, err = separateUpstream(input); err != nil {
</s> add useDefault, err := validateUpstream(upstreamAddr, domains)
if err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | client/src/actions/index.js |
if (testMessages.every((message) => message === 'OK' || message.startsWith('WARNING:'))) { | <mask> }
<mask> return message;
<mask> });
<mask>
<mask> if (testMessages.every((message) => message === 'OK')) {
<mask> dispatch(addSuccessToast('dns_test_ok_toast'));
<mask> }
<mask>
<mask> dispatch(testUpstreamSuccess());
<mask> } catch (error) {
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove if (message !== 'OK') {
</s> add if (message.startsWith('WARNING:')) {
dispatch(addErrorToast({ error: i18next.t('dns_test_warning_toast', { key }) }));
} else if (message !== 'OK') { </s> remove }
if len(reply.Answer) != 1 {
return fmt.Errorf("wrong response")
} else if a, ok := reply.Answer[0].(*dns.A); !ok || !a.A.Equal(net.IP{8, 8, 8, 8}) {
return fmt.Errorf("wrong response")
</s> add } else if len(reply.Answer) != 0 {
return errors.Error("wrong response") </s> remove for _, u := range upstreams {
_, err = validateUpstream(u)
if err != nil {
return nil, err
}
}
</s> add </s> remove // No need to check this DNS server.
if !useDefault {
return nil
}
if input, _, err = separateUpstream(input); err != nil {
</s> add useDefault, err := validateUpstream(upstreamAddr, domains)
if err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | client/src/actions/index.js |
for _, u := range upstreams {
var ups string
var domains []string
ups, domains, err = separateUpstream(u)
if err != nil {
// Don't wrap the error since it's informative enough as is.
return nil, err
}
_, err = validateUpstream(ups, domains)
if err != nil {
return nil, fmt.Errorf("validating upstream %q: %w", u, err)
}
}
| <mask> }
<mask>
<mask> conf, err = proxy.ParseUpstreamsConfig(
<mask> upstreams,
<mask> &upstream.Options{Bootstrap: []string{}, Timeout: DefaultTimeout},
<mask> )
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove return "", true, errors.Error("duplicated separator")
</s> add return "", []string{}, errors.Error("duplicated separator") </s> remove for _, u := range upstreams {
_, err = validateUpstream(u)
if err != nil {
return nil, err
}
}
</s> add </s> remove log.Debug("checking if upstream %s works", input)
</s> add log.Debug("dnsforward: checking if upstream %q works", upstreamAddr) </s> remove var u upstream.Upstream
u, err = upstream.AddressToUpstream(input, &upstream.Options{
</s> add u, err := upstream.AddressToUpstream(upstreamAddr, &upstream.Options{ </s> remove return fmt.Errorf("failed to choose upstream for %q: %w", input, err)
</s> add return fmt.Errorf("failed to choose upstream for %q: %w", upstreamAddr, err) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
<mask> } else if len(conf.Upstreams) == 0 {
<mask> return nil, errors.Error("no default upstreams specified")
<mask> }
<mask>
<mask> for _, u := range upstreams {
<mask> _, err = validateUpstream(u)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> }
<mask>
<mask> return conf, nil
<mask> }
<mask>
<mask> // ValidateUpstreams validates each upstream and returns an error if any
<mask> // upstream is invalid or if there are no default upstreams specified.
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove func validateUpstream(u string) (useDefault bool, err error) {
// Check if the user tries to specify upstream for domain.
var isDomainSpec bool
u, isDomainSpec, err = separateUpstream(u)
if err != nil {
return !isDomainSpec, err
}
</s> add // validateUpstream returns an error if u alongside with domains is not a valid
// upstream configuration. useDefault is true if the upstream is
// domain-specific and is configured to point at the default upstream server
// which is validated separately. The upstream is considered domain-specific
// only if domains is at least not nil.
func validateUpstream(u string, domains []string) (useDefault bool, err error) { </s> remove // No need to check this DNS server.
if !useDefault {
return nil
}
if input, _, err = separateUpstream(input); err != nil {
</s> add useDefault, err := validateUpstream(upstreamAddr, domains)
if err != nil { </s> remove if useDefault = !isDomainSpec; u == "#" && isDomainSpec {
</s> add if useDefault = u == "#" && domains != nil; useDefault { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go | |
// validateUpstream returns an error if u alongside with domains is not a valid
// upstream configuration. useDefault is true if the upstream is
// domain-specific and is configured to point at the default upstream server
// which is validated separately. The upstream is considered domain-specific
// only if domains is at least not nil.
func validateUpstream(u string, domains []string) (useDefault bool, err error) { | <mask> }
<mask>
<mask> var protocols = []string{"udp://", "tcp://", "tls://", "https://", "sdns://", "quic://"}
<mask>
<mask> func validateUpstream(u string) (useDefault bool, err error) {
<mask> // Check if the user tries to specify upstream for domain.
<mask> var isDomainSpec bool
<mask> u, isDomainSpec, err = separateUpstream(u)
<mask> if err != nil {
<mask> return !isDomainSpec, err
<mask> }
<mask>
<mask> // The special server address '#' means that default server must be used.
<mask> if useDefault = !isDomainSpec; u == "#" && isDomainSpec {
<mask> return useDefault, nil
<mask> }
<mask>
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove if useDefault = !isDomainSpec; u == "#" && isDomainSpec {
</s> add if useDefault = u == "#" && domains != nil; useDefault { </s> remove // separateUpstream returns the upstream without the specified domains.
// isDomainSpec is true when the upstream is domains-specific.
func separateUpstream(upstreamStr string) (upstream string, isDomainSpec bool, err error) {
</s> add // separateUpstream returns the upstream and the specified domains. domains is
// nil when the upstream is not domains-specific. Otherwise it may also be
// empty.
func separateUpstream(upstreamStr string) (ups string, domains []string, err error) { </s> remove return upstreamStr, false, nil
</s> add return upstreamStr, nil, nil </s> remove var useDefault bool
if useDefault, err = validateUpstream(input); err != nil {
</s> add upstreamAddr, domains, err := separateUpstream(upstreamConfigStr)
if err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
if useDefault = u == "#" && domains != nil; useDefault { | <mask> return !isDomainSpec, err
<mask> }
<mask>
<mask> // The special server address '#' means that default server must be used.
<mask> if useDefault = !isDomainSpec; u == "#" && isDomainSpec {
<mask> return useDefault, nil
<mask> }
<mask>
<mask> // Check if the upstream has a valid protocol prefix.
<mask> //
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove func validateUpstream(u string) (useDefault bool, err error) {
// Check if the user tries to specify upstream for domain.
var isDomainSpec bool
u, isDomainSpec, err = separateUpstream(u)
if err != nil {
return !isDomainSpec, err
}
</s> add // validateUpstream returns an error if u alongside with domains is not a valid
// upstream configuration. useDefault is true if the upstream is
// domain-specific and is configured to point at the default upstream server
// which is validated separately. The upstream is considered domain-specific
// only if domains is at least not nil.
func validateUpstream(u string, domains []string) (useDefault bool, err error) { </s> remove for _, u := range upstreams {
_, err = validateUpstream(u)
if err != nil {
return nil, err
}
}
</s> add </s> remove // No need to check this DNS server.
if !useDefault {
return nil
}
if input, _, err = separateUpstream(input); err != nil {
</s> add useDefault, err := validateUpstream(upstreamAddr, domains)
if err != nil { </s> remove // separateUpstream returns the upstream without the specified domains.
// isDomainSpec is true when the upstream is domains-specific.
func separateUpstream(upstreamStr string) (upstream string, isDomainSpec bool, err error) {
</s> add // separateUpstream returns the upstream and the specified domains. domains is
// nil when the upstream is not domains-specific. Otherwise it may also be
// empty.
func separateUpstream(upstreamStr string) (ups string, domains []string, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
// separateUpstream returns the upstream and the specified domains. domains is
// nil when the upstream is not domains-specific. Otherwise it may also be
// empty.
func separateUpstream(upstreamStr string) (ups string, domains []string, err error) { | <mask>
<mask> return useDefault, nil
<mask> }
<mask>
<mask> // separateUpstream returns the upstream without the specified domains.
<mask> // isDomainSpec is true when the upstream is domains-specific.
<mask> func separateUpstream(upstreamStr string) (upstream string, isDomainSpec bool, err error) {
<mask> if !strings.HasPrefix(upstreamStr, "[/") {
<mask> return upstreamStr, false, nil
<mask> }
<mask> defer func() { err = errors.Annotate(err, "bad upstream for domain %q: %w", upstreamStr) }()
<mask>
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove return upstreamStr, false, nil
</s> add return upstreamStr, nil, nil </s> remove func validateUpstream(u string) (useDefault bool, err error) {
// Check if the user tries to specify upstream for domain.
var isDomainSpec bool
u, isDomainSpec, err = separateUpstream(u)
if err != nil {
return !isDomainSpec, err
}
</s> add // validateUpstream returns an error if u alongside with domains is not a valid
// upstream configuration. useDefault is true if the upstream is
// domain-specific and is configured to point at the default upstream server
// which is validated separately. The upstream is considered domain-specific
// only if domains is at least not nil.
func validateUpstream(u string, domains []string) (useDefault bool, err error) { </s> remove if useDefault = !isDomainSpec; u == "#" && isDomainSpec {
</s> add if useDefault = u == "#" && domains != nil; useDefault { </s> remove func checkDNS(input string, bootstrap []string, timeout time.Duration, ef excFunc) (err error) {
if IsCommentOrEmpty(input) {
</s> add // domainSpecificTestError is a wrapper for errors returned by checkDNS to mark
// the tested upstream domain-specific and therefore consider its errors
// non-critical.
//
// TODO(a.garipov): Some common mechanism of distinguishing between errors and
// warnings (non-critical errors) is desired.
type domainSpecificTestError struct {
error
}
// checkDNS checks the upstream server defined by upstreamConfigStr using
// healthCheck for actually exchange messages. It uses bootstrap to resolve the
// upstream's address.
func checkDNS(
upstreamConfigStr string,
bootstrap []string,
timeout time.Duration,
healthCheck healthCheckFunc,
) (err error) {
if IsCommentOrEmpty(upstreamConfigStr) { </s> remove // No need to check this DNS server.
if !useDefault {
return nil
}
if input, _, err = separateUpstream(input); err != nil {
</s> add useDefault, err := validateUpstream(upstreamAddr, domains)
if err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
return upstreamStr, nil, nil | <mask> // separateUpstream returns the upstream without the specified domains.
<mask> // isDomainSpec is true when the upstream is domains-specific.
<mask> func separateUpstream(upstreamStr string) (upstream string, isDomainSpec bool, err error) {
<mask> if !strings.HasPrefix(upstreamStr, "[/") {
<mask> return upstreamStr, false, nil
<mask> }
<mask> defer func() { err = errors.Annotate(err, "bad upstream for domain %q: %w", upstreamStr) }()
<mask>
<mask> parts := strings.Split(upstreamStr[2:], "/]")
<mask> switch len(parts) {
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove // separateUpstream returns the upstream without the specified domains.
// isDomainSpec is true when the upstream is domains-specific.
func separateUpstream(upstreamStr string) (upstream string, isDomainSpec bool, err error) {
</s> add // separateUpstream returns the upstream and the specified domains. domains is
// nil when the upstream is not domains-specific. Otherwise it may also be
// empty.
func separateUpstream(upstreamStr string) (ups string, domains []string, err error) { </s> remove func validateUpstream(u string) (useDefault bool, err error) {
// Check if the user tries to specify upstream for domain.
var isDomainSpec bool
u, isDomainSpec, err = separateUpstream(u)
if err != nil {
return !isDomainSpec, err
}
</s> add // validateUpstream returns an error if u alongside with domains is not a valid
// upstream configuration. useDefault is true if the upstream is
// domain-specific and is configured to point at the default upstream server
// which is validated separately. The upstream is considered domain-specific
// only if domains is at least not nil.
func validateUpstream(u string, domains []string) (useDefault bool, err error) { </s> remove func checkDNS(input string, bootstrap []string, timeout time.Duration, ef excFunc) (err error) {
if IsCommentOrEmpty(input) {
</s> add // domainSpecificTestError is a wrapper for errors returned by checkDNS to mark
// the tested upstream domain-specific and therefore consider its errors
// non-critical.
//
// TODO(a.garipov): Some common mechanism of distinguishing between errors and
// warnings (non-critical errors) is desired.
type domainSpecificTestError struct {
error
}
// checkDNS checks the upstream server defined by upstreamConfigStr using
// healthCheck for actually exchange messages. It uses bootstrap to resolve the
// upstream's address.
func checkDNS(
upstreamConfigStr string,
bootstrap []string,
timeout time.Duration,
healthCheck healthCheckFunc,
) (err error) {
if IsCommentOrEmpty(upstreamConfigStr) { </s> remove if useDefault = !isDomainSpec; u == "#" && isDomainSpec {
</s> add if useDefault = u == "#" && domains != nil; useDefault { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
return "", nil, errors.Error("missing separator") | <mask> switch len(parts) {
<mask> case 2:
<mask> // Go on.
<mask> case 1:
<mask> return "", false, errors.Error("missing separator")
<mask> default:
<mask> return "", true, errors.Error("duplicated separator")
<mask> }
<mask>
<mask> var domains string
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove return "", true, errors.Error("duplicated separator")
</s> add return "", []string{}, errors.Error("duplicated separator") </s> remove var domains string
domains, upstream = parts[0], parts[1]
for i, host := range strings.Split(domains, "/") {
</s> add for i, host := range strings.Split(parts[0], "/") { </s> remove return upstreamStr, false, nil
</s> add return upstreamStr, nil, nil </s> remove return "", true, fmt.Errorf("domain at index %d: %w", i, err)
</s> add return "", domains, fmt.Errorf("domain at index %d: %w", i, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
return "", []string{}, errors.Error("duplicated separator") | <mask> // Go on.
<mask> case 1:
<mask> return "", false, errors.Error("missing separator")
<mask> default:
<mask> return "", true, errors.Error("duplicated separator")
<mask> }
<mask>
<mask> var domains string
<mask> domains, upstream = parts[0], parts[1]
<mask> for i, host := range strings.Split(domains, "/") {
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove return "", false, errors.Error("missing separator")
</s> add return "", nil, errors.Error("missing separator") </s> remove var domains string
domains, upstream = parts[0], parts[1]
for i, host := range strings.Split(domains, "/") {
</s> add for i, host := range strings.Split(parts[0], "/") { </s> remove return "", true, fmt.Errorf("domain at index %d: %w", i, err)
</s> add return "", domains, fmt.Errorf("domain at index %d: %w", i, err) </s> remove host = strings.TrimPrefix(host, "*.")
err = netutil.ValidateDomainName(host)
</s> add err = netutil.ValidateDomainName(strings.TrimPrefix(host, "*.")) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
for i, host := range strings.Split(parts[0], "/") { | <mask> default:
<mask> return "", true, errors.Error("duplicated separator")
<mask> }
<mask>
<mask> var domains string
<mask> domains, upstream = parts[0], parts[1]
<mask> for i, host := range strings.Split(domains, "/") {
<mask> if host == "" {
<mask> continue
<mask> }
<mask>
<mask> host = strings.TrimPrefix(host, "*.")
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove return "", true, errors.Error("duplicated separator")
</s> add return "", []string{}, errors.Error("duplicated separator") </s> remove host = strings.TrimPrefix(host, "*.")
err = netutil.ValidateDomainName(host)
</s> add err = netutil.ValidateDomainName(strings.TrimPrefix(host, "*.")) </s> remove return "", true, fmt.Errorf("domain at index %d: %w", i, err)
</s> add return "", domains, fmt.Errorf("domain at index %d: %w", i, err) </s> remove return "", false, errors.Error("missing separator")
</s> add return "", nil, errors.Error("missing separator") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
err = netutil.ValidateDomainName(strings.TrimPrefix(host, "*.")) | <mask> if host == "" {
<mask> continue
<mask> }
<mask>
<mask> host = strings.TrimPrefix(host, "*.")
<mask> err = netutil.ValidateDomainName(host)
<mask> if err != nil {
<mask> return "", true, fmt.Errorf("domain at index %d: %w", i, err)
<mask> }
<mask> }
<mask>
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove return "", true, fmt.Errorf("domain at index %d: %w", i, err)
</s> add return "", domains, fmt.Errorf("domain at index %d: %w", i, err) </s> remove var domains string
domains, upstream = parts[0], parts[1]
for i, host := range strings.Split(domains, "/") {
</s> add for i, host := range strings.Split(parts[0], "/") { </s> remove return upstream, true, nil
</s> add return parts[1], domains, nil </s> remove return "", true, errors.Error("duplicated separator")
</s> add return "", []string{}, errors.Error("duplicated separator") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
return "", domains, fmt.Errorf("domain at index %d: %w", i, err) | <mask>
<mask> host = strings.TrimPrefix(host, "*.")
<mask> err = netutil.ValidateDomainName(host)
<mask> if err != nil {
<mask> return "", true, fmt.Errorf("domain at index %d: %w", i, err)
<mask> }
<mask> }
<mask>
<mask> return upstream, true, nil
<mask> }
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove host = strings.TrimPrefix(host, "*.")
err = netutil.ValidateDomainName(host)
</s> add err = netutil.ValidateDomainName(strings.TrimPrefix(host, "*.")) </s> remove return upstream, true, nil
</s> add return parts[1], domains, nil </s> remove var domains string
domains, upstream = parts[0], parts[1]
for i, host := range strings.Split(domains, "/") {
</s> add for i, host := range strings.Split(parts[0], "/") { </s> remove return "", true, errors.Error("duplicated separator")
</s> add return "", []string{}, errors.Error("duplicated separator") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
domains = append(domains, host) | <mask> err = netutil.ValidateDomainName(strings.TrimPrefix(host, "*."))
<mask> if err != nil {
<mask> return "", domains, fmt.Errorf("domain at index %d: %w", i, err)
<mask> }
<mask> }
<mask>
<mask> return parts[1], domains, nil
<mask> }
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove return "", true, fmt.Errorf("domain at index %d: %w", i, err)
</s> add return "", domains, fmt.Errorf("domain at index %d: %w", i, err) </s> remove host = strings.TrimPrefix(host, "*.")
err = netutil.ValidateDomainName(host)
</s> add err = netutil.ValidateDomainName(strings.TrimPrefix(host, "*.")) </s> remove return upstream, true, nil
</s> add return parts[1], domains, nil </s> remove var useDefault bool
if useDefault, err = validateUpstream(input); err != nil {
</s> add upstreamAddr, domains, err := separateUpstream(upstreamConfigStr)
if err != nil { </s> remove var domains string
domains, upstream = parts[0], parts[1]
for i, host := range strings.Split(domains, "/") {
</s> add for i, host := range strings.Split(parts[0], "/") { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
return parts[1], domains, nil | <mask> return "", true, fmt.Errorf("domain at index %d: %w", i, err)
<mask> }
<mask> }
<mask>
<mask> return upstream, true, nil
<mask> }
<mask>
<mask> // excFunc is a signature of function to check if upstream exchanges correctly.
<mask> type excFunc func(u upstream.Upstream) (err error)
<mask>
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove // excFunc is a signature of function to check if upstream exchanges correctly.
type excFunc func(u upstream.Upstream) (err error)
</s> add // healthCheckFunc is a signature of function to check if upstream exchanges
// properly.
type healthCheckFunc func(u upstream.Upstream) (err error) </s> remove return "", true, fmt.Errorf("domain at index %d: %w", i, err)
</s> add return "", domains, fmt.Errorf("domain at index %d: %w", i, err) </s> remove host = strings.TrimPrefix(host, "*.")
err = netutil.ValidateDomainName(host)
</s> add err = netutil.ValidateDomainName(strings.TrimPrefix(host, "*.")) </s> remove func checkDNS(input string, bootstrap []string, timeout time.Duration, ef excFunc) (err error) {
if IsCommentOrEmpty(input) {
</s> add // domainSpecificTestError is a wrapper for errors returned by checkDNS to mark
// the tested upstream domain-specific and therefore consider its errors
// non-critical.
//
// TODO(a.garipov): Some common mechanism of distinguishing between errors and
// warnings (non-critical errors) is desired.
type domainSpecificTestError struct {
error
}
// checkDNS checks the upstream server defined by upstreamConfigStr using
// healthCheck for actually exchange messages. It uses bootstrap to resolve the
// upstream's address.
func checkDNS(
upstreamConfigStr string,
bootstrap []string,
timeout time.Duration,
healthCheck healthCheckFunc,
) (err error) {
if IsCommentOrEmpty(upstreamConfigStr) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
// healthCheckFunc is a signature of function to check if upstream exchanges
// properly.
type healthCheckFunc func(u upstream.Upstream) (err error) | <mask>
<mask> return upstream, true, nil
<mask> }
<mask>
<mask> // excFunc is a signature of function to check if upstream exchanges correctly.
<mask> type excFunc func(u upstream.Upstream) (err error)
<mask>
<mask> // checkDNSUpstreamExc checks if the DNS upstream exchanges correctly.
<mask> func checkDNSUpstreamExc(u upstream.Upstream) (err error) {
<mask> req := &dns.Msg{
<mask> MsgHdr: dns.MsgHdr{
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove return upstream, true, nil
</s> add return parts[1], domains, nil </s> remove func checkDNS(input string, bootstrap []string, timeout time.Duration, ef excFunc) (err error) {
if IsCommentOrEmpty(input) {
</s> add // domainSpecificTestError is a wrapper for errors returned by checkDNS to mark
// the tested upstream domain-specific and therefore consider its errors
// non-critical.
//
// TODO(a.garipov): Some common mechanism of distinguishing between errors and
// warnings (non-critical errors) is desired.
type domainSpecificTestError struct {
error
}
// checkDNS checks the upstream server defined by upstreamConfigStr using
// healthCheck for actually exchange messages. It uses bootstrap to resolve the
// upstream's address.
func checkDNS(
upstreamConfigStr string,
bootstrap []string,
timeout time.Duration,
healthCheck healthCheckFunc,
) (err error) {
if IsCommentOrEmpty(upstreamConfigStr) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
// testTLD is the special-use fully-qualified domain name for testing the
// DNS server reachability.
//
// See https://datatracker.ietf.org/doc/html/rfc6761#section-6.2.
const testTLD = "test."
| <mask>
<mask> // checkDNSUpstreamExc checks if the DNS upstream exchanges correctly.
<mask> func checkDNSUpstreamExc(u upstream.Upstream) (err error) {
<mask> req := &dns.Msg{
<mask> MsgHdr: dns.MsgHdr{
<mask> Id: dns.Id(),
<mask> RecursionDesired: true,
<mask> },
<mask> Question: []dns.Question{{
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove // excFunc is a signature of function to check if upstream exchanges correctly.
type excFunc func(u upstream.Upstream) (err error)
</s> add // healthCheckFunc is a signature of function to check if upstream exchanges
// properly.
type healthCheckFunc func(u upstream.Upstream) (err error) </s> remove Name: "google-public-dns-a.google.com.",
</s> add Name: testTLD, </s> remove Name: "1.0.0.127.in-addr.arpa.",
</s> add Name: inAddrArpaTLD, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
Name: testTLD, | <mask> Id: dns.Id(),
<mask> RecursionDesired: true,
<mask> },
<mask> Question: []dns.Question{{
<mask> Name: "google-public-dns-a.google.com.",
<mask> Qtype: dns.TypeA,
<mask> Qclass: dns.ClassINET,
<mask> }},
<mask> }
<mask>
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove Name: "1.0.0.127.in-addr.arpa.",
</s> add Name: inAddrArpaTLD, </s> remove return "", true, fmt.Errorf("domain at index %d: %w", i, err)
</s> add return "", domains, fmt.Errorf("domain at index %d: %w", i, err) </s> remove return upstream, true, nil
</s> add return parts[1], domains, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
} else if len(reply.Answer) != 0 {
return errors.Error("wrong response") | <mask> var reply *dns.Msg
<mask> reply, err = u.Exchange(req)
<mask> if err != nil {
<mask> return fmt.Errorf("couldn't communicate with upstream: %w", err)
<mask> }
<mask>
<mask> if len(reply.Answer) != 1 {
<mask> return fmt.Errorf("wrong response")
<mask> } else if a, ok := reply.Answer[0].(*dns.A); !ok || !a.A.Equal(net.IP{8, 8, 8, 8}) {
<mask> return fmt.Errorf("wrong response")
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove // No need to check this DNS server.
if !useDefault {
return nil
}
if input, _, err = separateUpstream(input); err != nil {
</s> add useDefault, err := validateUpstream(upstreamAddr, domains)
if err != nil { </s> remove var useDefault bool
if useDefault, err = validateUpstream(input); err != nil {
</s> add upstreamAddr, domains, err := separateUpstream(upstreamConfigStr)
if err != nil { </s> remove if err = ef(u); err != nil {
return fmt.Errorf("upstream %q fails to exchange: %w", input, err)
</s> add if err = healthCheck(u); err != nil {
err = fmt.Errorf("upstream %q fails to exchange: %w", upstreamAddr, err)
if domains != nil {
return domainSpecificTestError{error: err}
}
return err </s> remove for _, u := range upstreams {
_, err = validateUpstream(u)
if err != nil {
return nil, err
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
//
// TODO(e.burkov): Think about testing the ip6.arpa. as well. | <mask>
<mask> // checkPrivateUpstreamExc checks if the upstream for resolving private
<mask> // addresses exchanges correctly.
<mask> func checkPrivateUpstreamExc(u upstream.Upstream) (err error) {
<mask> // inAddrArpaTLD is the special-use fully-qualified domain name for PTR IP
<mask> // address resolution.
<mask> //
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove // excFunc is a signature of function to check if upstream exchanges correctly.
type excFunc func(u upstream.Upstream) (err error)
</s> add // healthCheckFunc is a signature of function to check if upstream exchanges
// properly.
type healthCheckFunc func(u upstream.Upstream) (err error) </s> remove func checkDNS(input string, bootstrap []string, timeout time.Duration, ef excFunc) (err error) {
if IsCommentOrEmpty(input) {
</s> add // domainSpecificTestError is a wrapper for errors returned by checkDNS to mark
// the tested upstream domain-specific and therefore consider its errors
// non-critical.
//
// TODO(a.garipov): Some common mechanism of distinguishing between errors and
// warnings (non-critical errors) is desired.
type domainSpecificTestError struct {
error
}
// checkDNS checks the upstream server defined by upstreamConfigStr using
// healthCheck for actually exchange messages. It uses bootstrap to resolve the
// upstream's address.
func checkDNS(
upstreamConfigStr string,
bootstrap []string,
timeout time.Duration,
healthCheck healthCheckFunc,
) (err error) {
if IsCommentOrEmpty(upstreamConfigStr) { </s> remove // separateUpstream returns the upstream without the specified domains.
// isDomainSpec is true when the upstream is domains-specific.
func separateUpstream(upstreamStr string) (upstream string, isDomainSpec bool, err error) {
</s> add // separateUpstream returns the upstream and the specified domains. domains is
// nil when the upstream is not domains-specific. Otherwise it may also be
// empty.
func separateUpstream(upstreamStr string) (ups string, domains []string, err error) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
// inAddrArpaTLD is the special-use fully-qualified domain name for PTR IP
// address resolution.
//
// See https://datatracker.ietf.org/doc/html/rfc1035#section-3.5.
const inAddrArpaTLD = "in-addr.arpa."
| <mask> // addresses exchanges correctly.
<mask> //
<mask> // TODO(e.burkov): Think about testing the ip6.arpa. as well.
<mask> func checkPrivateUpstreamExc(u upstream.Upstream) (err error) {
<mask> req := &dns.Msg{
<mask> MsgHdr: dns.MsgHdr{
<mask> Id: dns.Id(),
<mask> RecursionDesired: true,
<mask> },
<mask> Question: []dns.Question{{
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove // excFunc is a signature of function to check if upstream exchanges correctly.
type excFunc func(u upstream.Upstream) (err error)
</s> add // healthCheckFunc is a signature of function to check if upstream exchanges
// properly.
type healthCheckFunc func(u upstream.Upstream) (err error) </s> remove Name: "google-public-dns-a.google.com.",
</s> add Name: testTLD, </s> remove Name: "1.0.0.127.in-addr.arpa.",
</s> add Name: inAddrArpaTLD, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
Name: inAddrArpaTLD, | <mask> Id: dns.Id(),
<mask> RecursionDesired: true,
<mask> },
<mask> Question: []dns.Question{{
<mask> Name: "1.0.0.127.in-addr.arpa.",
<mask> Qtype: dns.TypePTR,
<mask> Qclass: dns.ClassINET,
<mask> }},
<mask> }
<mask>
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove Name: "google-public-dns-a.google.com.",
</s> add Name: testTLD, </s> remove return "", true, fmt.Errorf("domain at index %d: %w", i, err)
</s> add return "", domains, fmt.Errorf("domain at index %d: %w", i, err) </s> remove return upstream, true, nil
</s> add return parts[1], domains, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
// domainSpecificTestError is a wrapper for errors returned by checkDNS to mark
// the tested upstream domain-specific and therefore consider its errors
// non-critical.
//
// TODO(a.garipov): Some common mechanism of distinguishing between errors and
// warnings (non-critical errors) is desired.
type domainSpecificTestError struct {
error
}
// checkDNS checks the upstream server defined by upstreamConfigStr using
// healthCheck for actually exchange messages. It uses bootstrap to resolve the
// upstream's address.
func checkDNS(
upstreamConfigStr string,
bootstrap []string,
timeout time.Duration,
healthCheck healthCheckFunc,
) (err error) {
if IsCommentOrEmpty(upstreamConfigStr) { | <mask>
<mask> return nil
<mask> }
<mask>
<mask> func checkDNS(input string, bootstrap []string, timeout time.Duration, ef excFunc) (err error) {
<mask> if IsCommentOrEmpty(input) {
<mask> return nil
<mask> }
<mask>
<mask> // Separate upstream from domains list.
<mask> var useDefault bool
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove var useDefault bool
if useDefault, err = validateUpstream(input); err != nil {
</s> add upstreamAddr, domains, err := separateUpstream(upstreamConfigStr)
if err != nil { </s> remove // separateUpstream returns the upstream without the specified domains.
// isDomainSpec is true when the upstream is domains-specific.
func separateUpstream(upstreamStr string) (upstream string, isDomainSpec bool, err error) {
</s> add // separateUpstream returns the upstream and the specified domains. domains is
// nil when the upstream is not domains-specific. Otherwise it may also be
// empty.
func separateUpstream(upstreamStr string) (ups string, domains []string, err error) { </s> remove func validateUpstream(u string) (useDefault bool, err error) {
// Check if the user tries to specify upstream for domain.
var isDomainSpec bool
u, isDomainSpec, err = separateUpstream(u)
if err != nil {
return !isDomainSpec, err
}
</s> add // validateUpstream returns an error if u alongside with domains is not a valid
// upstream configuration. useDefault is true if the upstream is
// domain-specific and is configured to point at the default upstream server
// which is validated separately. The upstream is considered domain-specific
// only if domains is at least not nil.
func validateUpstream(u string, domains []string) (useDefault bool, err error) { </s> remove return upstreamStr, false, nil
</s> add return upstreamStr, nil, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
upstreamAddr, domains, err := separateUpstream(upstreamConfigStr)
if err != nil { | <mask> return nil
<mask> }
<mask>
<mask> // Separate upstream from domains list.
<mask> var useDefault bool
<mask> if useDefault, err = validateUpstream(input); err != nil {
<mask> return fmt.Errorf("wrong upstream format: %w", err)
<mask> }
<mask>
<mask> // No need to check this DNS server.
<mask> if !useDefault {
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove // No need to check this DNS server.
if !useDefault {
return nil
}
if input, _, err = separateUpstream(input); err != nil {
</s> add useDefault, err := validateUpstream(upstreamAddr, domains)
if err != nil { </s> remove func checkDNS(input string, bootstrap []string, timeout time.Duration, ef excFunc) (err error) {
if IsCommentOrEmpty(input) {
</s> add // domainSpecificTestError is a wrapper for errors returned by checkDNS to mark
// the tested upstream domain-specific and therefore consider its errors
// non-critical.
//
// TODO(a.garipov): Some common mechanism of distinguishing between errors and
// warnings (non-critical errors) is desired.
type domainSpecificTestError struct {
error
}
// checkDNS checks the upstream server defined by upstreamConfigStr using
// healthCheck for actually exchange messages. It uses bootstrap to resolve the
// upstream's address.
func checkDNS(
upstreamConfigStr string,
bootstrap []string,
timeout time.Duration,
healthCheck healthCheckFunc,
) (err error) {
if IsCommentOrEmpty(upstreamConfigStr) { </s> remove func validateUpstream(u string) (useDefault bool, err error) {
// Check if the user tries to specify upstream for domain.
var isDomainSpec bool
u, isDomainSpec, err = separateUpstream(u)
if err != nil {
return !isDomainSpec, err
}
</s> add // validateUpstream returns an error if u alongside with domains is not a valid
// upstream configuration. useDefault is true if the upstream is
// domain-specific and is configured to point at the default upstream server
// which is validated separately. The upstream is considered domain-specific
// only if domains is at least not nil.
func validateUpstream(u string, domains []string) (useDefault bool, err error) { </s> remove if useDefault = !isDomainSpec; u == "#" && isDomainSpec {
</s> add if useDefault = u == "#" && domains != nil; useDefault { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
useDefault, err := validateUpstream(upstreamAddr, domains)
if err != nil { | <mask> if useDefault, err = validateUpstream(input); err != nil {
<mask> return fmt.Errorf("wrong upstream format: %w", err)
<mask> }
<mask>
<mask> // No need to check this DNS server.
<mask> if !useDefault {
<mask> return nil
<mask> }
<mask>
<mask> if input, _, err = separateUpstream(input); err != nil {
<mask> return fmt.Errorf("wrong upstream format: %w", err)
<mask> }
<mask>
<mask> if len(bootstrap) == 0 {
<mask> bootstrap = defaultBootstrap
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove var useDefault bool
if useDefault, err = validateUpstream(input); err != nil {
</s> add upstreamAddr, domains, err := separateUpstream(upstreamConfigStr)
if err != nil { </s> remove }
if len(reply.Answer) != 1 {
return fmt.Errorf("wrong response")
} else if a, ok := reply.Answer[0].(*dns.A); !ok || !a.A.Equal(net.IP{8, 8, 8, 8}) {
return fmt.Errorf("wrong response")
</s> add } else if len(reply.Answer) != 0 {
return errors.Error("wrong response") </s> remove if err = ef(u); err != nil {
return fmt.Errorf("upstream %q fails to exchange: %w", input, err)
</s> add if err = healthCheck(u); err != nil {
err = fmt.Errorf("upstream %q fails to exchange: %w", upstreamAddr, err)
if domains != nil {
return domainSpecificTestError{error: err}
}
return err </s> remove return fmt.Errorf("failed to choose upstream for %q: %w", input, err)
</s> add return fmt.Errorf("failed to choose upstream for %q: %w", upstreamAddr, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
} else if useDefault {
return nil | <mask> useDefault, err := validateUpstream(upstreamAddr, domains)
<mask> if err != nil {
<mask> return fmt.Errorf("wrong upstream format: %w", err)
<mask> }
<mask>
<mask> if len(bootstrap) == 0 {
<mask> bootstrap = defaultBootstrap
<mask> }
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove // No need to check this DNS server.
if !useDefault {
return nil
}
if input, _, err = separateUpstream(input); err != nil {
</s> add useDefault, err := validateUpstream(upstreamAddr, domains)
if err != nil { </s> remove log.Debug("checking if upstream %s works", input)
</s> add log.Debug("dnsforward: checking if upstream %q works", upstreamAddr) </s> remove var useDefault bool
if useDefault, err = validateUpstream(input); err != nil {
</s> add upstreamAddr, domains, err := separateUpstream(upstreamConfigStr)
if err != nil { </s> remove }
if len(reply.Answer) != 1 {
return fmt.Errorf("wrong response")
} else if a, ok := reply.Answer[0].(*dns.A); !ok || !a.A.Equal(net.IP{8, 8, 8, 8}) {
return fmt.Errorf("wrong response")
</s> add } else if len(reply.Answer) != 0 {
return errors.Error("wrong response") </s> remove for _, u := range upstreams {
_, err = validateUpstream(u)
if err != nil {
return nil, err
}
}
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
log.Debug("dnsforward: checking if upstream %q works", upstreamAddr) | <mask> if len(bootstrap) == 0 {
<mask> bootstrap = defaultBootstrap
<mask> }
<mask>
<mask> log.Debug("checking if upstream %s works", input)
<mask>
<mask> var u upstream.Upstream
<mask> u, err = upstream.AddressToUpstream(input, &upstream.Options{
<mask> Bootstrap: bootstrap,
<mask> Timeout: timeout,
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove var u upstream.Upstream
u, err = upstream.AddressToUpstream(input, &upstream.Options{
</s> add u, err := upstream.AddressToUpstream(upstreamAddr, &upstream.Options{ </s> remove // No need to check this DNS server.
if !useDefault {
return nil
}
if input, _, err = separateUpstream(input); err != nil {
</s> add useDefault, err := validateUpstream(upstreamAddr, domains)
if err != nil { </s> remove return fmt.Errorf("failed to choose upstream for %q: %w", input, err)
</s> add return fmt.Errorf("failed to choose upstream for %q: %w", upstreamAddr, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
u, err := upstream.AddressToUpstream(upstreamAddr, &upstream.Options{ | <mask> }
<mask>
<mask> log.Debug("checking if upstream %s works", input)
<mask>
<mask> var u upstream.Upstream
<mask> u, err = upstream.AddressToUpstream(input, &upstream.Options{
<mask> Bootstrap: bootstrap,
<mask> Timeout: timeout,
<mask> })
<mask> if err != nil {
<mask> return fmt.Errorf("failed to choose upstream for %q: %w", input, err)
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove log.Debug("checking if upstream %s works", input)
</s> add log.Debug("dnsforward: checking if upstream %q works", upstreamAddr) </s> remove return fmt.Errorf("failed to choose upstream for %q: %w", input, err)
</s> add return fmt.Errorf("failed to choose upstream for %q: %w", upstreamAddr, err) </s> remove if err = ef(u); err != nil {
return fmt.Errorf("upstream %q fails to exchange: %w", input, err)
</s> add if err = healthCheck(u); err != nil {
err = fmt.Errorf("upstream %q fails to exchange: %w", upstreamAddr, err)
if domains != nil {
return domainSpecificTestError{error: err}
}
return err </s> remove log.Debug("upstream %s is ok", input)
</s> add log.Debug("dnsforward: upstream %q is ok", upstreamAddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
return fmt.Errorf("failed to choose upstream for %q: %w", upstreamAddr, err) | <mask> Bootstrap: bootstrap,
<mask> Timeout: timeout,
<mask> })
<mask> if err != nil {
<mask> return fmt.Errorf("failed to choose upstream for %q: %w", input, err)
<mask> }
<mask>
<mask> if err = ef(u); err != nil {
<mask> return fmt.Errorf("upstream %q fails to exchange: %w", input, err)
<mask> }
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove if err = ef(u); err != nil {
return fmt.Errorf("upstream %q fails to exchange: %w", input, err)
</s> add if err = healthCheck(u); err != nil {
err = fmt.Errorf("upstream %q fails to exchange: %w", upstreamAddr, err)
if domains != nil {
return domainSpecificTestError{error: err}
}
return err </s> remove var u upstream.Upstream
u, err = upstream.AddressToUpstream(input, &upstream.Options{
</s> add u, err := upstream.AddressToUpstream(upstreamAddr, &upstream.Options{ </s> remove log.Debug("upstream %s is ok", input)
</s> add log.Debug("dnsforward: upstream %q is ok", upstreamAddr) </s> remove // No need to check this DNS server.
if !useDefault {
return nil
}
if input, _, err = separateUpstream(input); err != nil {
</s> add useDefault, err := validateUpstream(upstreamAddr, domains)
if err != nil { </s> remove log.Debug("checking if upstream %s works", input)
</s> add log.Debug("dnsforward: checking if upstream %q works", upstreamAddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
if err = healthCheck(u); err != nil {
err = fmt.Errorf("upstream %q fails to exchange: %w", upstreamAddr, err)
if domains != nil {
return domainSpecificTestError{error: err}
}
return err | <mask> if err != nil {
<mask> return fmt.Errorf("failed to choose upstream for %q: %w", input, err)
<mask> }
<mask>
<mask> if err = ef(u); err != nil {
<mask> return fmt.Errorf("upstream %q fails to exchange: %w", input, err)
<mask> }
<mask>
<mask> log.Debug("upstream %s is ok", input)
<mask>
<mask> return nil
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove log.Debug("upstream %s is ok", input)
</s> add log.Debug("dnsforward: upstream %q is ok", upstreamAddr) </s> remove return fmt.Errorf("failed to choose upstream for %q: %w", input, err)
</s> add return fmt.Errorf("failed to choose upstream for %q: %w", upstreamAddr, err) </s> remove var u upstream.Upstream
u, err = upstream.AddressToUpstream(input, &upstream.Options{
</s> add u, err := upstream.AddressToUpstream(upstreamAddr, &upstream.Options{ </s> remove // No need to check this DNS server.
if !useDefault {
return nil
}
if input, _, err = separateUpstream(input); err != nil {
</s> add useDefault, err := validateUpstream(upstreamAddr, domains)
if err != nil { </s> remove var useDefault bool
if useDefault, err = validateUpstream(input); err != nil {
</s> add upstreamAddr, domains, err := separateUpstream(upstreamConfigStr)
if err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
log.Debug("dnsforward: upstream %q is ok", upstreamAddr) | <mask> if err = ef(u); err != nil {
<mask> return fmt.Errorf("upstream %q fails to exchange: %w", input, err)
<mask> }
<mask>
<mask> log.Debug("upstream %s is ok", input)
<mask>
<mask> return nil
<mask> }
<mask>
<mask> func (s *Server) handleTestUpstreamDNS(w http.ResponseWriter, r *http.Request) {
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove if err = ef(u); err != nil {
return fmt.Errorf("upstream %q fails to exchange: %w", input, err)
</s> add if err = healthCheck(u); err != nil {
err = fmt.Errorf("upstream %q fails to exchange: %w", upstreamAddr, err)
if domains != nil {
return domainSpecificTestError{error: err}
}
return err </s> remove return fmt.Errorf("failed to choose upstream for %q: %w", input, err)
</s> add return fmt.Errorf("failed to choose upstream for %q: %w", upstreamAddr, err) </s> remove var u upstream.Upstream
u, err = upstream.AddressToUpstream(input, &upstream.Options{
</s> add u, err := upstream.AddressToUpstream(upstreamAddr, &upstream.Options{ </s> remove // No need to check this DNS server.
if !useDefault {
return nil
}
if input, _, err = separateUpstream(input); err != nil {
</s> add useDefault, err := validateUpstream(upstreamAddr, domains)
if err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
if _, ok := err.(domainSpecificTestError); ok {
result[host] = fmt.Sprintf("WARNING: %s", result[host])
} | <mask> if err != nil {
<mask> log.Info("%v", err)
<mask> result[host] = err.Error()
<mask>
<mask> continue
<mask> }
<mask>
<mask> result[host] = "OK"
<mask> }
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove host = strings.TrimPrefix(host, "*.")
err = netutil.ValidateDomainName(host)
</s> add err = netutil.ValidateDomainName(strings.TrimPrefix(host, "*.")) </s> remove // No need to check this DNS server.
if !useDefault {
return nil
}
if input, _, err = separateUpstream(input); err != nil {
</s> add useDefault, err := validateUpstream(upstreamAddr, domains)
if err != nil { </s> remove if err = ef(u); err != nil {
return fmt.Errorf("upstream %q fails to exchange: %w", input, err)
</s> add if err = healthCheck(u); err != nil {
err = fmt.Errorf("upstream %q fails to exchange: %w", upstreamAddr, err)
if domains != nil {
return domainSpecificTestError{error: err}
}
return err | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
if _, ok := err.(domainSpecificTestError); ok {
result[host] = fmt.Sprintf("WARNING: %s", result[host])
} | <mask> // TODO(e.burkov): If passed upstream have already written an error
<mask> // above, we rewriting the error for it. These cases should be
<mask> // handled properly instead.
<mask> result[host] = err.Error()
<mask>
<mask> continue
<mask> }
<mask>
<mask> result[host] = "OK"
<mask> }
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove for _, u := range upstreams {
_, err = validateUpstream(u)
if err != nil {
return nil, err
}
}
</s> add </s> remove func validateUpstream(u string) (useDefault bool, err error) {
// Check if the user tries to specify upstream for domain.
var isDomainSpec bool
u, isDomainSpec, err = separateUpstream(u)
if err != nil {
return !isDomainSpec, err
}
</s> add // validateUpstream returns an error if u alongside with domains is not a valid
// upstream configuration. useDefault is true if the upstream is
// domain-specific and is configured to point at the default upstream server
// which is validated separately. The upstream is considered domain-specific
// only if domains is at least not nil.
func validateUpstream(u string, domains []string) (useDefault bool, err error) { </s> remove if useDefault = !isDomainSpec; u == "#" && isDomainSpec {
</s> add if useDefault = u == "#" && domains != nil; useDefault { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http.go |
wantSet: `validating upstream servers: ` +
`validating upstream "!!!": bad ipport address "!!!": ` + | <mask> name: "upstream_mode_fastest_addr",
<mask> wantSet: "",
<mask> }, {
<mask> name: "upstream_dns_bad",
<mask> wantSet: `validating upstream servers: bad ipport address "!!!": ` +
<mask> `address !!!: missing port in address`,
<mask> }, {
<mask> name: "bootstraps_bad",
<mask> wantSet: `checking bootstrap a: invalid address: ` +
<mask> `Resolver a is not eligible to be a bootstrap DNS server`,
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove name: "valid_with_default",
</s> add name: "with_default", </s> remove wantErr: `cannot prepare the upstream dhcp://fake.dns ([]): unsupported url scheme: dhcp`,
</s> add wantErr: `validating upstream "dhcp://fake.dns": wrong protocol`, </s> remove name: "valid_no_default",
</s> add name: "no_default", </s> remove func checkDNS(input string, bootstrap []string, timeout time.Duration, ef excFunc) (err error) {
if IsCommentOrEmpty(input) {
</s> add // domainSpecificTestError is a wrapper for errors returned by checkDNS to mark
// the tested upstream domain-specific and therefore consider its errors
// non-critical.
//
// TODO(a.garipov): Some common mechanism of distinguishing between errors and
// warnings (non-critical errors) is desired.
type domainSpecificTestError struct {
error
}
// checkDNS checks the upstream server defined by upstreamConfigStr using
// healthCheck for actually exchange messages. It uses bootstrap to resolve the
// upstream's address.
func checkDNS(
upstreamConfigStr string,
bootstrap []string,
timeout time.Duration,
healthCheck healthCheckFunc,
) (err error) {
if IsCommentOrEmpty(upstreamConfigStr) { </s> remove func validateUpstream(u string) (useDefault bool, err error) {
// Check if the user tries to specify upstream for domain.
var isDomainSpec bool
u, isDomainSpec, err = separateUpstream(u)
if err != nil {
return !isDomainSpec, err
}
</s> add // validateUpstream returns an error if u alongside with domains is not a valid
// upstream configuration. useDefault is true if the upstream is
// domain-specific and is configured to point at the default upstream server
// which is validated separately. The upstream is considered domain-specific
// only if domains is at least not nil.
func validateUpstream(u string, domains []string) (useDefault bool, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http_test.go |
name: "no_default", | <mask> name: "comment",
<mask> wantErr: ``,
<mask> set: []string{"# comment"},
<mask> }, {
<mask> name: "valid_no_default",
<mask> wantErr: `no default upstreams specified`,
<mask> set: []string{
<mask> "[/host.com/]1.1.1.1",
<mask> "[//]tls://1.1.1.1",
<mask> "[/www.host.com/]#",
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove name: "valid_with_default",
</s> add name: "with_default", </s> remove wantErr: `cannot prepare the upstream dhcp://fake.dns ([]): unsupported url scheme: dhcp`,
</s> add wantErr: `validating upstream "dhcp://fake.dns": wrong protocol`, </s> remove wantSet: `validating upstream servers: bad ipport address "!!!": ` +
</s> add wantSet: `validating upstream servers: ` +
`validating upstream "!!!": bad ipport address "!!!": ` + </s> remove for _, u := range upstreams {
_, err = validateUpstream(u)
if err != nil {
return nil, err
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http_test.go |
name: "with_default", | <mask> "[/host.com/google.com/]8.8.8.8",
<mask> "[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
<mask> },
<mask> }, {
<mask> name: "valid_with_default",
<mask> wantErr: ``,
<mask> set: []string{
<mask> "[/host.com/]1.1.1.1",
<mask> "[//]tls://1.1.1.1",
<mask> "[/www.host.com/]#",
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove name: "valid_no_default",
</s> add name: "no_default", </s> remove wantErr: `cannot prepare the upstream dhcp://fake.dns ([]): unsupported url scheme: dhcp`,
</s> add wantErr: `validating upstream "dhcp://fake.dns": wrong protocol`, </s> remove wantSet: `validating upstream servers: bad ipport address "!!!": ` +
</s> add wantSet: `validating upstream servers: ` +
`validating upstream "!!!": bad ipport address "!!!": ` + </s> remove Name: "1.0.0.127.in-addr.arpa.",
</s> add Name: inAddrArpaTLD, </s> remove Name: "google-public-dns-a.google.com.",
</s> add Name: testTLD, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http_test.go |
wantErr: `validating upstream "dhcp://fake.dns": wrong protocol`, | <mask> "8.8.8.8",
<mask> },
<mask> }, {
<mask> name: "invalid",
<mask> wantErr: `cannot prepare the upstream dhcp://fake.dns ([]): unsupported url scheme: dhcp`,
<mask> set: []string{"dhcp://fake.dns"},
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
</s> Pull request: 4517 domain specific test
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517.
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic </s> remove name: "valid_with_default",
</s> add name: "with_default", </s> remove name: "valid_no_default",
</s> add name: "no_default", </s> remove wantSet: `validating upstream servers: bad ipport address "!!!": ` +
</s> add wantSet: `validating upstream servers: ` +
`validating upstream "!!!": bad ipport address "!!!": ` + </s> remove for _, u := range upstreams {
_, err = validateUpstream(u)
if err != nil {
return nil, err
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f32da12a86ec21c9a5e41e71b2620a3899d1bcf1 | internal/dnsforward/http_test.go |
// Change the default 0o600 permission to something more acceptable by
// end users.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/3198.
err = tmpFile.Chmod(0o644)
if err != nil {
return updated, fmt.Errorf("changing file mode: %w", err)
}
| <mask> }()
<mask>
<mask> var reader io.Reader
<mask> if filepath.IsAbs(filter.URL) {
<mask> var f io.ReadCloser
<mask> f, err = os.Open(filter.URL)
<mask> if err != nil {
</s> Pull request: all: rework file perms
Updates #3198.
Squashed commit of the following:
commit 3de1ecf4535220cdd769100ef0ea96c166419d12
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 28 18:39:52 2021 +0300
all: imp chlog
commit f1a46efed917c9b70f047505449a816284d7c71e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 28 18:13:55 2021 +0300
all: rework file perms </s> remove os.FileMode(hdr.Mode&0o777),
</s> add os.FileMode(hdr.Mode&0o755), </s> remove err = os.Mkdir(outputName, os.FileMode(hdr.Mode&0o777))
</s> add err = os.Mkdir(outputName, os.FileMode(hdr.Mode&0o755)) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3687104dd1c25330c09ccd57f22ec9bd387296c | internal/home/filter.go |
err = os.Mkdir(outputName, os.FileMode(hdr.Mode&0o755)) | <mask> // has weird assumptions and file mode issues.
<mask> return "", nil
<mask> }
<mask>
<mask> err = os.Mkdir(outputName, os.FileMode(hdr.Mode&0o777))
<mask> if err != nil && !errors.Is(err, os.ErrExist) {
<mask> return "", fmt.Errorf("os.Mkdir(%q): %w", outputName, err)
<mask> }
<mask>
<mask> log.Debug("updater: created directory %q", outputName)
</s> Pull request: all: rework file perms
Updates #3198.
Squashed commit of the following:
commit 3de1ecf4535220cdd769100ef0ea96c166419d12
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 28 18:39:52 2021 +0300
all: imp chlog
commit f1a46efed917c9b70f047505449a816284d7c71e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 28 18:13:55 2021 +0300
all: rework file perms </s> remove os.FileMode(hdr.Mode&0o777),
</s> add os.FileMode(hdr.Mode&0o755), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3687104dd1c25330c09ccd57f22ec9bd387296c | internal/updater/updater.go |
os.FileMode(hdr.Mode&0o755), | <mask> var wc io.WriteCloser
<mask> wc, err = os.OpenFile(
<mask> outputName,
<mask> os.O_WRONLY|os.O_CREATE|os.O_TRUNC,
<mask> os.FileMode(hdr.Mode&0o777),
<mask> )
<mask> if err != nil {
<mask> return "", fmt.Errorf("os.OpenFile(%s): %w", outputName, err)
<mask> }
<mask> defer func() { err = errors.WithDeferred(err, wc.Close()) }()
</s> Pull request: all: rework file perms
Updates #3198.
Squashed commit of the following:
commit 3de1ecf4535220cdd769100ef0ea96c166419d12
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 28 18:39:52 2021 +0300
all: imp chlog
commit f1a46efed917c9b70f047505449a816284d7c71e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 28 18:13:55 2021 +0300
all: rework file perms </s> remove err = os.Mkdir(outputName, os.FileMode(hdr.Mode&0o777))
</s> add err = os.Mkdir(outputName, os.FileMode(hdr.Mode&0o755)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3687104dd1c25330c09ccd57f22ec9bd387296c | internal/updater/updater.go |
import PopoverFiltered from '../ui/PopoverFilter'; | <mask> import { getTrackerData } from '../../helpers/trackers/trackers';
<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 Popover from '../ui/Popover';
<mask> import './Logs.css';
<mask>
<mask> const DOWNLOAD_LOG_FILENAME = 'dns-logs.txt';
<mask>
</s> Added filter name to popover </s> remove url, enabled, lastUpdated: lastUpdated = Date.now(), name = 'Default name', rulesCount: rulesCount = 0,
</s> add id, url, enabled, lastUpdated: lastUpdated = Date.now(), name = 'Default name', rulesCount: rulesCount = 0, </s> remove renderTooltip(isFiltered, rule) {
</s> add renderTooltip(isFiltered, rule, filter) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/components/Logs/index.js |
renderTooltip(isFiltered, rule, filter) { | <mask> this.props.getLogs();
<mask> }
<mask> }
<mask>
<mask> renderTooltip(isFiltered, rule) {
<mask> if (rule) {
<mask> return (isFiltered && <Tooltip text={rule}/>);
<mask> }
<mask> return '';
<mask> }
</s> Added filter name to popover </s> remove return (isFiltered && <Tooltip text={rule}/>);
</s> add return (isFiltered && <PopoverFiltered rule={rule} filter={filter}/>); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/components/Logs/index.js |
return (isFiltered && <PopoverFiltered rule={rule} filter={filter}/>); | <mask> }
<mask>
<mask> renderTooltip(isFiltered, rule) {
<mask> if (rule) {
<mask> return (isFiltered && <Tooltip text={rule}/>);
<mask> }
<mask> return '';
<mask> }
<mask>
<mask> toggleBlocking = (type, domain) => {
</s> Added filter name to popover </s> remove renderTooltip(isFiltered, rule) {
</s> add renderTooltip(isFiltered, rule, filter) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/components/Logs/index.js |
const { filterId } = row.original;
const { filters } = this.props.filtering;
let filterName = '';
if (reason === 'FilteredBlackList' || reason === 'NotFilteredWhiteList') {
if (filterId === 0) {
filterName = 'Custom filtering rules';
} else {
const filterItem = Object.keys(filters)
.filter(key => filters[key].id === filterId);
filterName = filters[filterItem].name;
}
} | <mask> const parsedFilteredReason = reason.replace('Filtered', 'Filtered by ');
<mask> const rule = row && row.original && row.original.rule;
<mask>
<mask> if (isFiltered) {
<mask> return (
<mask> <div className="logs__row">
<mask> <span className="logs__text" title={parsedFilteredReason}>
</s> Added filter name to popover </s> remove {this.renderTooltip(isFiltered, rule)}
</s> add </s> remove return (isFiltered && <Tooltip text={rule}/>);
</s> add return (isFiltered && <PopoverFiltered rule={rule} filter={filter}/>); </s> remove renderTooltip(isFiltered, rule) {
</s> add renderTooltip(isFiltered, rule, filter) { </s> remove {this.renderTooltip(isFiltered, rule)}
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/components/Logs/index.js |
<mask>
<mask> if (isFiltered) {
<mask> return (
<mask> <div className="logs__row">
<mask> {this.renderTooltip(isFiltered, rule)}
<mask> <span className="logs__text" title={parsedFilteredReason}>
<mask> {parsedFilteredReason}
<mask> </span>
<mask> </div>
<mask> );
</s> Added filter name to popover </s> remove {this.renderTooltip(isFiltered, rule)}
</s> add </s> remove {this.renderTooltip(isFiltered, rule)}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/components/Logs/index.js | |
{this.renderTooltip(isFiltered, rule, filterName)} | <mask> {parsedFilteredReason}
<mask> </span>
<mask> </div>
<mask> );
<mask> }
<mask>
<mask> if (responses.length > 0) {
<mask> const liNodes = responses.map((response, index) =>
</s> Added filter name to popover </s> remove {this.renderTooltip(isFiltered, rule)}
</s> add </s> remove {this.renderTooltip(isFiltered, rule)}
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/components/Logs/index.js |
const isRenderTooltip = reason === 'NotFilteredWhiteList';
| <mask> const liNodes = responses.map((response, index) =>
<mask> (<li key={index} title={response}>{response}</li>));
<mask> return (
<mask> <div className="logs__row">
<mask> <ul className="list-unstyled">{liNodes}</ul>
<mask> {this.renderTooltip(isRenderTooltip, rule, filterName)}
</s> Added filter name to popover </s> remove {this.renderTooltip(isFiltered, rule)}
</s> add </s> remove {this.renderTooltip(isFiltered, rule)}
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/components/Logs/index.js |
<mask> const liNodes = responses.map((response, index) =>
<mask> (<li key={index} title={response}>{response}</li>));
<mask> return (
<mask> <div className="logs__row">
<mask> {this.renderTooltip(isFiltered, rule)}
<mask> <ul className="list-unstyled">{liNodes}</ul>
<mask> </div>
<mask> );
<mask> }
<mask> return (
</s> Added filter name to popover </s> remove {this.renderTooltip(isFiltered, rule)}
</s> add </s> remove {this.renderTooltip(isFiltered, rule)}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/components/Logs/index.js | |
{this.renderTooltip(isRenderTooltip, rule, filterName)} | <mask> <div className="logs__row">
<mask> <ul className="list-unstyled">{liNodes}</ul>
<mask> </div>
<mask> );
<mask> }
<mask> return (
<mask> <div className="logs__row">
</s> Added filter name to popover </s> remove {this.renderTooltip(isFiltered, rule)}
</s> add </s> remove {this.renderTooltip(isFiltered, rule)}
</s> add </s> remove {this.renderTooltip(isFiltered, rule)}
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/components/Logs/index.js |
<mask> );
<mask> }
<mask> return (
<mask> <div className="logs__row">
<mask> {this.renderTooltip(isFiltered, rule)}
<mask> <span>Empty</span>
<mask> </div>
<mask> );
<mask> },
<mask> filterMethod: (filter, row) => {
</s> Added filter name to popover </s> remove {this.renderTooltip(isFiltered, rule)}
</s> add </s> remove {this.renderTooltip(isFiltered, rule)}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/components/Logs/index.js | |
{this.renderTooltip(isFiltered, rule, filterName)} | <mask> <div className="logs__row">
<mask> <span>Empty</span>
<mask> </div>
<mask> );
<mask> },
<mask> filterMethod: (filter, row) => {
<mask> if (filter.value === 'filtered') {
</s> Added filter name to popover </s> remove {this.renderTooltip(isFiltered, rule)}
</s> add </s> remove {this.renderTooltip(isFiltered, rule)}
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/components/Logs/index.js |
top: 1px; | <mask> .popover-wrap {
<mask> position: relative;
<mask> display: inline-block;
<mask> vertical-align: middle;
<mask> align-self: flex-start;
<mask> }
</s> Added filter name to popover </s> remove min-width: 275px;
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/components/ui/Popover.css |
align-self: flex-start; | <mask> display: inline-block;
<mask> vertical-align: middle;
<mask> }
<mask>
<mask> .popover__trigger {
<mask> position: relative;
<mask> top: 3px;
<mask> margin: 0 8px;
</s> Added filter name to popover </s> remove min-width: 275px;
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/components/ui/Popover.css |
<mask> .popover__body {
<mask> content: "";
<mask> display: flex;
<mask> position: absolute;
<mask> min-width: 275px;
<mask> bottom: calc(100% + 3px);
<mask> left: 50%;
<mask> padding: 10px 15px;
<mask> font-size: 0.8rem;
<mask> white-space: normal;
</s> Added filter name to popover | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/components/ui/Popover.css | |
min-width: 275px; | <mask> display: flex;
<mask> position: absolute;
<mask> bottom: calc(100% + 3px);
<mask> left: 50%;
<mask> padding: 10px 15px;
<mask> font-size: 0.8rem;
<mask> white-space: normal;
<mask> color: #fff;
</s> Added filter name to popover </s> remove min-width: 275px;
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/components/ui/Popover.css |
.popover__body--filter {
min-width: 100%;
}
| <mask> visibility: hidden;
<mask> opacity: 0;
<mask> }
<mask>
<mask> .popover__body:after {
<mask> content: "";
<mask> position: absolute;
<mask> bottom: -5px;
<mask> left: calc(50% - 6px);
</s> Added filter name to popover </s> remove min-width: 275px;
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/components/ui/Popover.css |
.popover__icon--green {
stroke: #66b574;
}
| <mask> }
<mask>
<mask> .popover__list-title {
<mask> margin-bottom: 3px;
<mask> }
<mask>
</s> Added filter name to popover </s> remove renderTooltip(isFiltered, rule) {
</s> add renderTooltip(isFiltered, rule, filter) { </s> remove return (isFiltered && <Tooltip text={rule}/>);
</s> add return (isFiltered && <PopoverFiltered rule={rule} filter={filter}/>); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/components/ui/Popover.css |
.popover__list-item--nowrap {
max-width: 300px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
| <mask> margin-bottom: 2px;
<mask> }
<mask>
<mask> .popover__list-item:last-child {
<mask> margin-bottom: 0;
<mask> }
<mask>
<mask> .popover__link {
<mask> color: #66b586;
</s> Added filter name to popover </s> remove renderTooltip(isFiltered, rule) {
</s> add renderTooltip(isFiltered, rule, filter) { </s> remove return (isFiltered && <Tooltip text={rule}/>);
</s> add return (isFiltered && <PopoverFiltered rule={rule} filter={filter}/>); | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/components/ui/Popover.css |
filterId, | <mask> reason,
<mask> client,
<mask> rule,
<mask> } = log;
<mask> const { host: domain, type } = question;
<mask> const responsesArray = response ? response.map((response) => {
<mask> const { value, type, ttl } = response;
<mask> return `${type}: ${value} (ttl=${ttl})`;
</s> Added filter name to popover </s> remove url, enabled, lastUpdated: lastUpdated = Date.now(), name = 'Default name', rulesCount: rulesCount = 0,
</s> add id, url, enabled, lastUpdated: lastUpdated = Date.now(), name = 'Default name', rulesCount: rulesCount = 0, </s> remove renderTooltip(isFiltered, rule) {
</s> add renderTooltip(isFiltered, rule, filter) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/helpers/helpers.js |
filterId, | <mask> type,
<mask> response: responsesArray,
<mask> reason,
<mask> client,
<mask> rule,
<mask> };
<mask> });
<mask>
<mask> export const normalizeHistory = history => Object.keys(history).map((key) => {
</s> Added filter name to popover </s> remove url, enabled, lastUpdated: lastUpdated = Date.now(), name = 'Default name', rulesCount: rulesCount = 0,
</s> add id, url, enabled, lastUpdated: lastUpdated = Date.now(), name = 'Default name', rulesCount: rulesCount = 0, </s> remove url, enabled, lastUpdated: formatTime(lastUpdated), name, rulesCount,
</s> add id, url, enabled, lastUpdated: formatTime(lastUpdated), name, rulesCount, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/helpers/helpers.js |
id, url, enabled, lastUpdated: lastUpdated = Date.now(), name = 'Default name', rulesCount: rulesCount = 0, | <mask> export const normalizeFilteringStatus = (filteringStatus) => {
<mask> const { enabled, filters, user_rules: userRules } = filteringStatus;
<mask> const newFilters = filters ? filters.map((filter) => {
<mask> const {
<mask> url, enabled, lastUpdated: lastUpdated = Date.now(), name = 'Default name', rulesCount: rulesCount = 0,
<mask> } = filter;
<mask>
<mask> return {
<mask> url, enabled, lastUpdated: formatTime(lastUpdated), name, rulesCount,
<mask> };
</s> Added filter name to popover </s> remove url, enabled, lastUpdated: formatTime(lastUpdated), name, rulesCount,
</s> add id, url, enabled, lastUpdated: formatTime(lastUpdated), name, rulesCount, </s> remove return (isFiltered && <Tooltip text={rule}/>);
</s> add return (isFiltered && <PopoverFiltered rule={rule} filter={filter}/>); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/helpers/helpers.js |
id, url, enabled, lastUpdated: formatTime(lastUpdated), name, rulesCount, | <mask> url, enabled, lastUpdated: lastUpdated = Date.now(), name = 'Default name', rulesCount: rulesCount = 0,
<mask> } = filter;
<mask>
<mask> return {
<mask> url, enabled, lastUpdated: formatTime(lastUpdated), name, rulesCount,
<mask> };
<mask> }) : [];
<mask> const newUserRules = Array.isArray(userRules) ? userRules.join('\n') : '';
<mask> return { enabled, userRules: newUserRules, filters: newFilters };
<mask> };
</s> Added filter name to popover </s> remove url, enabled, lastUpdated: lastUpdated = Date.now(), name = 'Default name', rulesCount: rulesCount = 0,
</s> add id, url, enabled, lastUpdated: lastUpdated = Date.now(), name = 'Default name', rulesCount: rulesCount = 0, </s> remove return (isFiltered && <Tooltip text={rule}/>);
</s> add return (isFiltered && <PopoverFiltered rule={rule} filter={filter}/>); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f3fa497af3869279000e801edcae35db6fcb6dbf | client/src/helpers/helpers.js |
||NULL.example.org^ | <mask> ) (s *Server) {
<mask> t.Helper()
<mask>
<mask> rules := `||nxdomain.example.org
<mask> ||null.example.org^
<mask> 127.0.0.1 host.example.org
<mask> @@||whitelist.example.org^
<mask> ||127.0.0.255`
<mask> filters := []filtering.Filter{{
<mask> ID: 0, Data: []byte(rules),
</s> Pull request: filtering: fix letter case in cname matching
Updates #3335.
Squashed commit of the following:
commit ff55c112417199e4b04098a32c5f4805b59356f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 12 12:38:46 2021 +0300
filtering: fix letter case in cname matching </s> remove rules := "||nxdomain.example.org^\n||null.example.org^\n127.0.0.1 host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n"
</s> add rules := "||nxdomain.example.org^\n||NULL.example.org^\n127.0.0.1 host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n" </s> remove "null.example.org.": {{1, 2, 3, 4}},
</s> add "NULL.example.org.": {{1, 2, 3, 4}}, </s> remove req := createTestMessageWithType("null.example.org.", dns.TypeA)
</s> add req := createTestMessageWithType("NULL.example.org.", dns.TypeA) </s> remove // 'null.example.org' which is blocked by filters
</s> add // 'NULL.example.org' which is blocked by filters </s> remove a, ok := reply.Answer[0].(*dns.A)
require.True(t, ok)
</s> add ans := reply.Answer[0]
a, ok := ans.(*dns.A)
require.Truef(t, ok, "got %T", ans)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f419896ec64f78ea8b45dce81b082a413bdf3da3 | internal/dnsforward/dnsforward_test.go |
"badhost.": "NULL.example.org.",
"whitelist.example.org.": "NULL.example.org.", | <mask> }
<mask>
<mask> // testCNAMEs is a map of names and CNAMEs necessary for the TestUpstream work.
<mask> var testCNAMEs = map[string]string{
<mask> "badhost.": "null.example.org.",
<mask> "whitelist.example.org.": "null.example.org.",
<mask> }
<mask>
<mask> // testIPv4 is a map of names and IPv4s necessary for the TestUpstream work.
<mask> var testIPv4 = map[string][]net.IP{
<mask> "null.example.org.": {{1, 2, 3, 4}},
</s> Pull request: filtering: fix letter case in cname matching
Updates #3335.
Squashed commit of the following:
commit ff55c112417199e4b04098a32c5f4805b59356f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 12 12:38:46 2021 +0300
filtering: fix letter case in cname matching </s> remove "null.example.org.": {{1, 2, 3, 4}},
</s> add "NULL.example.org.": {{1, 2, 3, 4}}, </s> remove Name: "null.example.org.",
</s> add Name: "NULL.example.org.", </s> remove req = createTestMessageWithType("null.example.org.", dns.TypeAAAA)
</s> add req = createTestMessageWithType("NULL.example.org.", dns.TypeAAAA) </s> remove rules := "||nxdomain.example.org^\n||null.example.org^\n127.0.0.1 host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n"
</s> add rules := "||nxdomain.example.org^\n||NULL.example.org^\n127.0.0.1 host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f419896ec64f78ea8b45dce81b082a413bdf3da3 | internal/dnsforward/dnsforward_test.go |
"NULL.example.org.": {{1, 2, 3, 4}}, | <mask> }
<mask>
<mask> // testIPv4 is a map of names and IPv4s necessary for the TestUpstream work.
<mask> var testIPv4 = map[string][]net.IP{
<mask> "null.example.org.": {{1, 2, 3, 4}},
<mask> "example.org.": {{127, 0, 0, 255}},
<mask> }
<mask>
<mask> func TestBlockCNAMEProtectionEnabled(t *testing.T) {
<mask> s := createTestServer(t, &filtering.Config{}, ServerConfig{
</s> Pull request: filtering: fix letter case in cname matching
Updates #3335.
Squashed commit of the following:
commit ff55c112417199e4b04098a32c5f4805b59356f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 12 12:38:46 2021 +0300
filtering: fix letter case in cname matching </s> remove "badhost.": "null.example.org.",
"whitelist.example.org.": "null.example.org.",
</s> add "badhost.": "NULL.example.org.",
"whitelist.example.org.": "NULL.example.org.", </s> remove rules := "||nxdomain.example.org^\n||null.example.org^\n127.0.0.1 host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n"
</s> add rules := "||nxdomain.example.org^\n||NULL.example.org^\n127.0.0.1 host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n" </s> remove req = createTestMessageWithType("null.example.org.", dns.TypeAAAA)
</s> add req = createTestMessageWithType("NULL.example.org.", dns.TypeAAAA) </s> remove ||null.example.org^
</s> add ||NULL.example.org^ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f419896ec64f78ea8b45dce81b082a413bdf3da3 | internal/dnsforward/dnsforward_test.go |
// 'badhost' has a canonical name 'NULL.example.org' which should be | <mask> startDeferStop(t, s)
<mask>
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> // 'badhost' has a canonical name 'null.example.org' which should be
<mask> // blocked by filters, but protection is disabled so it is not.
<mask> req := createTestMessage("badhost.")
<mask>
<mask> reply, err := dns.Exchange(req, addr.String())
<mask> require.NoError(t, err)
</s> Pull request: filtering: fix letter case in cname matching
Updates #3335.
Squashed commit of the following:
commit ff55c112417199e4b04098a32c5f4805b59356f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 12 12:38:46 2021 +0300
filtering: fix letter case in cname matching </s> remove // 'badhost' has a canonical name 'null.example.org' which is blocked by
</s> add // 'badhost' has a canonical name 'NULL.example.org' which is blocked by </s> remove req := createTestMessageWithType("null.example.org.", dns.TypeA)
</s> add req := createTestMessageWithType("NULL.example.org.", dns.TypeA) </s> remove // 'badhost' has a canonical name 'null.example.org' which is
</s> add // 'badhost' has a canonical name 'NULL.example.org' which is </s> remove // 'null.example.org' which is blocked by filters
</s> add // 'NULL.example.org' which is blocked by filters </s> remove req = createTestMessageWithType("null.example.org.", dns.TypeAAAA)
</s> add req = createTestMessageWithType("NULL.example.org.", dns.TypeAAAA) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f419896ec64f78ea8b45dce81b082a413bdf3da3 | internal/dnsforward/dnsforward_test.go |
// 'badhost' has a canonical name 'NULL.example.org' which is | <mask> host string
<mask> want bool
<mask> }{{
<mask> host: "badhost.",
<mask> // 'badhost' has a canonical name 'null.example.org' which is
<mask> // blocked by filters: response is blocked.
<mask> want: true,
<mask> }, {
<mask> host: "whitelist.example.org.",
<mask> // 'whitelist.example.org' has a canonical name
</s> Pull request: filtering: fix letter case in cname matching
Updates #3335.
Squashed commit of the following:
commit ff55c112417199e4b04098a32c5f4805b59356f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 12 12:38:46 2021 +0300
filtering: fix letter case in cname matching </s> remove // 'null.example.org' which is blocked by filters
</s> add // 'NULL.example.org' which is blocked by filters </s> remove // 'badhost' has a canonical name 'null.example.org' which is blocked by
</s> add // 'badhost' has a canonical name 'NULL.example.org' which is blocked by </s> remove // 'badhost' has a canonical name 'null.example.org' which should be
</s> add // 'badhost' has a canonical name 'NULL.example.org' which should be </s> remove Name: "null.example.org.",
</s> add Name: "NULL.example.org.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f419896ec64f78ea8b45dce81b082a413bdf3da3 | internal/dnsforward/dnsforward_test.go |
// 'NULL.example.org' which is blocked by filters | <mask> want: true,
<mask> }, {
<mask> host: "whitelist.example.org.",
<mask> // 'whitelist.example.org' has a canonical name
<mask> // 'null.example.org' which is blocked by filters
<mask> // but 'whitelist.example.org' is in a whitelist:
<mask> // response isn't blocked.
<mask> want: false,
<mask> }, {
<mask> host: "example.org.",
</s> Pull request: filtering: fix letter case in cname matching
Updates #3335.
Squashed commit of the following:
commit ff55c112417199e4b04098a32c5f4805b59356f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 12 12:38:46 2021 +0300
filtering: fix letter case in cname matching </s> remove // 'badhost' has a canonical name 'null.example.org' which is
</s> add // 'badhost' has a canonical name 'NULL.example.org' which is </s> remove // 'badhost' has a canonical name 'null.example.org' which is blocked by
</s> add // 'badhost' has a canonical name 'NULL.example.org' which is blocked by </s> remove // 'badhost' has a canonical name 'null.example.org' which should be
</s> add // 'badhost' has a canonical name 'NULL.example.org' which should be </s> remove Name: "null.example.org.",
</s> add Name: "NULL.example.org.", </s> remove "badhost.": "null.example.org.",
"whitelist.example.org.": "null.example.org.",
</s> add "badhost.": "NULL.example.org.",
"whitelist.example.org.": "NULL.example.org.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f419896ec64f78ea8b45dce81b082a413bdf3da3 | internal/dnsforward/dnsforward_test.go |
ans := reply.Answer[0]
a, ok := ans.(*dns.A)
require.Truef(t, ok, "got %T", ans)
| <mask>
<mask> assert.Equal(t, dns.RcodeSuccess, reply.Rcode)
<mask> if tc.want {
<mask> require.Len(t, reply.Answer, 1)
<mask> a, ok := reply.Answer[0].(*dns.A)
<mask> require.True(t, ok)
<mask> assert.True(t, a.A.IsUnspecified())
<mask> }
<mask> })
<mask> }
<mask> }
</s> Pull request: filtering: fix letter case in cname matching
Updates #3335.
Squashed commit of the following:
commit ff55c112417199e4b04098a32c5f4805b59356f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 12 12:38:46 2021 +0300
filtering: fix letter case in cname matching </s> remove req = createTestMessageWithType("null.example.org.", dns.TypeAAAA)
</s> add req = createTestMessageWithType("NULL.example.org.", dns.TypeAAAA) </s> remove req := createTestMessageWithType("null.example.org.", dns.TypeA)
</s> add req := createTestMessageWithType("NULL.example.org.", dns.TypeA) </s> remove rules := "||nxdomain.example.org^\n||null.example.org^\n127.0.0.1 host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n"
</s> add rules := "||nxdomain.example.org^\n||NULL.example.org^\n127.0.0.1 host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n" </s> remove "null.example.org.": {{1, 2, 3, 4}},
</s> add "NULL.example.org.": {{1, 2, 3, 4}}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f419896ec64f78ea8b45dce81b082a413bdf3da3 | internal/dnsforward/dnsforward_test.go |
// 'badhost' has a canonical name 'NULL.example.org' which is blocked by | <mask> startDeferStop(t, s)
<mask>
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> // 'badhost' has a canonical name 'null.example.org' which is blocked by
<mask> // filters: response is blocked.
<mask> req := dns.Msg{
<mask> MsgHdr: dns.MsgHdr{
<mask> Id: dns.Id(),
<mask> },
</s> Pull request: filtering: fix letter case in cname matching
Updates #3335.
Squashed commit of the following:
commit ff55c112417199e4b04098a32c5f4805b59356f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 12 12:38:46 2021 +0300
filtering: fix letter case in cname matching </s> remove // 'badhost' has a canonical name 'null.example.org' which should be
</s> add // 'badhost' has a canonical name 'NULL.example.org' which should be </s> remove // 'badhost' has a canonical name 'null.example.org' which is
</s> add // 'badhost' has a canonical name 'NULL.example.org' which is </s> remove // 'null.example.org' which is blocked by filters
</s> add // 'NULL.example.org' which is blocked by filters </s> remove req := createTestMessageWithType("null.example.org.", dns.TypeA)
</s> add req := createTestMessageWithType("NULL.example.org.", dns.TypeA) </s> remove Name: "null.example.org.",
</s> add Name: "NULL.example.org.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f419896ec64f78ea8b45dce81b082a413bdf3da3 | internal/dnsforward/dnsforward_test.go |
Name: "NULL.example.org.", | <mask> Id: dns.Id(),
<mask> RecursionDesired: true,
<mask> },
<mask> Question: []dns.Question{{
<mask> Name: "null.example.org.",
<mask> Qtype: dns.TypeA,
<mask> Qclass: dns.ClassINET,
<mask> }},
<mask> }
<mask>
</s> Pull request: filtering: fix letter case in cname matching
Updates #3335.
Squashed commit of the following:
commit ff55c112417199e4b04098a32c5f4805b59356f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 12 12:38:46 2021 +0300
filtering: fix letter case in cname matching </s> remove // 'badhost' has a canonical name 'null.example.org' which is blocked by
</s> add // 'badhost' has a canonical name 'NULL.example.org' which is blocked by </s> remove "badhost.": "null.example.org.",
"whitelist.example.org.": "null.example.org.",
</s> add "badhost.": "NULL.example.org.",
"whitelist.example.org.": "NULL.example.org.", </s> remove // 'null.example.org' which is blocked by filters
</s> add // 'NULL.example.org' which is blocked by filters </s> remove // 'badhost' has a canonical name 'null.example.org' which is
</s> add // 'badhost' has a canonical name 'NULL.example.org' which is </s> remove a, ok := reply.Answer[0].(*dns.A)
require.True(t, ok)
</s> add ans := reply.Answer[0]
a, ok := ans.(*dns.A)
require.Truef(t, ok, "got %T", ans)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f419896ec64f78ea8b45dce81b082a413bdf3da3 | internal/dnsforward/dnsforward_test.go |
rules := "||nxdomain.example.org^\n||NULL.example.org^\n127.0.0.1 host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n" | <mask> assert.Truef(t, a.A.IsUnspecified(), "dns server %s returned wrong answer instead of 0.0.0.0: %v", addr, a.A)
<mask> }
<mask>
<mask> func TestBlockedCustomIP(t *testing.T) {
<mask> rules := "||nxdomain.example.org^\n||null.example.org^\n127.0.0.1 host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n"
<mask> filters := []filtering.Filter{{
<mask> ID: 0,
<mask> Data: []byte(rules),
<mask> }}
<mask>
</s> Pull request: filtering: fix letter case in cname matching
Updates #3335.
Squashed commit of the following:
commit ff55c112417199e4b04098a32c5f4805b59356f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 12 12:38:46 2021 +0300
filtering: fix letter case in cname matching </s> remove ||null.example.org^
</s> add ||NULL.example.org^ </s> remove "null.example.org.": {{1, 2, 3, 4}},
</s> add "NULL.example.org.": {{1, 2, 3, 4}}, </s> remove a, ok := reply.Answer[0].(*dns.A)
require.True(t, ok)
</s> add ans := reply.Answer[0]
a, ok := ans.(*dns.A)
require.Truef(t, ok, "got %T", ans)
</s> remove req := createTestMessageWithType("null.example.org.", dns.TypeA)
</s> add req := createTestMessageWithType("NULL.example.org.", dns.TypeA) </s> remove // 'null.example.org' which is blocked by filters
</s> add // 'NULL.example.org' which is blocked by filters | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f419896ec64f78ea8b45dce81b082a413bdf3da3 | internal/dnsforward/dnsforward_test.go |
req := createTestMessageWithType("NULL.example.org.", dns.TypeA) | <mask> startDeferStop(t, s)
<mask>
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> req := createTestMessageWithType("null.example.org.", dns.TypeA)
<mask> reply, err := dns.Exchange(req, addr.String())
<mask> require.NoError(t, err)
<mask>
<mask> require.Len(t, reply.Answer, 1)
<mask>
</s> Pull request: filtering: fix letter case in cname matching
Updates #3335.
Squashed commit of the following:
commit ff55c112417199e4b04098a32c5f4805b59356f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 12 12:38:46 2021 +0300
filtering: fix letter case in cname matching </s> remove req = createTestMessageWithType("null.example.org.", dns.TypeAAAA)
</s> add req = createTestMessageWithType("NULL.example.org.", dns.TypeAAAA) </s> remove // 'badhost' has a canonical name 'null.example.org' which should be
</s> add // 'badhost' has a canonical name 'NULL.example.org' which should be </s> remove // 'badhost' has a canonical name 'null.example.org' which is blocked by
</s> add // 'badhost' has a canonical name 'NULL.example.org' which is blocked by </s> remove a, ok := reply.Answer[0].(*dns.A)
require.True(t, ok)
</s> add ans := reply.Answer[0]
a, ok := ans.(*dns.A)
require.Truef(t, ok, "got %T", ans)
</s> remove rules := "||nxdomain.example.org^\n||null.example.org^\n127.0.0.1 host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n"
</s> add rules := "||nxdomain.example.org^\n||NULL.example.org^\n127.0.0.1 host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f419896ec64f78ea8b45dce81b082a413bdf3da3 | internal/dnsforward/dnsforward_test.go |
req = createTestMessageWithType("NULL.example.org.", dns.TypeAAAA) | <mask> require.True(t, ok)
<mask>
<mask> assert.True(t, net.IP{0, 0, 0, 1}.Equal(a.A))
<mask>
<mask> req = createTestMessageWithType("null.example.org.", dns.TypeAAAA)
<mask> reply, err = dns.Exchange(req, addr.String())
<mask> require.NoError(t, err)
<mask>
<mask> require.Len(t, reply.Answer, 1)
<mask>
</s> Pull request: filtering: fix letter case in cname matching
Updates #3335.
Squashed commit of the following:
commit ff55c112417199e4b04098a32c5f4805b59356f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 12 12:38:46 2021 +0300
filtering: fix letter case in cname matching </s> remove req := createTestMessageWithType("null.example.org.", dns.TypeA)
</s> add req := createTestMessageWithType("NULL.example.org.", dns.TypeA) </s> remove a, ok := reply.Answer[0].(*dns.A)
require.True(t, ok)
</s> add ans := reply.Answer[0]
a, ok := ans.(*dns.A)
require.Truef(t, ok, "got %T", ans)
</s> remove // 'badhost' has a canonical name 'null.example.org' which should be
</s> add // 'badhost' has a canonical name 'NULL.example.org' which should be </s> remove "null.example.org.": {{1, 2, 3, 4}},
</s> add "NULL.example.org.": {{1, 2, 3, 4}}, </s> remove "badhost.": "null.example.org.",
"whitelist.example.org.": "null.example.org.",
</s> add "badhost.": "NULL.example.org.",
"whitelist.example.org.": "NULL.example.org.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f419896ec64f78ea8b45dce81b082a413bdf3da3 | internal/dnsforward/dnsforward_test.go |
host = strings.ToLower(host)
| <mask> return Result{}, nil
<mask> }
<mask>
<mask> return d.matchHost(host, qtype, setts)
<mask> }
<mask>
<mask> // CheckHost tries to match the host against filtering rules, then safebrowsing
<mask> // and parental control rules, if they are enabled.
<mask> func (d *DNSFilter) CheckHost(
</s> Pull request: filtering: fix letter case in cname matching
Updates #3335.
Squashed commit of the following:
commit ff55c112417199e4b04098a32c5f4805b59356f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 12 12:38:46 2021 +0300
filtering: fix letter case in cname matching </s> remove "badhost.": "null.example.org.",
"whitelist.example.org.": "null.example.org.",
</s> add "badhost.": "NULL.example.org.",
"whitelist.example.org.": "NULL.example.org.", </s> remove "null.example.org.": {{1, 2, 3, 4}},
</s> add "NULL.example.org.": {{1, 2, 3, 4}}, </s> remove // 'badhost' has a canonical name 'null.example.org' which is
</s> add // 'badhost' has a canonical name 'NULL.example.org' which is </s> remove a, ok := reply.Answer[0].(*dns.A)
require.True(t, ok)
</s> add ans := reply.Answer[0]
a, ok := ans.(*dns.A)
require.Truef(t, ok, "got %T", ans)
</s> remove // 'null.example.org' which is blocked by filters
</s> add // 'NULL.example.org' which is blocked by filters | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f419896ec64f78ea8b45dce81b082a413bdf3da3 | internal/filtering/filtering.go |
import { SMALL_TABLE_DEFAULT_PAGE_SIZE } from '../../../helpers/constants'; | <mask> import PropTypes from 'prop-types';
<mask> import ReactTable from 'react-table';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask>
<mask> class Leases extends Component {
<mask> cellWrap = ({ value }) => (
<mask> <div className="logs__row logs__row--overflow">
</s> - client: fix table pagination </s> remove }
</s> add }; </s> remove }
</s> add }; </s> remove <use xlinkHref="#delete" />
</s> add <use xlinkHref="#delete"/> | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f446186db146b74cc6af3d29cf53ff69adc26e4f | client/src/components/Settings/Dhcp/Leases.js |
pageSize={SMALL_TABLE_DEFAULT_PAGE_SIZE}
showPageSizeOptions={false}
showPagination={leases.length > SMALL_TABLE_DEFAULT_PAGE_SIZE} | <mask> accessor: 'expires',
<mask> Cell: this.cellWrap,
<mask> },
<mask> ]}
<mask> pageSize={100}
<mask> showPagination={true}
<mask> noDataText={t('dhcp_leases_not_found')}
<mask> minRows={6}
<mask> className="-striped -highlight card-table-overflow"
<mask> />
<mask> );
</s> - client: fix table pagination </s> remove pageSize={100}
showPagination={true}
</s> add pageSize={SMALL_TABLE_DEFAULT_PAGE_SIZE}
showPageSizeOptions={false}
showPagination={staticLeases.length > SMALL_TABLE_DEFAULT_PAGE_SIZE} </s> remove <use xlinkHref="#delete" />
</s> add <use xlinkHref="#delete"/> </s> remove }
</s> add }; </s> remove }
</s> add }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f446186db146b74cc6af3d29cf53ff69adc26e4f | client/src/components/Settings/Dhcp/Leases.js |
import { SMALL_TABLE_DEFAULT_PAGE_SIZE } from '../../../../helpers/constants'; | <mask> import React, { Component, Fragment } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import ReactTable from 'react-table';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask>
<mask> import Modal from './Modal';
<mask>
<mask> class StaticLeases extends Component {
</s> - client: fix table pagination </s> remove }
</s> add }; </s> remove }
</s> add }; </s> remove <use xlinkHref="#delete" />
</s> add <use xlinkHref="#delete"/> | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f446186db146b74cc6af3d29cf53ff69adc26e4f | client/src/components/Settings/Dhcp/StaticLeases/index.js |
}; | <mask> );
<mask>
<mask> handleSubmit = (data) => {
<mask> this.props.addStaticLease(data);
<mask> }
<mask>
<mask> handleDelete = (ip, mac, hostname = '') => {
<mask> const name = hostname || ip;
<mask> // eslint-disable-next-line no-alert
<mask> if (window.confirm(this.props.t('delete_confirm', { key: name }))) {
</s> - client: fix table pagination </s> remove }
</s> add }; </s> remove <use xlinkHref="#delete" />
</s> add <use xlinkHref="#delete"/> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f446186db146b74cc6af3d29cf53ff69adc26e4f | client/src/components/Settings/Dhcp/StaticLeases/index.js |
}; | <mask> // eslint-disable-next-line no-alert
<mask> if (window.confirm(this.props.t('delete_confirm', { key: name }))) {
<mask> this.props.removeStaticLease({ ip, mac, hostname });
<mask> }
<mask> }
<mask>
<mask> render() {
<mask> const {
<mask> isModalOpen,
<mask> toggleLeaseModal,
</s> - client: fix table pagination </s> remove }
</s> add }; </s> remove <use xlinkHref="#delete" />
</s> add <use xlinkHref="#delete"/> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/f446186db146b74cc6af3d29cf53ff69adc26e4f | client/src/components/Settings/Dhcp/StaticLeases/index.js |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.