docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep replace replace replace replace replace replace replace keep keep replace | <mask>
<mask> clientID, err = clientIDFromClientServerName(
<mask> hostSrvName,
<mask> cliSrvName,
<mask> s.conf.StrictSNICheck,
<mask> )
<mask> if err != nil {
<mask> return "", fmt.Errorf("clientid check: %w", err)
<mask> }
<mask>
<mask> return clientID, nil
</s> Pull request: 3418-clientid-doh
Closes #3418.
Squashed commit of the following:
commit 8a1180f8ef03d30ea3ae6a3e3121ddcac513f45b
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 17:26:22 2022 +0300
all: imp docs, tests
commit 9629c69b39540db119044f2f79c1c4ed39de911f
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 15:34:33 2022 +0300
dnsforward: accept clientids from doh client srvname </s> remove cliSrvName := ""
</s> add cliSrvName, err := clientServerName(pctx, proto)
if err != nil {
return "", err
}
clientID, err = clientIDFromClientServerName(
hostSrvName,
cliSrvName,
s.conf.StrictSNICheck,
)
if err != nil {
return "", fmt.Errorf("clientid check: %w", err)
}
return clientID, nil
}
// clientServerName returns the TLS server name based on the protocol.
func clientServerName(pctx *proxy.DNSContext, proto proxy.Proto) (srvName string, err error) { </s> remove return clientIDFromDNSContextHTTPS(pctx)
</s> add clientID, err = clientIDFromDNSContextHTTPS(pctx)
if err != nil {
return "", fmt.Errorf("checking url: %w", err)
} else if clientID != "" {
return clientID, nil
}
// Go on and check the domain name as well. </s> remove cliSrvName = conn.ConnectionState().TLS.ServerName
}
</s> add srvName = conn.ConnectionState().TLS.ServerName
case proxy.ProtoTLS:
conn := pctx.Conn
tc, ok := conn.(tlsConn)
if !ok {
return "", fmt.Errorf("proxy ctx conn of proto %s is %T, want *tls.Conn", proto, conn)
} </s> remove case proxy.ProtoTLS:
conn := pctx.Conn
tc, ok := conn.(tlsConn)
if !ok {
return "", fmt.Errorf(
"proxy ctx conn of proto %s is %T, want *tls.Conn",
proto,
conn,
)
</s> add case proxy.ProtoHTTPS:
if connState := pctx.HTTPRequest.TLS; connState != nil {
srvName = pctx.HTTPRequest.TLS.ServerName </s> add HTTPRequest: httpReq, | https://github.com/AdguardTeam/AdGuardHome/commit/330ac303242970d79b557e611bec3227b0af5a7b | internal/dnsforward/clientid.go |
keep keep keep keep replace replace replace replace keep replace keep keep keep keep | <mask> srv := &Server{
<mask> conf: ServerConfig{TLSConfig: tlsConf},
<mask> }
<mask>
<mask> var conn net.Conn
<mask> if tc.proto == proxy.ProtoTLS {
<mask> conn = testTLSConn{
<mask> serverName: tc.cliSrvName,
<mask> }
<mask> }
<mask>
<mask> var qconn quic.Connection
<mask> if tc.proto == proxy.ProtoQUIC {
<mask> qconn = testQUICConnection{
</s> Pull request: 3418-clientid-doh
Closes #3418.
Squashed commit of the following:
commit 8a1180f8ef03d30ea3ae6a3e3121ddcac513f45b
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 17:26:22 2022 +0300
all: imp docs, tests
commit 9629c69b39540db119044f2f79c1c4ed39de911f
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 15:34:33 2022 +0300
dnsforward: accept clientids from doh client srvname </s> remove var qconn quic.Connection
if tc.proto == proxy.ProtoQUIC {
</s> add httpReq = &http.Request{
URL: u,
TLS: connState,
}
case proxy.ProtoQUIC: </s> add case proxy.ProtoTLS:
conn = testTLSConn{
serverName: tc.cliSrvName,
} </s> remove return clientIDFromDNSContextHTTPS(pctx)
</s> add clientID, err = clientIDFromDNSContextHTTPS(pctx)
if err != nil {
return "", fmt.Errorf("checking url: %w", err)
} else if clientID != "" {
return clientID, nil
}
// Go on and check the domain name as well. </s> remove cliSrvName := ""
</s> add cliSrvName, err := clientServerName(pctx, proto)
if err != nil {
return "", err
}
clientID, err = clientIDFromClientServerName(
hostSrvName,
cliSrvName,
s.conf.StrictSNICheck,
)
if err != nil {
return "", fmt.Errorf("clientid check: %w", err)
}
return clientID, nil
}
// clientServerName returns the TLS server name based on the protocol.
func clientServerName(pctx *proxy.DNSContext, proto proxy.Proto) (srvName string, err error) { </s> remove cliSrvName = conn.ConnectionState().TLS.ServerName
}
</s> add srvName = conn.ConnectionState().TLS.ServerName
case proxy.ProtoTLS:
conn := pctx.Conn
tc, ok := conn.(tlsConn)
if !ok {
return "", fmt.Errorf("proxy ctx conn of proto %s is %T, want *tls.Conn", proto, conn)
} | https://github.com/AdguardTeam/AdGuardHome/commit/330ac303242970d79b557e611bec3227b0af5a7b | internal/dnsforward/clientid_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> serverName: tc.cliSrvName,
<mask> }
<mask> }
<mask>
<mask> var qconn quic.Connection
<mask> if tc.proto == proxy.ProtoQUIC {
<mask> qconn = testQUICConnection{
<mask> serverName: tc.cliSrvName,
<mask> }
<mask> }
<mask>
</s> Pull request: 3418-clientid-doh
Closes #3418.
Squashed commit of the following:
commit 8a1180f8ef03d30ea3ae6a3e3121ddcac513f45b
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 17:26:22 2022 +0300
all: imp docs, tests
commit 9629c69b39540db119044f2f79c1c4ed39de911f
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 15:34:33 2022 +0300
dnsforward: accept clientids from doh client srvname </s> remove }
</s> add </s> remove var conn net.Conn
if tc.proto == proxy.ProtoTLS {
conn = testTLSConn{
serverName: tc.cliSrvName,
</s> add var (
conn net.Conn
qconn quic.Connection
httpReq *http.Request
)
switch tc.proto {
case proxy.ProtoHTTPS:
u := &url.URL{
Path: "/dns-query",
}
connState := &tls.ConnectionState{
ServerName: tc.cliSrvName, </s> add case proxy.ProtoTLS:
conn = testTLSConn{
serverName: tc.cliSrvName,
} </s> add connState := &tls.ConnectionState{
ServerName: tc.cliSrvName,
}
</s> remove return clientIDFromDNSContextHTTPS(pctx)
</s> add clientID, err = clientIDFromDNSContextHTTPS(pctx)
if err != nil {
return "", fmt.Errorf("checking url: %w", err)
} else if clientID != "" {
return clientID, nil
}
// Go on and check the domain name as well. </s> remove cliSrvName := ""
</s> add cliSrvName, err := clientServerName(pctx, proto)
if err != nil {
return "", err
}
clientID, err = clientIDFromClientServerName(
hostSrvName,
cliSrvName,
s.conf.StrictSNICheck,
)
if err != nil {
return "", fmt.Errorf("clientid check: %w", err)
}
return clientID, nil
}
// clientServerName returns the TLS server name based on the protocol.
func clientServerName(pctx *proxy.DNSContext, proto proxy.Proto) (srvName string, err error) { | https://github.com/AdguardTeam/AdGuardHome/commit/330ac303242970d79b557e611bec3227b0af5a7b | internal/dnsforward/clientid_test.go |
keep keep keep add keep keep keep keep keep keep | <mask> case proxy.ProtoQUIC:
<mask> qconn = testQUICConnection{
<mask> serverName: tc.cliSrvName,
<mask> }
<mask> }
<mask>
<mask> pctx := &proxy.DNSContext{
<mask> Proto: tc.proto,
<mask> Conn: conn,
<mask> HTTPRequest: httpReq,
</s> Pull request: 3418-clientid-doh
Closes #3418.
Squashed commit of the following:
commit 8a1180f8ef03d30ea3ae6a3e3121ddcac513f45b
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 17:26:22 2022 +0300
all: imp docs, tests
commit 9629c69b39540db119044f2f79c1c4ed39de911f
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 15:34:33 2022 +0300
dnsforward: accept clientids from doh client srvname </s> add HTTPRequest: httpReq, </s> remove var qconn quic.Connection
if tc.proto == proxy.ProtoQUIC {
</s> add httpReq = &http.Request{
URL: u,
TLS: connState,
}
case proxy.ProtoQUIC: </s> add TLS: connState, </s> remove }
</s> add </s> remove var conn net.Conn
if tc.proto == proxy.ProtoTLS {
conn = testTLSConn{
serverName: tc.cliSrvName,
</s> add var (
conn net.Conn
qconn quic.Connection
httpReq *http.Request
)
switch tc.proto {
case proxy.ProtoHTTPS:
u := &url.URL{
Path: "/dns-query",
}
connState := &tls.ConnectionState{
ServerName: tc.cliSrvName, </s> remove
cliSrvName = tc.ConnectionState().ServerName
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/330ac303242970d79b557e611bec3227b0af5a7b | internal/dnsforward/clientid_test.go |
keep keep add keep keep keep keep keep keep | <mask> pctx := &proxy.DNSContext{
<mask> Proto: tc.proto,
<mask> Conn: conn,
<mask> QUICConnection: qconn,
<mask> }
<mask>
<mask> clientID, err := srv.clientIDFromDNSContext(pctx)
<mask> assert.Equal(t, tc.wantClientID, clientID)
<mask>
</s> Pull request: 3418-clientid-doh
Closes #3418.
Squashed commit of the following:
commit 8a1180f8ef03d30ea3ae6a3e3121ddcac513f45b
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 17:26:22 2022 +0300
all: imp docs, tests
commit 9629c69b39540db119044f2f79c1c4ed39de911f
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 15:34:33 2022 +0300
dnsforward: accept clientids from doh client srvname </s> add case proxy.ProtoTLS:
conn = testTLSConn{
serverName: tc.cliSrvName,
} </s> add TLS: connState, </s> remove clientID, err = clientIDFromClientServerName(
hostSrvName,
cliSrvName,
s.conf.StrictSNICheck,
)
if err != nil {
return "", fmt.Errorf("clientid check: %w", err)
</s> add srvName = tc.ConnectionState().ServerName </s> remove cliSrvName := ""
</s> add cliSrvName, err := clientServerName(pctx, proto)
if err != nil {
return "", err
}
clientID, err = clientIDFromClientServerName(
hostSrvName,
cliSrvName,
s.conf.StrictSNICheck,
)
if err != nil {
return "", fmt.Errorf("clientid check: %w", err)
}
return clientID, nil
}
// clientServerName returns the TLS server name based on the protocol.
func clientServerName(pctx *proxy.DNSContext, proto proxy.Proto) (srvName string, err error) { </s> remove return clientID, nil
</s> add return srvName, nil </s> remove return clientIDFromDNSContextHTTPS(pctx)
</s> add clientID, err = clientIDFromDNSContextHTTPS(pctx)
if err != nil {
return "", fmt.Errorf("checking url: %w", err)
} else if clientID != "" {
return clientID, nil
}
// Go on and check the domain name as well. | https://github.com/AdguardTeam/AdGuardHome/commit/330ac303242970d79b557e611bec3227b0af5a7b | internal/dnsforward/clientid_test.go |
keep add keep keep keep keep | <mask> name string
<mask> path string
<mask> wantClientID string
<mask> wantErrMsg string
<mask> }{{
<mask> name: "no_clientid",
</s> Pull request: 3418-clientid-doh
Closes #3418.
Squashed commit of the following:
commit 8a1180f8ef03d30ea3ae6a3e3121ddcac513f45b
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 17:26:22 2022 +0300
all: imp docs, tests
commit 9629c69b39540db119044f2f79c1c4ed39de911f
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 15:34:33 2022 +0300
dnsforward: accept clientids from doh client srvname </s> remove return clientIDFromDNSContextHTTPS(pctx)
</s> add clientID, err = clientIDFromDNSContextHTTPS(pctx)
if err != nil {
return "", fmt.Errorf("checking url: %w", err)
} else if clientID != "" {
return clientID, nil
}
// Go on and check the domain name as well. </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add }, {
name: "both_ids",
path: "/dns-query/right",
cliSrvName: "wrong.example.com",
wantClientID: "right",
wantErrMsg: "", | https://github.com/AdguardTeam/AdGuardHome/commit/330ac303242970d79b557e611bec3227b0af5a7b | internal/dnsforward/clientid_test.go |
keep add keep keep keep keep keep keep | <mask> name: "no_clientid",
<mask> path: "/dns-query",
<mask> wantClientID: "",
<mask> wantErrMsg: "",
<mask> }, {
<mask> name: "no_clientid_slash",
<mask> path: "/dns-query/",
<mask> cliSrvName: "example.com",
</s> Pull request: 3418-clientid-doh
Closes #3418.
Squashed commit of the following:
commit 8a1180f8ef03d30ea3ae6a3e3121ddcac513f45b
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 17:26:22 2022 +0300
all: imp docs, tests
commit 9629c69b39540db119044f2f79c1c4ed39de911f
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 15:34:33 2022 +0300
dnsforward: accept clientids from doh client srvname </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", | https://github.com/AdguardTeam/AdGuardHome/commit/330ac303242970d79b557e611bec3227b0af5a7b | internal/dnsforward/clientid_test.go |
keep keep keep add keep keep keep keep keep | <mask> wantErrMsg: "",
<mask> }, {
<mask> name: "no_clientid_slash",
<mask> path: "/dns-query/",
<mask> wantClientID: "",
<mask> wantErrMsg: "",
<mask> }, {
<mask> name: "clientid",
<mask> path: "/dns-query/cli",
</s> Pull request: 3418-clientid-doh
Closes #3418.
Squashed commit of the following:
commit 8a1180f8ef03d30ea3ae6a3e3121ddcac513f45b
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 17:26:22 2022 +0300
all: imp docs, tests
commit 9629c69b39540db119044f2f79c1c4ed39de911f
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 15:34:33 2022 +0300
dnsforward: accept clientids from doh client srvname </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", | https://github.com/AdguardTeam/AdGuardHome/commit/330ac303242970d79b557e611bec3227b0af5a7b | internal/dnsforward/clientid_test.go |
keep add keep keep keep keep | <mask> name: "clientid",
<mask> path: "/dns-query/cli",
<mask> wantClientID: "cli",
<mask> wantErrMsg: "",
<mask> }, {
<mask> name: "clientid_slash",
</s> Pull request: 3418-clientid-doh
Closes #3418.
Squashed commit of the following:
commit 8a1180f8ef03d30ea3ae6a3e3121ddcac513f45b
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 17:26:22 2022 +0300
all: imp docs, tests
commit 9629c69b39540db119044f2f79c1c4ed39de911f
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 15:34:33 2022 +0300
dnsforward: accept clientids from doh client srvname </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", | https://github.com/AdguardTeam/AdGuardHome/commit/330ac303242970d79b557e611bec3227b0af5a7b | internal/dnsforward/clientid_test.go |
keep keep keep add keep keep keep keep keep keep | <mask> wantErrMsg: "",
<mask> }, {
<mask> name: "clientid_slash",
<mask> path: "/dns-query/cli/",
<mask> wantClientID: "cli",
<mask> wantErrMsg: "",
<mask> }, {
<mask> name: "clientid_case",
<mask> path: "/dns-query/InSeNsItIvE",
<mask> cliSrvName: "example.com",
</s> Pull request: 3418-clientid-doh
Closes #3418.
Squashed commit of the following:
commit 8a1180f8ef03d30ea3ae6a3e3121ddcac513f45b
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 17:26:22 2022 +0300
all: imp docs, tests
commit 9629c69b39540db119044f2f79c1c4ed39de911f
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 15:34:33 2022 +0300
dnsforward: accept clientids from doh client srvname </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", | https://github.com/AdguardTeam/AdGuardHome/commit/330ac303242970d79b557e611bec3227b0af5a7b | internal/dnsforward/clientid_test.go |
keep add keep keep keep keep keep keep | <mask> name: "clientid_case",
<mask> path: "/dns-query/InSeNsItIvE",
<mask> wantClientID: "insensitive",
<mask> wantErrMsg: ``,
<mask> }, {
<mask> name: "bad_url",
<mask> path: "/foo",
<mask> cliSrvName: "example.com",
</s> Pull request: 3418-clientid-doh
Closes #3418.
Squashed commit of the following:
commit 8a1180f8ef03d30ea3ae6a3e3121ddcac513f45b
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 17:26:22 2022 +0300
all: imp docs, tests
commit 9629c69b39540db119044f2f79c1c4ed39de911f
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 15:34:33 2022 +0300
dnsforward: accept clientids from doh client srvname </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", | https://github.com/AdguardTeam/AdGuardHome/commit/330ac303242970d79b557e611bec3227b0af5a7b | internal/dnsforward/clientid_test.go |
keep keep keep add keep keep keep keep | <mask> wantErrMsg: ``,
<mask> }, {
<mask> name: "bad_url",
<mask> path: "/foo",
<mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: invalid path "/foo"`,
<mask> }, {
<mask> name: "extra",
</s> Pull request: 3418-clientid-doh
Closes #3418.
Squashed commit of the following:
commit 8a1180f8ef03d30ea3ae6a3e3121ddcac513f45b
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 17:26:22 2022 +0300
all: imp docs, tests
commit 9629c69b39540db119044f2f79c1c4ed39de911f
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 15:34:33 2022 +0300
dnsforward: accept clientids from doh client srvname </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add }, {
name: "both_ids",
path: "/dns-query/right",
cliSrvName: "wrong.example.com",
wantClientID: "right",
wantErrMsg: "", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", | https://github.com/AdguardTeam/AdGuardHome/commit/330ac303242970d79b557e611bec3227b0af5a7b | internal/dnsforward/clientid_test.go |
keep add keep keep keep keep keep | <mask> name: "extra",
<mask> path: "/dns-query/cli/foo",
<mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: invalid path "/dns-query/cli/foo": extra parts`,
<mask> }, {
<mask> name: "invalid_clientid",
<mask> path: "/dns-query/!!!",
</s> Pull request: 3418-clientid-doh
Closes #3418.
Squashed commit of the following:
commit 8a1180f8ef03d30ea3ae6a3e3121ddcac513f45b
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 17:26:22 2022 +0300
all: imp docs, tests
commit 9629c69b39540db119044f2f79c1c4ed39de911f
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 15:34:33 2022 +0300
dnsforward: accept clientids from doh client srvname </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add }, {
name: "both_ids",
path: "/dns-query/right",
cliSrvName: "wrong.example.com",
wantClientID: "right",
wantErrMsg: "", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", | https://github.com/AdguardTeam/AdGuardHome/commit/330ac303242970d79b557e611bec3227b0af5a7b | internal/dnsforward/clientid_test.go |
keep add keep keep keep keep keep | <mask> name: "invalid_clientid",
<mask> path: "/dns-query/!!!",
<mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: invalid clientid "!!!": bad domain name label rune '!'`,
<mask> }, {
<mask> name: "both_ids",
<mask> path: "/dns-query/right",
</s> Pull request: 3418-clientid-doh
Closes #3418.
Squashed commit of the following:
commit 8a1180f8ef03d30ea3ae6a3e3121ddcac513f45b
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 17:26:22 2022 +0300
all: imp docs, tests
commit 9629c69b39540db119044f2f79c1c4ed39de911f
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 15:34:33 2022 +0300
dnsforward: accept clientids from doh client srvname </s> add }, {
name: "both_ids",
path: "/dns-query/right",
cliSrvName: "wrong.example.com",
wantClientID: "right",
wantErrMsg: "", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", | https://github.com/AdguardTeam/AdGuardHome/commit/330ac303242970d79b557e611bec3227b0af5a7b | internal/dnsforward/clientid_test.go |
keep keep add keep keep keep keep keep keep | <mask> cliSrvName: "example.com",
<mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: invalid clientid "!!!": bad domain name label rune '!'`,
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> connState := &tls.ConnectionState{
<mask> ServerName: tc.cliSrvName,
</s> Pull request: 3418-clientid-doh
Closes #3418.
Squashed commit of the following:
commit 8a1180f8ef03d30ea3ae6a3e3121ddcac513f45b
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 17:26:22 2022 +0300
all: imp docs, tests
commit 9629c69b39540db119044f2f79c1c4ed39de911f
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 15:34:33 2022 +0300
dnsforward: accept clientids from doh client srvname </s> add connState := &tls.ConnectionState{
ServerName: tc.cliSrvName,
}
</s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", </s> remove var conn net.Conn
if tc.proto == proxy.ProtoTLS {
conn = testTLSConn{
serverName: tc.cliSrvName,
</s> add var (
conn net.Conn
qconn quic.Connection
httpReq *http.Request
)
switch tc.proto {
case proxy.ProtoHTTPS:
u := &url.URL{
Path: "/dns-query",
}
connState := &tls.ConnectionState{
ServerName: tc.cliSrvName, </s> add cliSrvName: "example.com", | https://github.com/AdguardTeam/AdGuardHome/commit/330ac303242970d79b557e611bec3227b0af5a7b | internal/dnsforward/clientid_test.go |
keep keep keep add keep keep keep keep | <mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> r := &http.Request{
<mask> URL: &url.URL{
<mask> Path: tc.path,
<mask> },
</s> Pull request: 3418-clientid-doh
Closes #3418.
Squashed commit of the following:
commit 8a1180f8ef03d30ea3ae6a3e3121ddcac513f45b
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 17:26:22 2022 +0300
all: imp docs, tests
commit 9629c69b39540db119044f2f79c1c4ed39de911f
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 15:34:33 2022 +0300
dnsforward: accept clientids from doh client srvname </s> add }, {
name: "both_ids",
path: "/dns-query/right",
cliSrvName: "wrong.example.com",
wantClientID: "right",
wantErrMsg: "", </s> add TLS: connState, </s> remove var qconn quic.Connection
if tc.proto == proxy.ProtoQUIC {
</s> add httpReq = &http.Request{
URL: u,
TLS: connState,
}
case proxy.ProtoQUIC: </s> remove var conn net.Conn
if tc.proto == proxy.ProtoTLS {
conn = testTLSConn{
serverName: tc.cliSrvName,
</s> add var (
conn net.Conn
qconn quic.Connection
httpReq *http.Request
)
switch tc.proto {
case proxy.ProtoHTTPS:
u := &url.URL{
Path: "/dns-query",
}
connState := &tls.ConnectionState{
ServerName: tc.cliSrvName, </s> add cliSrvName: "example.com", </s> add cliSrvName: "example.com", | https://github.com/AdguardTeam/AdGuardHome/commit/330ac303242970d79b557e611bec3227b0af5a7b | internal/dnsforward/clientid_test.go |
keep keep add keep keep keep keep keep | <mask> URL: &url.URL{
<mask> Path: tc.path,
<mask> },
<mask> }
<mask>
<mask> pctx := &proxy.DNSContext{
<mask> Proto: proxy.ProtoHTTPS,
<mask> HTTPRequest: r,
</s> Pull request: 3418-clientid-doh
Closes #3418.
Squashed commit of the following:
commit 8a1180f8ef03d30ea3ae6a3e3121ddcac513f45b
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 17:26:22 2022 +0300
all: imp docs, tests
commit 9629c69b39540db119044f2f79c1c4ed39de911f
Author: Ainar Garipov <[email protected]>
Date: Wed Oct 5 15:34:33 2022 +0300
dnsforward: accept clientids from doh client srvname </s> add HTTPRequest: httpReq, </s> add connState := &tls.ConnectionState{
ServerName: tc.cliSrvName,
}
</s> add case proxy.ProtoTLS:
conn = testTLSConn{
serverName: tc.cliSrvName,
} </s> remove var conn net.Conn
if tc.proto == proxy.ProtoTLS {
conn = testTLSConn{
serverName: tc.cliSrvName,
</s> add var (
conn net.Conn
qconn quic.Connection
httpReq *http.Request
)
switch tc.proto {
case proxy.ProtoHTTPS:
u := &url.URL{
Path: "/dns-query",
}
connState := &tls.ConnectionState{
ServerName: tc.cliSrvName, </s> remove var qconn quic.Connection
if tc.proto == proxy.ProtoQUIC {
</s> add httpReq = &http.Request{
URL: u,
TLS: connState,
}
case proxy.ProtoQUIC: </s> remove cliSrvName = conn.ConnectionState().TLS.ServerName
}
</s> add srvName = conn.ConnectionState().TLS.ServerName
case proxy.ProtoTLS:
conn := pctx.Conn
tc, ok := conn.(tlsConn)
if !ok {
return "", fmt.Errorf("proxy ctx conn of proto %s is %T, want *tls.Conn", proto, conn)
} | https://github.com/AdguardTeam/AdGuardHome/commit/330ac303242970d79b557e611bec3227b0af5a7b | internal/dnsforward/clientid_test.go |
keep keep replace keep keep replace keep keep | <mask> :root {
<mask> --yellow-pale: rgba(247, 181, 0, 0.1);
<mask> --green79: #67B279;
<mask> --gray-a5: #a5a5a5;
<mask> --gray-d8: #d8d8d8;
<mask> --gray-f3: #F3F3F3;
<mask> --font-family-monospace: Monaco, Menlo, "Ubuntu Mono", Consolas, source-code-pro, monospace;
<mask> }
</s> Fix a couple of stylelint violations </s> remove --btn-unblock-disabled: #D8D8D8;
--btn-unblock-active: #4D4D4D;
</s> add --btn-unblock-disabled: #d8d8d8;
--btn-unblock-active: #4d4d4d; </s> remove content: ':';
</s> add content: ":"; </s> remove .dashboard-title__button{
</s> add .dashboard-title__button { </s> remove .dashboard-title__button{
</s> add .dashboard-title__button { </s> remove background: var(--white) url('../ui/svg/chevron-down.svg') no-repeat;
</s> add background: var(--white) url("../ui/svg/chevron-down.svg") no-repeat; | https://github.com/AdguardTeam/AdGuardHome/commit/334b3fc636025657ac6af2df0b90ec01332c8187 | client/src/components/App/index.css |
keep keep keep keep replace keep keep keep keep keep | <mask> display: flex;
<mask> align-items: center;
<mask> }
<mask>
<mask> .dashboard-title__button{
<mask> margin: 0 0.5rem;
<mask> }
<mask>
<mask> @media (max-width: 767.98px) {
<mask> .page-title--dashboard {
</s> Fix a couple of stylelint violations </s> remove .dashboard-title__button{
</s> add .dashboard-title__button { </s> remove --btn-unblock-disabled: #D8D8D8;
--btn-unblock-active: #4D4D4D;
</s> add --btn-unblock-disabled: #d8d8d8;
--btn-unblock-active: #4d4d4d; </s> remove content: ':';
</s> add content: ":"; </s> remove background: var(--white) url('../ui/svg/chevron-down.svg') no-repeat;
</s> add background: var(--white) url("../ui/svg/chevron-down.svg") no-repeat; </s> remove --gray-f3: #F3F3F3;
</s> add --gray-f3: #f3f3f3; </s> remove content: '';
</s> add content: ""; | https://github.com/AdguardTeam/AdGuardHome/commit/334b3fc636025657ac6af2df0b90ec01332c8187 | client/src/components/Dashboard/Dashboard.css |
keep keep keep keep replace keep keep keep keep | <mask> flex-direction: column;
<mask> align-items: flex-start;
<mask> }
<mask>
<mask> .dashboard-title__button{
<mask> margin: 0.5rem 0;
<mask> display: block;
<mask> }
<mask> }
</s> Fix a couple of stylelint violations </s> remove .dashboard-title__button{
</s> add .dashboard-title__button { </s> remove --gray-f3: #F3F3F3;
</s> add --gray-f3: #f3f3f3; </s> remove content: ':';
</s> add content: ":"; </s> remove content: '';
</s> add content: ""; </s> remove background: var(--white) url('../ui/svg/chevron-down.svg') no-repeat;
</s> add background: var(--white) url("../ui/svg/chevron-down.svg") no-repeat; </s> remove --btn-unblock-disabled: #D8D8D8;
--btn-unblock-active: #4D4D4D;
</s> add --btn-unblock-disabled: #d8d8d8;
--btn-unblock-active: #4d4d4d; | https://github.com/AdguardTeam/AdGuardHome/commit/334b3fc636025657ac6af2df0b90ec01332c8187 | client/src/components/Dashboard/Dashboard.css |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> .grid .key-colon:nth-child(odd)::after {
<mask> content: ':';
<mask> }
<mask>
<mask> .grid__one-row {
<mask> grid-template-columns: 15rem;
<mask> }
</s> Fix a couple of stylelint violations </s> remove content: '';
</s> add content: ""; </s> remove .dashboard-title__button{
</s> add .dashboard-title__button { </s> remove .dashboard-title__button{
</s> add .dashboard-title__button { </s> remove background: var(--white) url('../ui/svg/chevron-down.svg') no-repeat;
</s> add background: var(--white) url("../ui/svg/chevron-down.svg") no-repeat; </s> remove --btn-unblock-disabled: #D8D8D8;
--btn-unblock-active: #4D4D4D;
</s> add --btn-unblock-disabled: #d8d8d8;
--btn-unblock-active: #4d4d4d; </s> remove --green79: #67B279;
</s> add --green79: #67b279; | https://github.com/AdguardTeam/AdGuardHome/commit/334b3fc636025657ac6af2df0b90ec01332c8187 | client/src/components/Logs/Cells/IconTooltip.css |
keep keep keep keep replace keep keep keep keep keep | <mask> padding-top: 2rem;
<mask> }
<mask>
<mask> .title--border:before {
<mask> content: '';
<mask> position: absolute;
<mask> left: 0;
<mask> border-top: 0.5px solid var(--gray-d8) !important;
<mask> width: 100%;
<mask> margin-top: -1rem;
</s> Fix a couple of stylelint violations </s> remove content: ':';
</s> add content: ":"; </s> remove .dashboard-title__button{
</s> add .dashboard-title__button { </s> remove --gray-f3: #F3F3F3;
</s> add --gray-f3: #f3f3f3; </s> remove .dashboard-title__button{
</s> add .dashboard-title__button { </s> remove background: var(--white) url('../ui/svg/chevron-down.svg') no-repeat;
</s> add background: var(--white) url("../ui/svg/chevron-down.svg") no-repeat; </s> remove --btn-unblock-disabled: #D8D8D8;
--btn-unblock-active: #4D4D4D;
</s> add --btn-unblock-disabled: #d8d8d8;
--btn-unblock-active: #4d4d4d; | https://github.com/AdguardTeam/AdGuardHome/commit/334b3fc636025657ac6af2df0b90ec01332c8187 | client/src/components/Logs/Cells/IconTooltip.css |
keep keep keep keep replace replace keep keep replace | <mask> --size-domain: 180;
<mask> --size-response: 150;
<mask> --size-client: 123;
<mask> --gray-216: rgba(216, 216, 216, 0.23);
<mask> --gray-4d: #4D4D4D;
<mask> --gray-f3: #F3F3F3;
<mask> --gray-8: #888;
<mask> --gray-3: #333;
<mask> --danger: #DF3812;
</s> Fix a couple of stylelint violations </s> remove
--btn-block: #C23814;
--btn-block-disabled: #E3B3A6;
--btn-block-active: #A62200;
</s> add --btn-block: #c23814;
--btn-block-disabled: #e3b3a6;
--btn-block-active: #a62200; </s> remove --gray-f3: #F3F3F3;
</s> add --gray-f3: #f3f3f3; </s> remove --green79: #67B279;
</s> add --green79: #67b279; </s> remove --btn-unblock-disabled: #D8D8D8;
--btn-unblock-active: #4D4D4D;
</s> add --btn-unblock-disabled: #d8d8d8;
--btn-unblock-active: #4d4d4d; </s> remove background: var(--white) url('../ui/svg/chevron-down.svg') no-repeat;
</s> add background: var(--white) url("../ui/svg/chevron-down.svg") no-repeat; | https://github.com/AdguardTeam/AdGuardHome/commit/334b3fc636025657ac6af2df0b90ec01332c8187 | client/src/components/Logs/Logs.css |
keep keep replace replace replace replace replace keep replace replace replace keep keep | <mask> --danger: #DF3812;
<mask> --white80: rgba(255, 255, 255, 0.8);
<mask>
<mask> --btn-block: #C23814;
<mask> --btn-block-disabled: #E3B3A6;
<mask> --btn-block-active: #A62200;
<mask>
<mask> --btn-unblock: #888888;
<mask> --btn-unblock-disabled: #D8D8D8;
<mask> --btn-unblock-active: #4D4D4D;
<mask>
<mask> --option-border-radius: 4px;
<mask> }
</s> Fix a couple of stylelint violations </s> remove --danger: #DF3812;
</s> add --danger: #df3812; </s> remove --gray-4d: #4D4D4D;
--gray-f3: #F3F3F3;
</s> add --gray-4d: #4d4d4d;
--gray-f3: #f3f3f3; </s> remove content: ':';
</s> add content: ":"; </s> remove .dashboard-title__button{
</s> add .dashboard-title__button { </s> remove .dashboard-title__button{
</s> add .dashboard-title__button { | https://github.com/AdguardTeam/AdGuardHome/commit/334b3fc636025657ac6af2df0b90ec01332c8187 | client/src/components/Logs/Logs.css |
keep keep keep keep replace keep keep keep keep keep | <mask> cursor: pointer;
<mask> }
<mask>
<mask> .custom-select__arrow--left {
<mask> background: var(--white) url('../ui/svg/chevron-down.svg') no-repeat;
<mask> background-position: 5px 9px;
<mask> background-size: 22px;
<mask> }
<mask>
<mask> .custom-select--logs {
</s> Fix a couple of stylelint violations </s> remove content: ':';
</s> add content: ":"; </s> remove .dashboard-title__button{
</s> add .dashboard-title__button { </s> remove .dashboard-title__button{
</s> add .dashboard-title__button { </s> remove --btn-unblock-disabled: #D8D8D8;
--btn-unblock-active: #4D4D4D;
</s> add --btn-unblock-disabled: #d8d8d8;
--btn-unblock-active: #4d4d4d; </s> remove content: '';
</s> add content: ""; </s> remove --green79: #67B279;
</s> add --green79: #67b279; | https://github.com/AdguardTeam/AdGuardHome/commit/334b3fc636025657ac6af2df0b90ec01332c8187 | client/src/components/Logs/Logs.css |
keep add keep keep keep keep keep | <mask> REWRITE: 'Rewrite',
<mask> REWRITE_HOSTS: 'RewriteEtcHosts',
<mask> FILTERED_SAFE_SEARCH: 'FilteredSafeSearch',
<mask> FILTERED_SAFE_BROWSING: 'FilteredSafeBrowsing',
<mask> FILTERED_PARENTAL: 'FilteredParental',
<mask> };
<mask>
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove res.Reason = ReasonRewrite
</s> add res.Reason = Rewritten </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove Reason: DNSRewriteRule,
</s> add Reason: RewrittenRule, | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | client/src/helpers/constants.js |
keep keep add keep keep keep keep keep | <mask> LABEL: RESPONSE_FILTER.REWRITTEN.LABEL,
<mask> COLOR: QUERY_STATUS_COLORS.BLUE,
<mask> },
<mask> [FILTERED_STATUS.FILTERED_SAFE_BROWSING]: {
<mask> LABEL: RESPONSE_FILTER.BLOCKED_THREATS.LABEL,
<mask> COLOR: QUERY_STATUS_COLORS.YELLOW,
<mask> },
<mask> [FILTERED_STATUS.FILTERED_PARENTAL]: {
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove } else if res.Reason == dnsfilter.DNSRewriteRule {
</s> add } else if res.Reason == dnsfilter.RewrittenRule { </s> remove } else if res.Reason == dnsfilter.ReasonRewrite || res.Reason == dnsfilter.RewriteAutoHosts {
</s> add } else if res.Reason == dnsfilter.Rewritten || res.Reason == dnsfilter.RewrittenAutoHosts { </s> remove if res.Reason == DNSRewriteRule && res.CanonName == host {
</s> add if res.Reason == RewrittenRule && res.CanonName == host { </s> remove } else if res.Reason == dnsfilter.RewriteAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove result.Reason = RewriteAutoHosts
</s> add result.Reason = RewrittenAutoHosts </s> remove res.Reason = ReasonRewrite
</s> add res.Reason = Rewritten | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | client/src/helpers/constants.js |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> FilteredSafeSearch
<mask> // FilteredBlockedService - the host is blocked by "blocked services" settings
<mask> FilteredBlockedService
<mask>
<mask> // ReasonRewrite is returned when there was a rewrite by
<mask> // a legacy DNS Rewrite rule.
<mask> ReasonRewrite
<mask>
<mask> // RewriteAutoHosts is returned when there was a rewrite by
<mask> // autohosts rules (/etc/hosts and so on).
<mask> RewriteAutoHosts
<mask>
<mask> // DNSRewriteRule is returned when a $dnsrewrite filter rule was
<mask> // applied.
<mask> DNSRewriteRule
<mask> )
<mask>
<mask> // TODO(a.garipov): Resync with actual code names or replace completely
<mask> // in HTTP API v1.
<mask> var reasonNames = []string{
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove if res.Reason == DNSRewriteRule && res.CanonName == host {
</s> add if res.Reason == RewrittenRule && res.CanonName == host { </s> remove // It is empty unless Reason is set to ReasonRewrite.
</s> add // It is empty unless Reason is set to Rewritten or RewrittenRule. </s> remove // Reason is set to RewriteAutoHosts or ReasonRewrite.
</s> add // Reason is set to RewrittenAutoHosts or Rewritten. </s> remove // empty unless Reason is set to RewriteAutoHosts.
</s> add // empty unless Reason is set to RewrittenAutoHosts. </s> remove - 'DNSRewriteRule'
</s> add - 'RewriteRule' </s> remove result.Reason = RewriteAutoHosts
</s> add result.Reason = RewrittenAutoHosts | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/dnsfilter.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> FilteredInvalid: "FilteredInvalid",
<mask> FilteredSafeSearch: "FilteredSafeSearch",
<mask> FilteredBlockedService: "FilteredBlockedService",
<mask>
<mask> ReasonRewrite: "Rewrite",
<mask>
<mask> RewriteAutoHosts: "RewriteEtcHosts",
<mask>
<mask> DNSRewriteRule: "DNSRewriteRule",
<mask> }
<mask>
<mask> func (r Reason) String() string {
<mask> if r < 0 || int(r) >= len(reasonNames) {
<mask> return ""
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove // for ReasonRewrite:
</s> add // for Rewritten: </s> remove } else if res.Reason == dnsfilter.ReasonRewrite || res.Reason == dnsfilter.RewriteAutoHosts {
</s> add } else if res.Reason == dnsfilter.Rewritten || res.Reason == dnsfilter.RewrittenAutoHosts { </s> remove } else if res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.DNSRewriteRule) &&
</s> add } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) && </s> remove result.Reason = RewriteAutoHosts
</s> add result.Reason = RewrittenAutoHosts </s> remove } else if res.Reason == dnsfilter.DNSRewriteRule {
</s> add } else if res.Reason == dnsfilter.RewrittenRule { </s> remove if res.Reason == DNSRewriteRule && res.CanonName == host {
</s> add if res.Reason == RewrittenRule && res.CanonName == host { | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/dnsfilter.go |
keep replace keep keep keep replace keep keep keep | <mask> // ReverseHosts is the reverse lookup rewrite result. It is
<mask> // empty unless Reason is set to RewriteAutoHosts.
<mask> ReverseHosts []string `json:",omitempty"`
<mask>
<mask> // IPList is the lookup rewrite result. It is empty unless
<mask> // Reason is set to RewriteAutoHosts or ReasonRewrite.
<mask> IPList []net.IP `json:",omitempty"`
<mask>
<mask> // CanonName is the CNAME value from the lookup rewrite result.
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove // It is empty unless Reason is set to ReasonRewrite.
</s> add // It is empty unless Reason is set to Rewritten or RewrittenRule. </s> remove // ReasonRewrite is returned when there was a rewrite by
// a legacy DNS Rewrite rule.
ReasonRewrite
// RewriteAutoHosts is returned when there was a rewrite by
// autohosts rules (/etc/hosts and so on).
RewriteAutoHosts
// DNSRewriteRule is returned when a $dnsrewrite filter rule was
// applied.
DNSRewriteRule
</s> add // Rewritten is returned when there was a rewrite by a legacy DNS
// rewrite rule.
Rewritten
// RewrittenAutoHosts is returned when there was a rewrite by autohosts
// rules (/etc/hosts and so on).
RewrittenAutoHosts
// RewrittenRule is returned when a $dnsrewrite filter rule was applied.
//
// TODO(a.garipov): Remove Rewritten and RewrittenAutoHosts by merging
// their functionality into RewrittenRule.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/2499.
RewrittenRule </s> remove if res.Reason == DNSRewriteRule && res.CanonName == host {
</s> add if res.Reason == RewrittenRule && res.CanonName == host { </s> remove } else if res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.DNSRewriteRule) &&
</s> add } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) && </s> remove case dnsfilter.ReasonRewrite,
dnsfilter.DNSRewriteRule:
</s> add case dnsfilter.Rewritten,
dnsfilter.RewrittenRule: | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // Reason is set to RewriteAutoHosts or ReasonRewrite.
<mask> IPList []net.IP `json:",omitempty"`
<mask>
<mask> // CanonName is the CNAME value from the lookup rewrite result.
<mask> // It is empty unless Reason is set to ReasonRewrite.
<mask> CanonName string `json:",omitempty"`
<mask>
<mask> // ServiceName is the name of the blocked service. It is empty
<mask> // unless Reason is set to FilteredBlockedService.
<mask> ServiceName string `json:",omitempty"`
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove // Reason is set to RewriteAutoHosts or ReasonRewrite.
</s> add // Reason is set to RewrittenAutoHosts or Rewritten. </s> remove // empty unless Reason is set to RewriteAutoHosts.
</s> add // empty unless Reason is set to RewrittenAutoHosts. </s> remove // for ReasonRewrite:
</s> add // for Rewritten: </s> remove // ReasonRewrite is returned when there was a rewrite by
// a legacy DNS Rewrite rule.
ReasonRewrite
// RewriteAutoHosts is returned when there was a rewrite by
// autohosts rules (/etc/hosts and so on).
RewriteAutoHosts
// DNSRewriteRule is returned when a $dnsrewrite filter rule was
// applied.
DNSRewriteRule
</s> add // Rewritten is returned when there was a rewrite by a legacy DNS
// rewrite rule.
Rewritten
// RewrittenAutoHosts is returned when there was a rewrite by autohosts
// rules (/etc/hosts and so on).
RewrittenAutoHosts
// RewrittenRule is returned when a $dnsrewrite filter rule was applied.
//
// TODO(a.garipov): Remove Rewritten and RewrittenAutoHosts by merging
// their functionality into RewrittenRule.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/2499.
RewrittenRule </s> remove } else if res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.DNSRewriteRule) &&
</s> add } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) && </s> remove - 'DNSRewriteRule'
</s> add - 'RewriteRule' | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> var err error
<mask>
<mask> // first - check rewrites, they have the highest priority
<mask> result = d.processRewrites(host, qtype)
<mask> if result.Reason == ReasonRewrite {
<mask> return result, nil
<mask> }
<mask>
<mask> // Now check the hosts file -- do we have any rules for it?
<mask> // just like DNS rewrites, it has higher priority than filtering rules.
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove result.Reason = RewriteAutoHosts
</s> add result.Reason = RewrittenAutoHosts </s> remove case dnsfilter.ReasonRewrite,
dnsfilter.DNSRewriteRule:
</s> add case dnsfilter.Rewritten,
dnsfilter.RewrittenRule: </s> remove } else if res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.DNSRewriteRule) &&
</s> add } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) && </s> remove if res.Reason == DNSRewriteRule && res.CanonName == host {
</s> add if res.Reason == RewrittenRule && res.CanonName == host { </s> remove } else if res.Reason == dnsfilter.DNSRewriteRule {
</s> add } else if res.Reason == dnsfilter.RewrittenRule { </s> remove result.Reason = RewriteAutoHosts
</s> add result.Reason = RewrittenAutoHosts | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> func (d *DNSFilter) checkAutoHosts(host string, qtype uint16, result *Result) (matched bool) {
<mask> ips := d.Config.AutoHosts.Process(host, qtype)
<mask> if ips != nil {
<mask> result.Reason = RewriteAutoHosts
<mask> result.IPList = ips
<mask>
<mask> return true
<mask> }
<mask>
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove result.Reason = RewriteAutoHosts
</s> add result.Reason = RewrittenAutoHosts </s> remove if result.Reason == ReasonRewrite {
</s> add if result.Reason == Rewritten { </s> remove } else if res.Reason == dnsfilter.DNSRewriteRule {
</s> add } else if res.Reason == dnsfilter.RewrittenRule { </s> remove res.Reason = ReasonRewrite
</s> add res.Reason = Rewritten </s> remove } else if res.Reason == dnsfilter.ReasonRewrite || res.Reason == dnsfilter.RewriteAutoHosts {
</s> add } else if res.Reason == dnsfilter.Rewritten || res.Reason == dnsfilter.RewrittenAutoHosts { </s> remove } else if res.Reason == dnsfilter.RewriteAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> revHosts := d.Config.AutoHosts.ProcessReverse(host, qtype)
<mask> if len(revHosts) != 0 {
<mask> result.Reason = RewriteAutoHosts
<mask>
<mask> // TODO(a.garipov): Optimize this with a buffer.
<mask> result.ReverseHosts = make([]string, len(revHosts))
<mask> for i := range revHosts {
<mask> result.ReverseHosts[i] = revHosts[i] + "."
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove result.Reason = RewriteAutoHosts
</s> add result.Reason = RewrittenAutoHosts </s> remove } else if res.Reason == dnsfilter.RewriteAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove res.Reason = ReasonRewrite
</s> add res.Reason = Rewritten </s> remove } else if res.Reason == dnsfilter.ReasonRewrite || res.Reason == dnsfilter.RewriteAutoHosts {
</s> add } else if res.Reason == dnsfilter.Rewritten || res.Reason == dnsfilter.RewrittenAutoHosts { </s> remove if result.Reason == ReasonRewrite {
</s> add if result.Reason == Rewritten { </s> remove if res.Reason == DNSRewriteRule && res.CanonName == host {
</s> add if res.Reason == RewrittenRule && res.CanonName == host { | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> defer d.confLock.RUnlock()
<mask>
<mask> rr := findRewrites(d.Rewrites, host)
<mask> if len(rr) != 0 {
<mask> res.Reason = ReasonRewrite
<mask> }
<mask>
<mask> cnames := map[string]bool{}
<mask> origHost := host
<mask> for len(rr) != 0 && rr[0].Type == dns.TypeCNAME {
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove } else if res.Reason == dnsfilter.RewriteAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove } else if res.Reason == dnsfilter.ReasonRewrite || res.Reason == dnsfilter.RewriteAutoHosts {
</s> add } else if res.Reason == dnsfilter.Rewritten || res.Reason == dnsfilter.RewrittenAutoHosts { </s> remove if res.Reason == DNSRewriteRule && res.CanonName == host {
</s> add if res.Reason == RewrittenRule && res.CanonName == host { </s> remove result.Reason = RewriteAutoHosts
</s> add result.Reason = RewrittenAutoHosts </s> remove } else if res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.DNSRewriteRule) &&
</s> add } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) && </s> remove } else if res.Reason == dnsfilter.DNSRewriteRule {
</s> add } else if res.Reason == dnsfilter.RewrittenRule { | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // Check DNS rewrites first, because the API there is a bit
<mask> // awkward.
<mask> if dnsr := dnsres.DNSRewrites(); len(dnsr) > 0 {
<mask> res = d.processDNSRewrites(dnsr)
<mask> if res.Reason == DNSRewriteRule && res.CanonName == host {
<mask> // A rewrite of a host to itself. Go on and
<mask> // try matching other things.
<mask> } else {
<mask> return res, nil
<mask> }
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove // ReasonRewrite is returned when there was a rewrite by
// a legacy DNS Rewrite rule.
ReasonRewrite
// RewriteAutoHosts is returned when there was a rewrite by
// autohosts rules (/etc/hosts and so on).
RewriteAutoHosts
// DNSRewriteRule is returned when a $dnsrewrite filter rule was
// applied.
DNSRewriteRule
</s> add // Rewritten is returned when there was a rewrite by a legacy DNS
// rewrite rule.
Rewritten
// RewrittenAutoHosts is returned when there was a rewrite by autohosts
// rules (/etc/hosts and so on).
RewrittenAutoHosts
// RewrittenRule is returned when a $dnsrewrite filter rule was applied.
//
// TODO(a.garipov): Remove Rewritten and RewrittenAutoHosts by merging
// their functionality into RewrittenRule.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/2499.
RewrittenRule </s> remove } else if res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.DNSRewriteRule) &&
</s> add } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) && </s> remove } else if res.Reason == dnsfilter.DNSRewriteRule {
</s> add } else if res.Reason == dnsfilter.RewrittenRule { </s> remove } else if res.Reason == dnsfilter.RewriteAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove } else if res.Reason == dnsfilter.ReasonRewrite || res.Reason == dnsfilter.RewriteAutoHosts {
</s> add } else if res.Reason == dnsfilter.Rewritten || res.Reason == dnsfilter.RewrittenAutoHosts { </s> remove case dnsfilter.ReasonRewrite,
dnsfilter.DNSRewriteRule:
</s> add case dnsfilter.Rewritten,
dnsfilter.RewrittenRule: | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> Text: nr.RuleText,
<mask> }}
<mask>
<mask> return Result{
<mask> Reason: DNSRewriteRule,
<mask> Rules: rules,
<mask> CanonName: dr.NewCNAME,
<mask> }
<mask> }
<mask>
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove Reason: DNSRewriteRule,
</s> add Reason: RewrittenRule, </s> remove Reason: DNSRewriteRule,
</s> add Reason: RewrittenRule, </s> remove Reason: dnsfilter.ReasonRewrite,
</s> add Reason: dnsfilter.Rewritten, </s> remove } else if res.Reason == dnsfilter.DNSRewriteRule {
</s> add } else if res.Reason == dnsfilter.RewrittenRule { </s> remove } else if res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.DNSRewriteRule) &&
</s> add } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) && </s> remove result.Reason = RewriteAutoHosts
</s> add result.Reason = RewrittenAutoHosts | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/dnsrewrite.go |
keep keep keep keep replace keep keep keep keep keep | <mask> RCode: dr.RCode,
<mask> }
<mask>
<mask> return Result{
<mask> Reason: DNSRewriteRule,
<mask> Rules: rules,
<mask> DNSRewriteResult: dnsrr,
<mask> }
<mask> }
<mask> }
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove Reason: DNSRewriteRule,
</s> add Reason: RewrittenRule, </s> remove Reason: DNSRewriteRule,
</s> add Reason: RewrittenRule, </s> remove } else if res.Reason == dnsfilter.DNSRewriteRule {
</s> add } else if res.Reason == dnsfilter.RewrittenRule { </s> remove Reason: dnsfilter.ReasonRewrite,
</s> add Reason: dnsfilter.Rewritten, </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove } else if res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.DNSRewriteRule) &&
</s> add } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) && | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/dnsrewrite.go |
keep keep keep keep replace keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> return Result{
<mask> Reason: DNSRewriteRule,
<mask> Rules: rules,
<mask> DNSRewriteResult: dnsrr,
<mask> }
<mask> }
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove Reason: DNSRewriteRule,
</s> add Reason: RewrittenRule, </s> remove Reason: DNSRewriteRule,
</s> add Reason: RewrittenRule, </s> remove } else if res.Reason == dnsfilter.DNSRewriteRule {
</s> add } else if res.Reason == dnsfilter.RewrittenRule { </s> remove Reason: dnsfilter.ReasonRewrite,
</s> add Reason: dnsfilter.Rewritten, </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove } else if res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.DNSRewriteRule) &&
</s> add } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) && | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/dnsrewrite.go |
keep keep keep keep replace keep keep keep keep keep | <mask> r := d.processRewrites("host2.com", dns.TypeA)
<mask> assert.Equal(t, NotFilteredNotFound, r.Reason)
<mask>
<mask> r = d.processRewrites("www.host.com", dns.TypeA)
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.Equal(t, "host.com", r.CanonName)
<mask> assert.Equal(t, 2, len(r.IPList))
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask> assert.True(t, r.IPList[1].Equal(net.ParseIP("1.2.3.5")))
<mask>
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/rewrites_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask> assert.True(t, r.IPList[1].Equal(net.ParseIP("1.2.3.5")))
<mask>
<mask> r = d.processRewrites("www.host.com", dns.TypeAAAA)
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.Equal(t, "host.com", r.CanonName)
<mask> assert.Equal(t, 1, len(r.IPList))
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1:2:3::4")))
<mask>
<mask> // wildcard
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/rewrites_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> {"*.host.com", "1.2.3.5", 0, nil},
<mask> }
<mask> d.prepareRewrites()
<mask> r = d.processRewrites("host.com", dns.TypeA)
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask>
<mask> r = d.processRewrites("www.host.com", dns.TypeA)
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.5")))
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/rewrites_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask>
<mask> r = d.processRewrites("www.host.com", dns.TypeA)
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.5")))
<mask>
<mask> r = d.processRewrites("www.host2.com", dns.TypeA)
<mask> assert.Equal(t, NotFilteredNotFound, r.Reason)
<mask>
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/rewrites_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> {"*.host.com", "1.2.3.5", 0, nil},
<mask> }
<mask> d.prepareRewrites()
<mask> r = d.processRewrites("a.host.com", dns.TypeA)
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.True(t, len(r.IPList) == 1)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask>
<mask> // wildcard + CNAME
<mask> d.Rewrites = []RewriteEntry{
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/rewrites_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> {"*.host.com", "host.com", 0, nil},
<mask> }
<mask> d.prepareRewrites()
<mask> r = d.processRewrites("www.host.com", dns.TypeA)
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.Equal(t, "host.com", r.CanonName)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask>
<mask> // 2 CNAMEs
<mask> d.Rewrites = []RewriteEntry{
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/rewrites_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> {"host.com", "1.2.3.4", 0, nil},
<mask> }
<mask> d.prepareRewrites()
<mask> r = d.processRewrites("b.host.com", dns.TypeA)
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.Equal(t, "host.com", r.CanonName)
<mask> assert.True(t, len(r.IPList) == 1)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask>
<mask> // 2 CNAMEs + wildcard
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/rewrites_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> {"*.somehost.com", "1.2.3.4", 0, nil},
<mask> }
<mask> d.prepareRewrites()
<mask> r = d.processRewrites("b.host.com", dns.TypeA)
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.Equal(t, "x.somehost.com", r.CanonName)
<mask> assert.True(t, len(r.IPList) == 1)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask> }
<mask>
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/rewrites_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> d.prepareRewrites()
<mask>
<mask> // match exact
<mask> r := d.processRewrites("host.com", dns.TypeA)
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.Equal(t, 1, len(r.IPList))
<mask> assert.Equal(t, "1.1.1.1", r.IPList[0].String())
<mask>
<mask> // match L2
<mask> r = d.processRewrites("sub.host.com", dns.TypeA)
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/rewrites_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> assert.Equal(t, "1.1.1.1", r.IPList[0].String())
<mask>
<mask> // match L2
<mask> r = d.processRewrites("sub.host.com", dns.TypeA)
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.Equal(t, 1, len(r.IPList))
<mask> assert.Equal(t, "2.2.2.2", r.IPList[0].String())
<mask>
<mask> // match L3
<mask> r = d.processRewrites("my.sub.host.com", dns.TypeA)
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/rewrites_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> assert.Equal(t, "2.2.2.2", r.IPList[0].String())
<mask>
<mask> // match L3
<mask> r = d.processRewrites("my.sub.host.com", dns.TypeA)
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.Equal(t, 1, len(r.IPList))
<mask> assert.Equal(t, "3.3.3.3", r.IPList[0].String())
<mask> }
<mask>
<mask> func TestRewritesExceptionCNAME(t *testing.T) {
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/rewrites_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> d.prepareRewrites()
<mask>
<mask> // match sub-domain
<mask> r := d.processRewrites("my.host.com", dns.TypeA)
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.Equal(t, 1, len(r.IPList))
<mask> assert.Equal(t, "2.2.2.2", r.IPList[0].String())
<mask>
<mask> // match sub-domain, but handle exception
<mask> r = d.processRewrites("sub.host.com", dns.TypeA)
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/rewrites_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> d.prepareRewrites()
<mask>
<mask> // match sub-domain
<mask> r := d.processRewrites("my.host.com", dns.TypeA)
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.Equal(t, 1, len(r.IPList))
<mask> assert.Equal(t, "2.2.2.2", r.IPList[0].String())
<mask>
<mask> // match sub-domain, but handle exception
<mask> r = d.processRewrites("my.sub.host.com", dns.TypeA)
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/rewrites_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> d.prepareRewrites()
<mask>
<mask> // match domain
<mask> r := d.processRewrites("host.com", dns.TypeA)
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.Equal(t, 1, len(r.IPList))
<mask> assert.Equal(t, "1.2.3.4", r.IPList[0].String())
<mask>
<mask> // match exception
<mask> r = d.processRewrites("host.com", dns.TypeAAAA)
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/rewrites_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> assert.Equal(t, NotFilteredNotFound, r.Reason)
<mask>
<mask> // match domain
<mask> r = d.processRewrites("host2.com", dns.TypeAAAA)
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.Equal(t, 1, len(r.IPList))
<mask> assert.Equal(t, "::1", r.IPList[0].String())
<mask>
<mask> // match exception
<mask> r = d.processRewrites("host3.com", dns.TypeA)
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/rewrites_test.go |
keep keep keep keep replace keep keep | <mask> assert.Equal(t, NotFilteredNotFound, r.Reason)
<mask>
<mask> // match domain
<mask> r = d.processRewrites("host3.com", dns.TypeAAAA)
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.Equal(t, 0, len(r.IPList))
<mask> }
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsfilter/rewrites_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> res := ctx.result
<mask> var err error
<mask>
<mask> switch res.Reason {
<mask> case dnsfilter.ReasonRewrite,
<mask> dnsfilter.DNSRewriteRule:
<mask>
<mask> if len(ctx.origQuestion.Name) == 0 {
<mask> // origQuestion is set in case we get only CNAME without IP from rewrites table
<mask> break
<mask> }
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove if res.Reason == DNSRewriteRule && res.CanonName == host {
</s> add if res.Reason == RewrittenRule && res.CanonName == host { </s> remove if result.Reason == ReasonRewrite {
</s> add if result.Reason == Rewritten { </s> remove } else if res.Reason == dnsfilter.RewriteAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove } else if res.Reason == dnsfilter.DNSRewriteRule {
</s> add } else if res.Reason == dnsfilter.RewrittenRule { </s> remove return res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.RewriteAutoHosts)
</s> add return res.Reason.In(
dnsfilter.Rewritten,
dnsfilter.RewrittenAutoHosts,
dnsfilter.RewrittenRule,
) </s> remove } else if res.Reason == dnsfilter.ReasonRewrite || res.Reason == dnsfilter.RewriteAutoHosts {
</s> add } else if res.Reason == dnsfilter.Rewritten || res.Reason == dnsfilter.RewrittenAutoHosts { | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsforward/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err)
<mask> } else if res.IsFiltered {
<mask> log.Tracef("Host %s is filtered, reason - %q, matched rule: %q", host, res.Reason, res.Rules[0].Text)
<mask> d.Res = s.genDNSFilterMessage(d, &res)
<mask> } else if res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.DNSRewriteRule) &&
<mask> res.CanonName != "" &&
<mask> len(res.IPList) == 0 {
<mask> // Resolve the new canonical name, not the original host
<mask> // name. The original question is readded in
<mask> // processFilteringAfterResponse.
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove } else if res.Reason == dnsfilter.RewriteAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove if res.Reason == DNSRewriteRule && res.CanonName == host {
</s> add if res.Reason == RewrittenRule && res.CanonName == host { </s> remove } else if res.Reason == dnsfilter.DNSRewriteRule {
</s> add } else if res.Reason == dnsfilter.RewrittenRule { </s> remove } else if res.Reason == dnsfilter.ReasonRewrite || res.Reason == dnsfilter.RewriteAutoHosts {
</s> add } else if res.Reason == dnsfilter.Rewritten || res.Reason == dnsfilter.RewrittenAutoHosts { </s> remove res.Reason = ReasonRewrite
</s> add res.Reason = Rewritten </s> remove if result.Reason == ReasonRewrite {
</s> add if result.Reason == Rewritten { | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsforward/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // name. The original question is readded in
<mask> // processFilteringAfterResponse.
<mask> ctx.origQuestion = d.Req.Question[0]
<mask> d.Req.Question[0].Name = dns.Fqdn(res.CanonName)
<mask> } else if res.Reason == dnsfilter.RewriteAutoHosts && len(res.ReverseHosts) != 0 {
<mask> resp := s.makeResponse(req)
<mask> for _, h := range res.ReverseHosts {
<mask> hdr := dns.RR_Header{
<mask> Name: req.Question[0].Name,
<mask> Rrtype: dns.TypePTR,
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove } else if res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.DNSRewriteRule) &&
</s> add } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) && </s> remove } else if res.Reason == dnsfilter.ReasonRewrite || res.Reason == dnsfilter.RewriteAutoHosts {
</s> add } else if res.Reason == dnsfilter.Rewritten || res.Reason == dnsfilter.RewrittenAutoHosts { </s> remove res.Reason = ReasonRewrite
</s> add res.Reason = Rewritten </s> remove result.Reason = RewriteAutoHosts
</s> add result.Reason = RewrittenAutoHosts </s> remove } else if res.Reason == dnsfilter.DNSRewriteRule {
</s> add } else if res.Reason == dnsfilter.RewrittenRule { </s> remove if res.Reason == DNSRewriteRule && res.CanonName == host {
</s> add if res.Reason == RewrittenRule && res.CanonName == host { | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsforward/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> resp.Answer = append(resp.Answer, ptr)
<mask> }
<mask>
<mask> d.Res = resp
<mask> } else if res.Reason == dnsfilter.ReasonRewrite || res.Reason == dnsfilter.RewriteAutoHosts {
<mask> resp := s.makeResponse(req)
<mask>
<mask> name := host
<mask> if len(res.CanonName) != 0 {
<mask> resp.Answer = append(resp.Answer, s.genAnswerCNAME(req, res.CanonName))
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove } else if res.Reason == dnsfilter.RewriteAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove } else if res.Reason == dnsfilter.DNSRewriteRule {
</s> add } else if res.Reason == dnsfilter.RewrittenRule { </s> remove res.Reason = ReasonRewrite
</s> add res.Reason = Rewritten </s> remove if res.Reason == DNSRewriteRule && res.CanonName == host {
</s> add if res.Reason == RewrittenRule && res.CanonName == host { </s> remove } else if res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.DNSRewriteRule) &&
</s> add } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) && </s> remove result.Reason = RewriteAutoHosts
</s> add result.Reason = RewrittenAutoHosts | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsforward/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> d.Res = resp
<mask> } else if res.Reason == dnsfilter.DNSRewriteRule {
<mask> err = s.filterDNSRewrite(req, res, d)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> }
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove } else if res.Reason == dnsfilter.ReasonRewrite || res.Reason == dnsfilter.RewriteAutoHosts {
</s> add } else if res.Reason == dnsfilter.Rewritten || res.Reason == dnsfilter.RewrittenAutoHosts { </s> remove } else if res.Reason == dnsfilter.RewriteAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove if res.Reason == DNSRewriteRule && res.CanonName == host {
</s> add if res.Reason == RewrittenRule && res.CanonName == host { </s> remove } else if res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.DNSRewriteRule) &&
</s> add } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) && </s> remove if result.Reason == ReasonRewrite {
</s> add if result.Reason == Rewritten { </s> remove case dnsfilter.ReasonRewrite,
dnsfilter.DNSRewriteRule:
</s> add case dnsfilter.Rewritten,
dnsfilter.RewrittenRule: | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/dnsforward/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> // for FilteredBlockedService:
<mask> SvcName string `json:"service_name"`
<mask>
<mask> // for ReasonRewrite:
<mask> CanonName string `json:"cname"` // CNAME value
<mask> IPList []net.IP `json:"ip_addrs"` // list of IP addresses
<mask> }
<mask>
<mask> func (f *Filtering) handleCheckHost(w http.ResponseWriter, r *http.Request) {
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove // It is empty unless Reason is set to ReasonRewrite.
</s> add // It is empty unless Reason is set to Rewritten or RewrittenRule. </s> remove // Reason is set to RewriteAutoHosts or ReasonRewrite.
</s> add // Reason is set to RewrittenAutoHosts or Rewritten. </s> remove ReasonRewrite: "Rewrite",
RewriteAutoHosts: "RewriteEtcHosts",
DNSRewriteRule: "DNSRewriteRule",
</s> add Rewritten: "Rewrite",
RewrittenAutoHosts: "RewriteEtcHosts",
RewrittenRule: "RewriteRule", </s> remove // empty unless Reason is set to RewriteAutoHosts.
</s> add // empty unless Reason is set to RewrittenAutoHosts. </s> remove case dnsfilter.ReasonRewrite,
dnsfilter.DNSRewriteRule:
</s> add case dnsfilter.Rewritten,
dnsfilter.RewrittenRule: </s> remove if result.Reason == ReasonRewrite {
</s> add if result.Reason == Rewritten { | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/home/controlfiltering.go |
keep keep keep keep replace keep keep keep keep keep | <mask> answer.A = net.ParseIP(answerStr)
<mask> a.Answer = append(a.Answer, answer)
<mask> res := dnsfilter.Result{
<mask> IsFiltered: true,
<mask> Reason: dnsfilter.ReasonRewrite,
<mask> ServiceName: "SomeService",
<mask> Rules: []*dnsfilter.ResultRule{{
<mask> FilterListID: 1,
<mask> Text: "SomeRule",
<mask> }},
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove Reason: DNSRewriteRule,
</s> add Reason: RewrittenRule, </s> remove Reason: DNSRewriteRule,
</s> add Reason: RewrittenRule, </s> remove Reason: DNSRewriteRule,
</s> add Reason: RewrittenRule, </s> remove case dnsfilter.ReasonRewrite,
dnsfilter.DNSRewriteRule:
</s> add case dnsfilter.Rewritten,
dnsfilter.RewrittenRule: </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) </s> remove assert.Equal(t, ReasonRewrite, r.Reason)
</s> add assert.Equal(t, Rewritten, r.Reason) | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/querylog/qlog_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> case filteringStatusFiltered:
<mask> return res.IsFiltered ||
<mask> res.Reason.In(
<mask> dnsfilter.NotFilteredAllowList,
<mask> dnsfilter.ReasonRewrite,
<mask> dnsfilter.RewriteAutoHosts,
<mask> )
<mask>
<mask> case filteringStatusBlocked:
<mask> return res.IsFiltered &&
<mask> res.Reason.In(dnsfilter.FilteredBlockList, dnsfilter.FilteredBlockedService)
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove return res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.RewriteAutoHosts)
</s> add return res.Reason.In(
dnsfilter.Rewritten,
dnsfilter.RewrittenAutoHosts,
dnsfilter.RewrittenRule,
) </s> remove case dnsfilter.ReasonRewrite,
dnsfilter.DNSRewriteRule:
</s> add case dnsfilter.Rewritten,
dnsfilter.RewrittenRule: </s> remove } else if res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.DNSRewriteRule) &&
</s> add } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) && </s> remove ReasonRewrite: "Rewrite",
RewriteAutoHosts: "RewriteEtcHosts",
DNSRewriteRule: "DNSRewriteRule",
</s> add Rewritten: "Rewrite",
RewrittenAutoHosts: "RewriteEtcHosts",
RewrittenRule: "RewriteRule", </s> remove - 'DNSRewriteRule'
</s> add - 'RewriteRule' </s> remove if res.Reason == DNSRewriteRule && res.CanonName == host {
</s> add if res.Reason == RewrittenRule && res.CanonName == host { | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/querylog/searchcriteria.go |
keep keep keep keep replace keep keep keep keep keep | <mask> case filteringStatusWhitelisted:
<mask> return res.Reason == dnsfilter.NotFilteredAllowList
<mask>
<mask> case filteringStatusRewritten:
<mask> return res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.RewriteAutoHosts)
<mask>
<mask> case filteringStatusSafeSearch:
<mask> return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
<mask>
<mask> case filteringStatusProcessed:
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove dnsfilter.ReasonRewrite,
dnsfilter.RewriteAutoHosts,
</s> add dnsfilter.Rewritten,
dnsfilter.RewrittenAutoHosts,
dnsfilter.RewrittenRule, </s> remove case dnsfilter.ReasonRewrite,
dnsfilter.DNSRewriteRule:
</s> add case dnsfilter.Rewritten,
dnsfilter.RewrittenRule: </s> remove if res.Reason == DNSRewriteRule && res.CanonName == host {
</s> add if res.Reason == RewrittenRule && res.CanonName == host { </s> remove } else if res.Reason == dnsfilter.DNSRewriteRule {
</s> add } else if res.Reason == dnsfilter.RewrittenRule { </s> remove } else if res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.DNSRewriteRule) &&
</s> add } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) && </s> remove } else if res.Reason == dnsfilter.ReasonRewrite || res.Reason == dnsfilter.RewriteAutoHosts {
</s> add } else if res.Reason == dnsfilter.Rewritten || res.Reason == dnsfilter.RewrittenAutoHosts { | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | internal/querylog/searchcriteria.go |
keep keep keep keep replace keep keep keep keep keep | <mask> - 'FilteredSafeSearch'
<mask> - 'FilteredBlockedService'
<mask> - 'Rewrite'
<mask> - 'RewriteEtcHosts'
<mask> - 'DNSRewriteRule'
<mask> 'filter_id':
<mask> 'deprecated': true
<mask> 'description': >
<mask> In case if there's a rule applied to this DNS request, this is ID of
<mask> the filter list that the rule belongs to.
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove - 'DNSRewriteRule'
</s> add - 'RewriteRule' </s> remove // ReasonRewrite is returned when there was a rewrite by
// a legacy DNS Rewrite rule.
ReasonRewrite
// RewriteAutoHosts is returned when there was a rewrite by
// autohosts rules (/etc/hosts and so on).
RewriteAutoHosts
// DNSRewriteRule is returned when a $dnsrewrite filter rule was
// applied.
DNSRewriteRule
</s> add // Rewritten is returned when there was a rewrite by a legacy DNS
// rewrite rule.
Rewritten
// RewrittenAutoHosts is returned when there was a rewrite by autohosts
// rules (/etc/hosts and so on).
RewrittenAutoHosts
// RewrittenRule is returned when a $dnsrewrite filter rule was applied.
//
// TODO(a.garipov): Remove Rewritten and RewrittenAutoHosts by merging
// their functionality into RewrittenRule.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/2499.
RewrittenRule </s> remove if result.Reason == ReasonRewrite {
</s> add if result.Reason == Rewritten { </s> remove } else if res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.DNSRewriteRule) &&
</s> add } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) && </s> remove if res.Reason == DNSRewriteRule && res.CanonName == host {
</s> add if res.Reason == RewrittenRule && res.CanonName == host { </s> remove // It is empty unless Reason is set to ReasonRewrite.
</s> add // It is empty unless Reason is set to Rewritten or RewrittenRule. | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | openapi/openapi.yaml |
keep keep keep keep replace keep keep keep keep keep | <mask> - 'FilteredSafeSearch'
<mask> - 'FilteredBlockedService'
<mask> - 'Rewrite'
<mask> - 'RewriteEtcHosts'
<mask> - 'DNSRewriteRule'
<mask> 'service_name':
<mask> 'type': 'string'
<mask> 'description': 'Set if reason=FilteredBlockedService'
<mask> 'status':
<mask> 'type': 'string'
</s> Pull request: all: improve dnsrewrite handling
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491.
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <[email protected]>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling </s> remove - 'DNSRewriteRule'
</s> add - 'RewriteRule' </s> remove if result.Reason == ReasonRewrite {
</s> add if result.Reason == Rewritten { </s> remove } else if res.Reason.In(dnsfilter.ReasonRewrite, dnsfilter.DNSRewriteRule) &&
</s> add } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) && </s> remove // ReasonRewrite is returned when there was a rewrite by
// a legacy DNS Rewrite rule.
ReasonRewrite
// RewriteAutoHosts is returned when there was a rewrite by
// autohosts rules (/etc/hosts and so on).
RewriteAutoHosts
// DNSRewriteRule is returned when a $dnsrewrite filter rule was
// applied.
DNSRewriteRule
</s> add // Rewritten is returned when there was a rewrite by a legacy DNS
// rewrite rule.
Rewritten
// RewrittenAutoHosts is returned when there was a rewrite by autohosts
// rules (/etc/hosts and so on).
RewrittenAutoHosts
// RewrittenRule is returned when a $dnsrewrite filter rule was applied.
//
// TODO(a.garipov): Remove Rewritten and RewrittenAutoHosts by merging
// their functionality into RewrittenRule.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/2499.
RewrittenRule </s> remove } else if res.Reason == dnsfilter.DNSRewriteRule {
</s> add } else if res.Reason == dnsfilter.RewrittenRule { </s> remove } else if res.Reason == dnsfilter.ReasonRewrite || res.Reason == dnsfilter.RewriteAutoHosts {
</s> add } else if res.Reason == dnsfilter.Rewritten || res.Reason == dnsfilter.RewrittenAutoHosts { | https://github.com/AdguardTeam/AdGuardHome/commit/338209f32bdb876da19e52c366e440ea3c457470 | openapi/openapi.yaml |
keep keep keep keep replace keep replace replace keep keep keep | <mask> }
<mask> }
<mask> return false
<mask> }
<mask> func handleStart(w http.ResponseWriter, r *http.Request) {
<mask> if isRunning() {
<mask> http.Error(w, fmt.Sprintf("Unable to start coreDNS: Already running"), 400)
<mask> return
<mask> }
<mask> err := writeCoreDNSConfig()
<mask> if err != nil {
</s> Move starting of coredns server into separate function </s> add return nil
}
func handleStart(w http.ResponseWriter, r *http.Request) {
if isRunning() {
http.Error(w, fmt.Sprintf("Unable to start coreDNS: Already running"), 400)
return
}
err := startDNSServer()
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
fmt.Fprintf(w, "OK, PID %d\n", coreDNSCommand.Process.Pid) </s> remove errortext := fmt.Sprintf("Unable to write coredns config: %s", err)
</s> add errortext := fmt.Errorf("Unable to write coredns config: %s", err) </s> remove http.Error(w, errortext, http.StatusInternalServerError)
return
</s> add return errortext </s> remove http.Error(w, errortext, http.StatusInternalServerError)
return
</s> add return errortext </s> remove fmt.Fprintf(w, "OK, PID %d\n", coreDNSCommand.Process.Pid)
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/33fbccf0badee8a4c5f790d850d85e161536779f | control.go |
keep replace keep replace replace keep keep keep | <mask> if err != nil {
<mask> errortext := fmt.Sprintf("Unable to write coredns config: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> err = writeFilterFile()
<mask> if err != nil {
</s> Move starting of coredns server into separate function </s> remove http.Error(w, fmt.Sprintf("Unable to start coreDNS: Already running"), 400)
return
</s> add return fmt.Errorf("Unable to start coreDNS: Already running") </s> remove errortext := fmt.Sprintf("Couldn't write filter file: %s", err)
</s> add errortext := fmt.Errorf("Couldn't write filter file: %s", err) </s> remove http.Error(w, errortext, http.StatusInternalServerError)
return
</s> add return errortext </s> remove errortext := fmt.Sprintf("Unable to start coreDNS: %s", err)
</s> add errortext := fmt.Errorf("Unable to start coreDNS: %s", err) </s> remove http.Error(w, errortext, http.StatusInternalServerError)
return
</s> add return errortext | https://github.com/AdguardTeam/AdGuardHome/commit/33fbccf0badee8a4c5f790d850d85e161536779f | control.go |
keep keep keep replace keep replace replace | <mask> }
<mask> err = writeFilterFile()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write filter file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
</s> Move starting of coredns server into separate function </s> remove http.Error(w, errortext, http.StatusInternalServerError)
return
</s> add return errortext </s> remove errortext := fmt.Sprintf("Unable to write coredns config: %s", err)
</s> add errortext := fmt.Errorf("Unable to write coredns config: %s", err) </s> remove errortext := fmt.Sprintf("Unable to start coreDNS: %s", err)
</s> add errortext := fmt.Errorf("Unable to start coreDNS: %s", err) </s> remove http.Error(w, errortext, http.StatusInternalServerError)
return
</s> add return errortext </s> remove http.Error(w, fmt.Sprintf("Unable to start coreDNS: Already running"), 400)
return
</s> add return fmt.Errorf("Unable to start coreDNS: Already running") | https://github.com/AdguardTeam/AdGuardHome/commit/33fbccf0badee8a4c5f790d850d85e161536779f | control.go |
keep keep keep replace keep replace replace keep keep keep keep | <mask> coreDNSCommand.Stderr = os.Stderr
<mask> err = coreDNSCommand.Start()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Unable to start coreDNS: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> log.Printf("coredns PID: %v\n", coreDNSCommand.Process.Pid)
<mask> fmt.Fprintf(w, "OK, PID %d\n", coreDNSCommand.Process.Pid)
<mask> go childwaiter()
</s> Move starting of coredns server into separate function </s> remove fmt.Fprintf(w, "OK, PID %d\n", coreDNSCommand.Process.Pid)
</s> add </s> add return nil
}
func handleStart(w http.ResponseWriter, r *http.Request) {
if isRunning() {
http.Error(w, fmt.Sprintf("Unable to start coreDNS: Already running"), 400)
return
}
err := startDNSServer()
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
fmt.Fprintf(w, "OK, PID %d\n", coreDNSCommand.Process.Pid) </s> remove http.Error(w, errortext, http.StatusInternalServerError)
return
</s> add return errortext </s> remove errortext := fmt.Sprintf("Unable to write coredns config: %s", err)
</s> add errortext := fmt.Errorf("Unable to write coredns config: %s", err) </s> remove errortext := fmt.Sprintf("Couldn't write filter file: %s", err)
</s> add errortext := fmt.Errorf("Couldn't write filter file: %s", err) | https://github.com/AdguardTeam/AdGuardHome/commit/33fbccf0badee8a4c5f790d850d85e161536779f | control.go |
keep keep keep keep replace keep keep keep keep keep | <mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> log.Printf("coredns PID: %v\n", coreDNSCommand.Process.Pid)
<mask> fmt.Fprintf(w, "OK, PID %d\n", coreDNSCommand.Process.Pid)
<mask> go childwaiter()
<mask> }
<mask>
<mask> func childwaiter() {
<mask> err := coreDNSCommand.Wait()
</s> Move starting of coredns server into separate function </s> add return nil
}
func handleStart(w http.ResponseWriter, r *http.Request) {
if isRunning() {
http.Error(w, fmt.Sprintf("Unable to start coreDNS: Already running"), 400)
return
}
err := startDNSServer()
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
fmt.Fprintf(w, "OK, PID %d\n", coreDNSCommand.Process.Pid) </s> remove http.Error(w, errortext, http.StatusInternalServerError)
return
</s> add return errortext </s> remove errortext := fmt.Sprintf("Unable to start coreDNS: %s", err)
</s> add errortext := fmt.Errorf("Unable to start coreDNS: %s", err) </s> remove func handleStart(w http.ResponseWriter, r *http.Request) {
</s> add func startDNSServer() error { </s> remove http.Error(w, fmt.Sprintf("Unable to start coreDNS: Already running"), 400)
return
</s> add return fmt.Errorf("Unable to start coreDNS: Already running") </s> remove errortext := fmt.Sprintf("Unable to write coredns config: %s", err)
</s> add errortext := fmt.Errorf("Unable to write coredns config: %s", err) | https://github.com/AdguardTeam/AdGuardHome/commit/33fbccf0badee8a4c5f790d850d85e161536779f | control.go |
keep keep add keep keep keep keep keep keep | <mask> }
<mask> log.Printf("coredns PID: %v\n", coreDNSCommand.Process.Pid)
<mask> go childwaiter()
<mask> }
<mask>
<mask> func childwaiter() {
<mask> err := coreDNSCommand.Wait()
<mask> log.Printf("coredns terminated: %s\n", err)
<mask> err = coreDNSCommand.Process.Release()
</s> Move starting of coredns server into separate function </s> remove fmt.Fprintf(w, "OK, PID %d\n", coreDNSCommand.Process.Pid)
</s> add </s> remove http.Error(w, errortext, http.StatusInternalServerError)
return
</s> add return errortext </s> remove errortext := fmt.Sprintf("Unable to start coreDNS: %s", err)
</s> add errortext := fmt.Errorf("Unable to start coreDNS: %s", err) </s> remove func handleStart(w http.ResponseWriter, r *http.Request) {
</s> add func startDNSServer() error { </s> remove http.Error(w, fmt.Sprintf("Unable to start coreDNS: Already running"), 400)
return
</s> add return fmt.Errorf("Unable to start coreDNS: Already running") </s> remove errortext := fmt.Sprintf("Unable to write coredns config: %s", err)
</s> add errortext := fmt.Errorf("Unable to write coredns config: %s", err) | https://github.com/AdguardTeam/AdGuardHome/commit/33fbccf0badee8a4c5f790d850d85e161536779f | control.go |
keep keep add keep keep keep keep keep keep | <mask> "updated_upstream_dns_toast": "Servidores DNS de subida guardados correctamente",
<mask> "dns_test_ok_toast": "Los servidores DNS especificados funcionan correctamente",
<mask> "dns_test_not_ok_toast": "Servidor \"{{key}}\": no se puede utilizar, por favor revisa si lo has escrito correctamente",
<mask> "unblock": "Desbloquear",
<mask> "block": "Bloquear",
<mask> "disallow_this_client": "No permitir a este cliente",
<mask> "allow_this_client": "Permitir a este cliente",
<mask> "block_for_this_client_only": "Bloquear solo para este cliente",
<mask> "unblock_for_this_client_only": "Desbloquear solo para este cliente",
</s> Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit 366600a32ecbb163ab43b43145898bbadcfbc2e9
Author: Ainar Garipov <[email protected]>
Date: Wed Aug 3 15:09:16 2022 +0300
client: fix si-lk
commit 2a55ee3846251e53529f4ef6562e5f4939381eae
Author: Ainar Garipov <[email protected]>
Date: Wed Aug 3 15:03:45 2022 +0300
client: upd i18n </s> add "dns_test_warning_toast": "Upstream \"{{key}}\" tidak menanggapi permintaan pengujian dan mungkin tidak berfungsi dengan baik", </s> remove "encryption_server_desc": "Om HTTPS te gebruiken, moet je de servernaam invoeren die overeenkomt met je SSL-certificaat of jokerteken-certificaat. Als het veld niet is ingesteld, accepteert het TLS-verbindingen voor elk domein.",
</s> add "encryption_server_desc": "Indien ingesteld, detecteert AdGuard Home Client-ID's, reageert op DDR-zoekopdrachten en voert aanvullende verbindingsvalidaties uit. Indien niet ingesteld, zijn deze functies uitgeschakeld. Moet overeenkomen met een van de DNS-namen in het certificaat.", </s> remove "encryption_server_desc": "Untuk menggunakan HTTPS, Anda harus memasukkan nama server yang cocok dengan sertifikat SSL Anda. Bila ruas tak ditata, akan menerima koneksi TLS bagi domain manapun.",
</s> add "encryption_server_desc": "Jika disetel, AdGuard Home mendeteksi ClientID, merespons kueri DDR, dan melakukan validasi koneksi tambahan. Jika tidak disetel, fitur-fitur ini dinonaktifkan. Harus cocok dengan salah satu Nama DNS dalam sertifikat.", </s> add "dns_test_warning_toast": "Upstream \"{{key}}\" reageert niet op testverzoeken en werkt mogelijk niet goed", </s> add "form_error_gateway_ip": "Sewa tidak dapat memiliki alamat IP gateway", | https://github.com/AdguardTeam/AdGuardHome/commit/3420becce38e72ef3870f086a86342788ba9a8f8 | client/src/__locales/es.json |
keep keep add keep keep keep keep keep | <mask> "form_error_server_name": "Nama server tidak valid",
<mask> "form_error_subnet": "Subnet \"{{cidr}}\" tidak berisi alamat IP \"{{ip}}\"",
<mask> "form_error_positive": "Harus lebih dari 0",
<mask> "out_of_range_error": "Harus di luar rentang \"{{start}}\"-\"{{end}}\"",
<mask> "lower_range_start_error": "Harus lebih rendah dari rentang awal",
<mask> "greater_range_start_error": "Harus lebih besar dari rentang awal",
<mask> "greater_range_end_error": "Harus lebih besar dari rentang akhir",
<mask> "subnet_error": "Alamat harus dalam satu subnet",
</s> Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit 366600a32ecbb163ab43b43145898bbadcfbc2e9
Author: Ainar Garipov <[email protected]>
Date: Wed Aug 3 15:09:16 2022 +0300
client: fix si-lk
commit 2a55ee3846251e53529f4ef6562e5f4939381eae
Author: Ainar Garipov <[email protected]>
Date: Wed Aug 3 15:03:45 2022 +0300
client: upd i18n </s> remove "encryption_server_desc": "Untuk menggunakan HTTPS, Anda harus memasukkan nama server yang cocok dengan sertifikat SSL Anda. Bila ruas tak ditata, akan menerima koneksi TLS bagi domain manapun.",
</s> add "encryption_server_desc": "Jika disetel, AdGuard Home mendeteksi ClientID, merespons kueri DDR, dan melakukan validasi koneksi tambahan. Jika tidak disetel, fitur-fitur ini dinonaktifkan. Harus cocok dengan salah satu Nama DNS dalam sertifikat.", </s> remove "encryption_server_desc": "Om HTTPS te gebruiken, moet je de servernaam invoeren die overeenkomt met je SSL-certificaat of jokerteken-certificaat. Als het veld niet is ingesteld, accepteert het TLS-verbindingen voor elk domein.",
</s> add "encryption_server_desc": "Indien ingesteld, detecteert AdGuard Home Client-ID's, reageert op DDR-zoekopdrachten en voert aanvullende verbindingsvalidaties uit. Indien niet ingesteld, zijn deze functies uitgeschakeld. Moet overeenkomen met een van de DNS-namen in het certificaat.", </s> add "dns_test_warning_toast": "Upstream \"{{key}}\" reageert niet op testverzoeken en werkt mogelijk niet goed", </s> add "dns_test_warning_toast": "Upstream \"{{key}}\" tidak menanggapi permintaan pengujian dan mungkin tidak berfungsi dengan baik", </s> add "dns_test_warning_toast": "Upstream \"{{key}}\" no responde a las peticiones de prueba y es posible que no funcione correctamente", | https://github.com/AdguardTeam/AdGuardHome/commit/3420becce38e72ef3870f086a86342788ba9a8f8 | client/src/__locales/id.json |
keep keep keep add keep keep keep keep keep keep | <mask> "all_lists_up_to_date_toast": "Semua daftar sudah diperbarui",
<mask> "updated_upstream_dns_toast": "Server upstream berhasil disimpan",
<mask> "dns_test_ok_toast": "Server DNS yang ditentukan bekerja dengan benar",
<mask> "dns_test_not_ok_toast": "Server \"{{key}}\": tidak dapat digunakan, mohon cek bahwa Anda telah menulisnya dengan benar",
<mask> "unblock": "Buka Blokir",
<mask> "block": "Blok",
<mask> "disallow_this_client": "Cabut ijin untuk klien ini",
<mask> "allow_this_client": "Ijinkan klien ini",
<mask> "block_for_this_client_only": "Blok hanya untuk klien ini",
<mask> "unblock_for_this_client_only": "Jangan diblok hanya untuk klien ini",
</s> Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit 366600a32ecbb163ab43b43145898bbadcfbc2e9
Author: Ainar Garipov <[email protected]>
Date: Wed Aug 3 15:09:16 2022 +0300
client: fix si-lk
commit 2a55ee3846251e53529f4ef6562e5f4939381eae
Author: Ainar Garipov <[email protected]>
Date: Wed Aug 3 15:03:45 2022 +0300
client: upd i18n </s> remove "encryption_server_desc": "Untuk menggunakan HTTPS, Anda harus memasukkan nama server yang cocok dengan sertifikat SSL Anda. Bila ruas tak ditata, akan menerima koneksi TLS bagi domain manapun.",
</s> add "encryption_server_desc": "Jika disetel, AdGuard Home mendeteksi ClientID, merespons kueri DDR, dan melakukan validasi koneksi tambahan. Jika tidak disetel, fitur-fitur ini dinonaktifkan. Harus cocok dengan salah satu Nama DNS dalam sertifikat.", </s> add "dns_test_warning_toast": "Upstream \"{{key}}\" no responde a las peticiones de prueba y es posible que no funcione correctamente", </s> remove "encryption_server_desc": "Om HTTPS te gebruiken, moet je de servernaam invoeren die overeenkomt met je SSL-certificaat of jokerteken-certificaat. Als het veld niet is ingesteld, accepteert het TLS-verbindingen voor elk domein.",
</s> add "encryption_server_desc": "Indien ingesteld, detecteert AdGuard Home Client-ID's, reageert op DDR-zoekopdrachten en voert aanvullende verbindingsvalidaties uit. Indien niet ingesteld, zijn deze functies uitgeschakeld. Moet overeenkomen met een van de DNS-namen in het certificaat.", </s> add "dns_test_warning_toast": "Upstream \"{{key}}\" reageert niet op testverzoeken en werkt mogelijk niet goed", </s> add "form_error_gateway_ip": "Sewa tidak dapat memiliki alamat IP gateway", | https://github.com/AdguardTeam/AdGuardHome/commit/3420becce38e72ef3870f086a86342788ba9a8f8 | client/src/__locales/id.json |
keep keep keep keep replace keep keep keep keep keep | <mask> "encryption_desc": "Enkripsi (HTTPS/QUIC/TLS) untuk DNS dan antarmuka admin",
<mask> "encryption_config_saved": "Pengaturan enkripsi telah tersimpan",
<mask> "encryption_server": "Nama server",
<mask> "encryption_server_enter": "Masukkan nama domain anda",
<mask> "encryption_server_desc": "Untuk menggunakan HTTPS, Anda harus memasukkan nama server yang cocok dengan sertifikat SSL Anda. Bila ruas tak ditata, akan menerima koneksi TLS bagi domain manapun.",
<mask> "encryption_redirect": "Alihkan ke HTTPS secara otomatis",
<mask> "encryption_redirect_desc": "Jika dicentang, AdGuard Home akan secara otomatis mengarahkan anda dari HTTP ke alamat HTTPS.",
<mask> "encryption_https": "Port HTTPS",
<mask> "encryption_https_desc": "Jika port HTTPS dikonfigurasi, antarmuka admin Home AdGuard akan dapat diakses melalui HTTPS, dan itu juga akan memberikan DNS-over-HTTPS di lokasi '/ dns-query'.",
<mask> "encryption_dot": "Port DNS-over-TLS",
</s> Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit 366600a32ecbb163ab43b43145898bbadcfbc2e9
Author: Ainar Garipov <[email protected]>
Date: Wed Aug 3 15:09:16 2022 +0300
client: fix si-lk
commit 2a55ee3846251e53529f4ef6562e5f4939381eae
Author: Ainar Garipov <[email protected]>
Date: Wed Aug 3 15:03:45 2022 +0300
client: upd i18n </s> remove "encryption_server_desc": "Om HTTPS te gebruiken, moet je de servernaam invoeren die overeenkomt met je SSL-certificaat of jokerteken-certificaat. Als het veld niet is ingesteld, accepteert het TLS-verbindingen voor elk domein.",
</s> add "encryption_server_desc": "Indien ingesteld, detecteert AdGuard Home Client-ID's, reageert op DDR-zoekopdrachten en voert aanvullende verbindingsvalidaties uit. Indien niet ingesteld, zijn deze functies uitgeschakeld. Moet overeenkomen met een van de DNS-namen in het certificaat.", </s> add "dns_test_warning_toast": "Upstream \"{{key}}\" tidak menanggapi permintaan pengujian dan mungkin tidak berfungsi dengan baik", </s> add "form_error_gateway_ip": "Sewa tidak dapat memiliki alamat IP gateway", </s> add "dns_test_warning_toast": "Upstream \"{{key}}\" no responde a las peticiones de prueba y es posible que no funcione correctamente", </s> add "dns_test_warning_toast": "Upstream \"{{key}}\" reageert niet op testverzoeken en werkt mogelijk niet goed", | https://github.com/AdguardTeam/AdGuardHome/commit/3420becce38e72ef3870f086a86342788ba9a8f8 | client/src/__locales/id.json |
keep keep add keep keep keep keep | <mask> "updated_upstream_dns_toast": "Upstream-servers succesvol opgeslagen",
<mask> "dns_test_ok_toast": "Opgegeven DNS-servers werken correct",
<mask> "dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt, controleer of je het correct hebt geschreven",
<mask> "unblock": "Deblokkeren",
<mask> "block": "Blokkeren",
<mask> "disallow_this_client": "Toepassing/systeem niet toelaten",
<mask> "allow_this_client": "Toepassing/systeem toelaten",
</s> Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit 366600a32ecbb163ab43b43145898bbadcfbc2e9
Author: Ainar Garipov <[email protected]>
Date: Wed Aug 3 15:09:16 2022 +0300
client: fix si-lk
commit 2a55ee3846251e53529f4ef6562e5f4939381eae
Author: Ainar Garipov <[email protected]>
Date: Wed Aug 3 15:03:45 2022 +0300
client: upd i18n </s> remove "encryption_server_desc": "Om HTTPS te gebruiken, moet je de servernaam invoeren die overeenkomt met je SSL-certificaat of jokerteken-certificaat. Als het veld niet is ingesteld, accepteert het TLS-verbindingen voor elk domein.",
</s> add "encryption_server_desc": "Indien ingesteld, detecteert AdGuard Home Client-ID's, reageert op DDR-zoekopdrachten en voert aanvullende verbindingsvalidaties uit. Indien niet ingesteld, zijn deze functies uitgeschakeld. Moet overeenkomen met een van de DNS-namen in het certificaat.", </s> remove "encryption_server_desc": "Untuk menggunakan HTTPS, Anda harus memasukkan nama server yang cocok dengan sertifikat SSL Anda. Bila ruas tak ditata, akan menerima koneksi TLS bagi domain manapun.",
</s> add "encryption_server_desc": "Jika disetel, AdGuard Home mendeteksi ClientID, merespons kueri DDR, dan melakukan validasi koneksi tambahan. Jika tidak disetel, fitur-fitur ini dinonaktifkan. Harus cocok dengan salah satu Nama DNS dalam sertifikat.", </s> add "dns_test_warning_toast": "Upstream \"{{key}}\" tidak menanggapi permintaan pengujian dan mungkin tidak berfungsi dengan baik", </s> add "form_error_gateway_ip": "Sewa tidak dapat memiliki alamat IP gateway", </s> add "dns_test_warning_toast": "Upstream \"{{key}}\" no responde a las peticiones de prueba y es posible que no funcione correctamente", | https://github.com/AdguardTeam/AdGuardHome/commit/3420becce38e72ef3870f086a86342788ba9a8f8 | client/src/__locales/nl.json |
keep keep keep keep replace keep keep keep keep keep | <mask> "encryption_desc": "Encryptie (HTTPS/TLS) ondersteuning voor DNS en admin web interface",
<mask> "encryption_config_saved": "Versleuteling configuratie opgeslagen",
<mask> "encryption_server": "Server naam",
<mask> "encryption_server_enter": "Voer domein naam in",
<mask> "encryption_server_desc": "Om HTTPS te gebruiken, moet je de servernaam invoeren die overeenkomt met je SSL-certificaat of jokerteken-certificaat. Als het veld niet is ingesteld, accepteert het TLS-verbindingen voor elk domein.",
<mask> "encryption_redirect": "Herleid automatisch naar HTTPS",
<mask> "encryption_redirect_desc": "Indien ingeschakeld, zal AdGuard Home je automatisch herleiden van HTTP naar HTTPS.",
<mask> "encryption_https": "HTTPS poort",
<mask> "encryption_https_desc": "Als de HTTPS-poort is geconfigureerd, is de AdGuard Home beheerders interface toegankelijk via HTTPS en biedt deze ook DNS-via-HTTPS op de locatie '/ dns-query'.",
<mask> "encryption_dot": "DNS-via-TLS poort",
</s> Pull request: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit 366600a32ecbb163ab43b43145898bbadcfbc2e9
Author: Ainar Garipov <[email protected]>
Date: Wed Aug 3 15:09:16 2022 +0300
client: fix si-lk
commit 2a55ee3846251e53529f4ef6562e5f4939381eae
Author: Ainar Garipov <[email protected]>
Date: Wed Aug 3 15:03:45 2022 +0300
client: upd i18n </s> remove "encryption_server_desc": "Untuk menggunakan HTTPS, Anda harus memasukkan nama server yang cocok dengan sertifikat SSL Anda. Bila ruas tak ditata, akan menerima koneksi TLS bagi domain manapun.",
</s> add "encryption_server_desc": "Jika disetel, AdGuard Home mendeteksi ClientID, merespons kueri DDR, dan melakukan validasi koneksi tambahan. Jika tidak disetel, fitur-fitur ini dinonaktifkan. Harus cocok dengan salah satu Nama DNS dalam sertifikat.", </s> add "dns_test_warning_toast": "Upstream \"{{key}}\" reageert niet op testverzoeken en werkt mogelijk niet goed", </s> add "dns_test_warning_toast": "Upstream \"{{key}}\" no responde a las peticiones de prueba y es posible que no funcione correctamente", </s> add "dns_test_warning_toast": "Upstream \"{{key}}\" tidak menanggapi permintaan pengujian dan mungkin tidak berfungsi dengan baik", </s> add "form_error_gateway_ip": "Sewa tidak dapat memiliki alamat IP gateway", | https://github.com/AdguardTeam/AdGuardHome/commit/3420becce38e72ef3870f086a86342788ba9a8f8 | client/src/__locales/nl.json |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> npm install -g npm
<mask> curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.23.8
<mask> ;;
<mask> windows)
<mask> choco install nvm
<mask> nvm install node
<mask> npm install -g npm
<mask> ;;
<mask> esac
<mask>
<mask> install:
<mask> - |-
</s> *: travis - use nvs on Windows </s> add node --version
npm --version
nvs --version </s> add node --version
npm --version | https://github.com/AdguardTeam/AdGuardHome/commit/344a0336b0f10451eb252c451a8c1e6baa836609 | .travis.yml |
keep add keep keep keep keep | <mask> case $TRAVIS_OS_NAME in
<mask> linux | osx)
<mask> npm --prefix client ci
<mask> ;;
<mask> windows)
<mask> node --version
</s> *: travis - use nvs on Windows </s> add node --version
npm --version
nvs --version </s> remove choco install nvm
nvm install node
npm install -g npm
</s> add # Using NVS for managing Node.js versions on Windows
NVS_HOME="C:\ProgramData"
git clone --single-branch https://github.com/jasongin/nvs $NVS_HOME
source $NVS_HOME/nvs.sh
nvs add latest
nvs use latest | https://github.com/AdguardTeam/AdGuardHome/commit/344a0336b0f10451eb252c451a8c1e6baa836609 | .travis.yml |
keep add keep keep keep keep | <mask> ;;
<mask> windows)
<mask> npm --prefix client ci
<mask> ;;
<mask> esac
<mask>
</s> *: travis - use nvs on Windows </s> add node --version
npm --version </s> remove choco install nvm
nvm install node
npm install -g npm
</s> add # Using NVS for managing Node.js versions on Windows
NVS_HOME="C:\ProgramData"
git clone --single-branch https://github.com/jasongin/nvs $NVS_HOME
source $NVS_HOME/nvs.sh
nvs add latest
nvs use latest | https://github.com/AdguardTeam/AdGuardHome/commit/344a0336b0f10451eb252c451a8c1e6baa836609 | .travis.yml |
keep add keep keep keep keep keep keep | <mask> "errors"
<mask> "log"
<mask> "strconv"
<mask> "time"
<mask>
<mask> // ratelimiting and per-ip buckets
<mask> "github.com/beefsack/go-rate"
<mask> "github.com/patrickmn/go-cache"
</s> Added ratelimit whitelist and tests </s> remove ratelimit int // in requests per second per IP
</s> add ratelimit int // in requests per second per IP
whitelist []string // a list of whitelisted IP addresses
</s> remove func setup(c *caddy.Controller) error {
</s> add func setupPlugin(c *caddy.Controller) (*plug, error) {
</s> add return p, nil
}
func setup(c *caddy.Controller) error {
p, err := setupPlugin(c)
if err != nil {
return err
}
config := dnsserver.GetConfig(c) </s> remove p.ratelimit = ratelimit
</s> add </s> remove ratelimit, err := strconv.Atoi(args[0])
if err != nil {
return c.ArgErr()
</s> add for c.NextBlock() {
switch c.Val() {
case "whitelist":
p.whitelist = c.RemainingArgs()
if len(p.whitelist) > 0 {
sort.Strings(p.whitelist)
}
} </s> remove if len(args) <= 0 {
continue
</s> add if len(args) > 0 {
ratelimit, err := strconv.Atoi(args[0])
if err != nil {
return nil, c.ArgErr()
}
p.ratelimit = ratelimit | https://github.com/AdguardTeam/AdGuardHome/commit/345e4dc89a18aa0dd0f63458755126cb3f2f4235 | coredns_plugin/ratelimit/ratelimit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "golang.org/x/net/context"
<mask> )
<mask>
<mask> const defaultRatelimit = 100
<mask> const defaultMaxRateLimitedIPs = 1024 * 1024
<mask>
<mask> var (
<mask> tokenBuckets = cache.New(time.Hour, time.Hour)
<mask> )
<mask>
</s> Added ratelimit whitelist and tests </s> add if len(p.whitelist) > 0 && sort.SearchStrings(p.whitelist, ip) >= 0 {
return true, nil
}
</s> add return p, nil
}
func setup(c *caddy.Controller) error {
p, err := setupPlugin(c)
if err != nil {
return err
}
config := dnsserver.GetConfig(c) </s> remove p.ratelimit = ratelimit
</s> add </s> remove ratelimit, err := strconv.Atoi(args[0])
if err != nil {
return c.ArgErr()
</s> add for c.NextBlock() {
switch c.Val() {
case "whitelist":
p.whitelist = c.RemainingArgs()
if len(p.whitelist) > 0 {
sort.Strings(p.whitelist)
}
} </s> remove if len(args) <= 0 {
continue
</s> add if len(args) > 0 {
ratelimit, err := strconv.Atoi(args[0])
if err != nil {
return nil, c.ArgErr()
}
p.ratelimit = ratelimit </s> remove config := dnsserver.GetConfig(c)
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/345e4dc89a18aa0dd0f63458755126cb3f2f4235 | coredns_plugin/ratelimit/ratelimit.go |
keep add keep keep keep keep keep keep | <mask>
<mask> func (p *plug) allowRequest(ip string) (bool, error) {
<mask> if _, found := tokenBuckets.Get(ip); !found {
<mask> tokenBuckets.Set(ip, rate.New(p.ratelimit, time.Second), time.Hour)
<mask> }
<mask>
<mask> value, found := tokenBuckets.Get(ip)
<mask> if !found {
</s> Added ratelimit whitelist and tests </s> remove if len(args) <= 0 {
continue
</s> add if len(args) > 0 {
ratelimit, err := strconv.Atoi(args[0])
if err != nil {
return nil, c.ArgErr()
}
p.ratelimit = ratelimit </s> remove ratelimit, err := strconv.Atoi(args[0])
if err != nil {
return c.ArgErr()
</s> add for c.NextBlock() {
switch c.Val() {
case "whitelist":
p.whitelist = c.RemainingArgs()
if len(p.whitelist) > 0 {
sort.Strings(p.whitelist)
}
} </s> remove func setup(c *caddy.Controller) error {
</s> add func setupPlugin(c *caddy.Controller) (*plug, error) {
</s> remove config := dnsserver.GetConfig(c)
</s> add </s> add return p, nil
}
func setup(c *caddy.Controller) error {
p, err := setupPlugin(c)
if err != nil {
return err
}
config := dnsserver.GetConfig(c) </s> remove p.ratelimit = ratelimit
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/345e4dc89a18aa0dd0f63458755126cb3f2f4235 | coredns_plugin/ratelimit/ratelimit.go |
keep replace keep keep replace keep keep keep | <mask> // configuration for creating above
<mask> ratelimit int // in requests per second per IP
<mask> }
<mask>
<mask> func setup(c *caddy.Controller) error {
<mask> p := &plug{ratelimit: defaultRatelimit}
<mask> config := dnsserver.GetConfig(c)
<mask>
</s> Added ratelimit whitelist and tests </s> remove config := dnsserver.GetConfig(c)
</s> add </s> add return p, nil
}
func setup(c *caddy.Controller) error {
p, err := setupPlugin(c)
if err != nil {
return err
}
config := dnsserver.GetConfig(c) </s> add "sort" </s> remove if len(args) <= 0 {
continue
</s> add if len(args) > 0 {
ratelimit, err := strconv.Atoi(args[0])
if err != nil {
return nil, c.ArgErr()
}
p.ratelimit = ratelimit </s> remove ratelimit, err := strconv.Atoi(args[0])
if err != nil {
return c.ArgErr()
</s> add for c.NextBlock() {
switch c.Val() {
case "whitelist":
p.whitelist = c.RemainingArgs()
if len(p.whitelist) > 0 {
sort.Strings(p.whitelist)
}
} | https://github.com/AdguardTeam/AdGuardHome/commit/345e4dc89a18aa0dd0f63458755126cb3f2f4235 | coredns_plugin/ratelimit/ratelimit.go |
keep replace keep keep keep replace replace keep keep | <mask> p := &plug{ratelimit: defaultRatelimit}
<mask> config := dnsserver.GetConfig(c)
<mask>
<mask> for c.Next() {
<mask> args := c.RemainingArgs()
<mask> if len(args) <= 0 {
<mask> continue
<mask> }
<mask> ratelimit, err := strconv.Atoi(args[0])
</s> Added ratelimit whitelist and tests </s> remove ratelimit, err := strconv.Atoi(args[0])
if err != nil {
return c.ArgErr()
</s> add for c.NextBlock() {
switch c.Val() {
case "whitelist":
p.whitelist = c.RemainingArgs()
if len(p.whitelist) > 0 {
sort.Strings(p.whitelist)
}
} </s> remove func setup(c *caddy.Controller) error {
</s> add func setupPlugin(c *caddy.Controller) (*plug, error) {
</s> remove p.ratelimit = ratelimit
</s> add </s> add return p, nil
}
func setup(c *caddy.Controller) error {
p, err := setupPlugin(c)
if err != nil {
return err
}
config := dnsserver.GetConfig(c) </s> add if len(p.whitelist) > 0 && sort.SearchStrings(p.whitelist, ip) >= 0 {
return true, nil
}
| https://github.com/AdguardTeam/AdGuardHome/commit/345e4dc89a18aa0dd0f63458755126cb3f2f4235 | coredns_plugin/ratelimit/ratelimit.go |
keep replace replace replace keep replace keep | <mask> }
<mask> ratelimit, err := strconv.Atoi(args[0])
<mask> if err != nil {
<mask> return c.ArgErr()
<mask> }
<mask> p.ratelimit = ratelimit
<mask> }
</s> Added ratelimit whitelist and tests </s> remove if len(args) <= 0 {
continue
</s> add if len(args) > 0 {
ratelimit, err := strconv.Atoi(args[0])
if err != nil {
return nil, c.ArgErr()
}
p.ratelimit = ratelimit </s> add return p, nil
}
func setup(c *caddy.Controller) error {
p, err := setupPlugin(c)
if err != nil {
return err
}
config := dnsserver.GetConfig(c) </s> add if len(p.whitelist) > 0 && sort.SearchStrings(p.whitelist, ip) >= 0 {
return true, nil
}
</s> remove config := dnsserver.GetConfig(c)
</s> add </s> remove func setup(c *caddy.Controller) error {
</s> add func setupPlugin(c *caddy.Controller) (*plug, error) {
| https://github.com/AdguardTeam/AdGuardHome/commit/345e4dc89a18aa0dd0f63458755126cb3f2f4235 | coredns_plugin/ratelimit/ratelimit.go |
keep keep keep add keep keep keep keep | <mask> }
<mask> }
<mask> }
<mask>
<mask> config.AddPlugin(func(next plugin.Handler) plugin.Handler {
<mask> p.Next = next
<mask> return p
<mask> })
</s> Added ratelimit whitelist and tests </s> remove p.ratelimit = ratelimit
</s> add </s> remove ratelimit, err := strconv.Atoi(args[0])
if err != nil {
return c.ArgErr()
</s> add for c.NextBlock() {
switch c.Val() {
case "whitelist":
p.whitelist = c.RemainingArgs()
if len(p.whitelist) > 0 {
sort.Strings(p.whitelist)
}
} </s> remove if len(args) <= 0 {
continue
</s> add if len(args) > 0 {
ratelimit, err := strconv.Atoi(args[0])
if err != nil {
return nil, c.ArgErr()
}
p.ratelimit = ratelimit </s> add if len(p.whitelist) > 0 && sort.SearchStrings(p.whitelist, ip) >= 0 {
return true, nil
}
</s> remove config := dnsserver.GetConfig(c)
</s> add </s> remove ratelimit int // in requests per second per IP
</s> add ratelimit int // in requests per second per IP
whitelist []string // a list of whitelisted IP addresses
| https://github.com/AdguardTeam/AdGuardHome/commit/345e4dc89a18aa0dd0f63458755126cb3f2f4235 | coredns_plugin/ratelimit/ratelimit.go |
keep keep replace keep replace keep keep keep | <mask> memoryUsage(args)
<mask>
<mask> // print the first message after logger is configured
<mask> log.Println(version.Full())
<mask> log.Debug("Current working directory is %s", Context.workDir)
<mask> if args.runningAsService {
<mask> log.Info("AdGuard Home is running as a service")
<mask> }
</s> Pull request: 4046 darwin service message
Merge in DNS/adguard-home from 4046-log-dir to master
Closes #4046.
Squashed commit of the following:
commit 05140550b14f477f52487c575f56428ce9e6fa10
Author: Eugene Burkov <[email protected]>
Date: Wed Jan 5 17:54:11 2022 +0500
all: add macOS service msg </s> remove // When running as a Windows service, use eventlog by default if nothing else is configured
// Otherwise, we'll simply loose the log output
</s> add // When running as a Windows service, use eventlog by default if nothing
// else is configured. Otherwise, we'll simply lose the log output. </s> remove // Make sure that we see the microseconds in logs, as networking stuff
// can happen pretty quickly.
</s> add // Make sure that we see the microseconds in logs, as networking stuff can
// happen pretty quickly. </s> add if runtime.GOOS == "darwin" &&
action == "start" &&
!strings.HasPrefix(Context.workDir, "/Applications/") {
log.Info("warning: service must be started from within the /Applications directory")
}
| https://github.com/AdguardTeam/AdGuardHome/commit/34c95f99f86df9dd8c0dcead98424add0523383f | internal/home/home.go |
keep keep keep keep replace replace keep keep keep replace replace keep keep keep keep | <mask> if ls.Verbose {
<mask> log.SetLevel(log.DEBUG)
<mask> }
<mask>
<mask> // Make sure that we see the microseconds in logs, as networking stuff
<mask> // can happen pretty quickly.
<mask> log.SetFlags(log.LstdFlags | log.Lmicroseconds)
<mask>
<mask> if args.runningAsService && ls.LogFile == "" && runtime.GOOS == "windows" {
<mask> // When running as a Windows service, use eventlog by default if nothing else is configured
<mask> // Otherwise, we'll simply loose the log output
<mask> ls.LogFile = configSyslog
<mask> }
<mask>
<mask> // logs are written to stdout (default)
</s> Pull request: 4046 darwin service message
Merge in DNS/adguard-home from 4046-log-dir to master
Closes #4046.
Squashed commit of the following:
commit 05140550b14f477f52487c575f56428ce9e6fa10
Author: Eugene Burkov <[email protected]>
Date: Wed Jan 5 17:54:11 2022 +0500
all: add macOS service msg </s> add if runtime.GOOS == "darwin" &&
action == "start" &&
!strings.HasPrefix(Context.workDir, "/Applications/") {
log.Info("warning: service must be started from within the /Applications directory")
}
</s> remove // print the first message after logger is configured
</s> add // Print the first message after logger is configured. </s> remove log.Debug("Current working directory is %s", Context.workDir)
</s> add log.Debug("current working directory is %s", Context.workDir) | https://github.com/AdguardTeam/AdGuardHome/commit/34c95f99f86df9dd8c0dcead98424add0523383f | internal/home/home.go |
keep keep add keep keep keep keep keep | <mask> // On OpenWrt, the service utility may not exist. We use our service script
<mask> // directly in this case.
<mask> func svcAction(s service.Service, action string) (err error) {
<mask> err = service.Control(s, action)
<mask> if err != nil && service.Platform() == "unix-systemv" &&
<mask> (action == "start" || action == "stop" || action == "restart") {
<mask> _, err = runInitdCommand(action)
<mask>
</s> Pull request: 4046 darwin service message
Merge in DNS/adguard-home from 4046-log-dir to master
Closes #4046.
Squashed commit of the following:
commit 05140550b14f477f52487c575f56428ce9e6fa10
Author: Eugene Burkov <[email protected]>
Date: Wed Jan 5 17:54:11 2022 +0500
all: add macOS service msg </s> remove // When running as a Windows service, use eventlog by default if nothing else is configured
// Otherwise, we'll simply loose the log output
</s> add // When running as a Windows service, use eventlog by default if nothing
// else is configured. Otherwise, we'll simply lose the log output. </s> remove // Make sure that we see the microseconds in logs, as networking stuff
// can happen pretty quickly.
</s> add // Make sure that we see the microseconds in logs, as networking stuff can
// happen pretty quickly. </s> remove // print the first message after logger is configured
</s> add // Print the first message after logger is configured. </s> remove log.Debug("Current working directory is %s", Context.workDir)
</s> add log.Debug("current working directory is %s", Context.workDir) | https://github.com/AdguardTeam/AdGuardHome/commit/34c95f99f86df9dd8c0dcead98424add0523383f | internal/home/service.go |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> Port int `json:"port"`
<mask> }
<mask>
<mask> type firstRunData struct {
<mask> Web ipport `json:"web"`
<mask> DNS ipport `json:"dns"`
<mask> Username string `json:"username,omitempty"`
<mask> Password string `json:"password,omitempty"`
<mask> }
<mask>
<mask> func handleGetDefaultAddresses(w http.ResponseWriter, r *http.Request) {
<mask> data := firstRunData{}
<mask> ifaces, err := getValidNetInterfaces()
</s> /install/get_default_addresses -- now it gives out list of interfaces </s> add data.Interfaces = make(map[string]interface{})
for _, iface := range ifaces {
data.Interfaces[iface.Name] = iface
} </s> remove // find an interface with an ipv4 address
addr := findIPv4IfaceAddr(ifaces)
if len(addr) == 0 {
httpError(w, http.StatusServiceUnavailable, "Couldn't find any interface with IPv4, plase try again later")
return
}
data.Web.IP = addr
data.DNS.IP = addr
</s> add // fill out the fields </s> add // TODO: validate that hosts and ports are bindable | https://github.com/AdguardTeam/AdGuardHome/commit/34e14930deec600a24db4fb8ceaa1daa63776c1c | control.go |
keep keep keep keep replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> httpError(w, http.StatusServiceUnavailable, "Couldn't find any legible interface, plase try again later")
<mask> return
<mask> }
<mask>
<mask> // find an interface with an ipv4 address
<mask> addr := findIPv4IfaceAddr(ifaces)
<mask> if len(addr) == 0 {
<mask> httpError(w, http.StatusServiceUnavailable, "Couldn't find any interface with IPv4, plase try again later")
<mask> return
<mask> }
<mask> data.Web.IP = addr
<mask> data.DNS.IP = addr
<mask> data.Web.Port = 3000 // TODO: find out if port 80 is available -- if not, fall back to 3000
<mask> data.DNS.Port = 53 // TODO: find out if port 53 is available -- if not, show a big warning
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> err = json.NewEncoder(w).Encode(data)
</s> /install/get_default_addresses -- now it gives out list of interfaces </s> add data.Interfaces = make(map[string]interface{})
for _, iface := range ifaces {
data.Interfaces[iface.Name] = iface
} </s> add // TODO: validate that hosts and ports are bindable </s> remove Web ipport `json:"web"`
DNS ipport `json:"dns"`
Username string `json:"username,omitempty"`
Password string `json:"password,omitempty"`
</s> add Web ipport `json:"web"`
DNS ipport `json:"dns"`
Username string `json:"username,omitempty"`
Password string `json:"password,omitempty"`
Interfaces map[string]interface{} `json:"interfaces"` | https://github.com/AdguardTeam/AdGuardHome/commit/34e14930deec600a24db4fb8ceaa1daa63776c1c | control.go |
keep keep add keep keep keep keep keep | <mask> // fill out the fields
<mask> data.Web.Port = 3000 // TODO: find out if port 80 is available -- if not, fall back to 3000
<mask> data.DNS.Port = 53 // TODO: find out if port 53 is available -- if not, show a big warning
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> err = json.NewEncoder(w).Encode(data)
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "Unable to marshal default addresses to json: %s", err)
</s> /install/get_default_addresses -- now it gives out list of interfaces </s> remove // find an interface with an ipv4 address
addr := findIPv4IfaceAddr(ifaces)
if len(addr) == 0 {
httpError(w, http.StatusServiceUnavailable, "Couldn't find any interface with IPv4, plase try again later")
return
}
data.Web.IP = addr
data.DNS.IP = addr
</s> add // fill out the fields </s> add // TODO: validate that hosts and ports are bindable </s> remove Web ipport `json:"web"`
DNS ipport `json:"dns"`
Username string `json:"username,omitempty"`
Password string `json:"password,omitempty"`
</s> add Web ipport `json:"web"`
DNS ipport `json:"dns"`
Username string `json:"username,omitempty"`
Password string `json:"password,omitempty"`
Interfaces map[string]interface{} `json:"interfaces"` | https://github.com/AdguardTeam/AdGuardHome/commit/34e14930deec600a24db4fb8ceaa1daa63776c1c | control.go |
keep add keep keep keep keep | <mask>
<mask> spew.Dump(newSettings)
<mask> config.firstRun = false
<mask> config.BindHost = newSettings.Web.IP
<mask> config.BindPort = newSettings.Web.Port
<mask> config.DNS.BindHost = newSettings.DNS.IP
</s> /install/get_default_addresses -- now it gives out list of interfaces </s> add data.Interfaces = make(map[string]interface{})
for _, iface := range ifaces {
data.Interfaces[iface.Name] = iface
} </s> remove // find an interface with an ipv4 address
addr := findIPv4IfaceAddr(ifaces)
if len(addr) == 0 {
httpError(w, http.StatusServiceUnavailable, "Couldn't find any interface with IPv4, plase try again later")
return
}
data.Web.IP = addr
data.DNS.IP = addr
</s> add // fill out the fields </s> remove Web ipport `json:"web"`
DNS ipport `json:"dns"`
Username string `json:"username,omitempty"`
Password string `json:"password,omitempty"`
</s> add Web ipport `json:"web"`
DNS ipport `json:"dns"`
Username string `json:"username,omitempty"`
Password string `json:"password,omitempty"`
Interfaces map[string]interface{} `json:"interfaces"` | https://github.com/AdguardTeam/AdGuardHome/commit/34e14930deec600a24db4fb8ceaa1daa63776c1c | control.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return nil
<mask> }
<mask>
<mask> // Upd returns the channel into which the updates are sent. The receivable
<mask> // map's values are guaranteed to be of type of *stringutil.Set.
<mask> func (hc *HostsContainer) Upd() (updates <-chan *netutil.IPMap) {
<mask> return hc.updates
<mask> }
<mask>
<mask> // pathsToPatterns converts paths into patterns compatible with fs.Glob.
</s> Pull request: all: use canonical names for hosts file runtime clients
Updates #4683.
Squashed commit of the following:
commit daa8fdaee574d4ac2171f6b13c5ce3f3fedd9801
Author: Ainar Garipov <[email protected]>
Date: Thu Jul 7 19:13:29 2022 +0300
all: use canonical names for hosts file runtime clients </s> add // target's values must be of type *HostsRecord. </s> remove // addPair puts the pair of ip and host to the rules builder if needed. For
// each ip the first member of hosts will become the main one.
func (hp *hostsParser) addPairs(ip net.IP, hosts []string) {
v, ok := hp.table.Get(ip)
if !ok {
// This ip is added at the first time.
v = stringutil.NewSet()
hp.table.Set(ip, v)
</s> add // HostsRecord represents a single hosts file record.
type HostsRecord struct {
Aliases *stringutil.Set
Canonical string
}
// Equal returns true if all fields of rec are equal to field in other or they
// both are nil.
func (rec *HostsRecord) Equal(other *HostsRecord) (ok bool) {
if rec == nil {
return other == nil </s> remove // Return true if every value from the IP map has no discrepancies with the
// appropriate one from the target.
return !ok
</s> add return ok </s> remove var set *stringutil.Set
set, ok = v.(*stringutil.Set)
</s> add return rec.Canonical == other.Canonical && rec.Aliases.Equal(other.Aliases)
}
// addRecord puts the record for the IP address to the rules builder if needed.
// The first host is considered to be the canonical name for the IP address.
// hosts must have at least one name.
func (hp *hostsParser) addRecord(ip net.IP, hosts []string) {
line := strings.Join(append([]string{ip.String()}, hosts...), " ")
var rec *HostsRecord
v, ok := hp.table.Get(ip) </s> remove log.Debug("clients: added %d client aliases from system hosts-file", n)
</s> add log.Debug("clients: added %d client aliases from system hosts file", n) </s> remove // defined by refreshIvl. It disables auto-resfreshing if refreshIvl is 0. If
</s> add // defined by refreshIvl. It disables auto-refreshing if refreshIvl is 0. If | https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9 | internal/aghnet/hostscontainer.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if ip == nil || len(hosts) == 0 {
<mask> continue
<mask> }
<mask>
<mask> hp.addPairs(ip, hosts)
<mask> }
<mask>
<mask> return nil, true, s.Err()
<mask> }
<mask>
</s> Pull request: all: use canonical names for hosts file runtime clients
Updates #4683.
Squashed commit of the following:
commit daa8fdaee574d4ac2171f6b13c5ce3f3fedd9801
Author: Ainar Garipov <[email protected]>
Date: Thu Jul 7 19:13:29 2022 +0300
all: use canonical names for hosts file runtime clients </s> remove processed := strings.Join(append([]string{ip.String()}, hosts...), " ")
for _, h := range hosts {
if set.Has(h) {
</s> add for _, host := range hosts {
if rec.Canonical == host || rec.Aliases.Has(host) { </s> add // target's values must be of type *HostsRecord. </s> remove // addPair puts the pair of ip and host to the rules builder if needed. For
// each ip the first member of hosts will become the main one.
func (hp *hostsParser) addPairs(ip net.IP, hosts []string) {
v, ok := hp.table.Get(ip)
if !ok {
// This ip is added at the first time.
v = stringutil.NewSet()
hp.table.Set(ip, v)
</s> add // HostsRecord represents a single hosts file record.
type HostsRecord struct {
Aliases *stringutil.Set
Canonical string
}
// Equal returns true if all fields of rec are equal to field in other or they
// both are nil.
func (rec *HostsRecord) Equal(other *HostsRecord) (ok bool) {
if rec == nil {
return other == nil </s> remove hosts, ok := v.(*stringutil.Set)
</s> add rec, ok := v.(*aghnet.HostsRecord) </s> remove hp.table.Range(func(ip net.IP, b interface{}) (cont bool) {
// ok is set to true if the target doesn't contain ip or if the
// appropriate hosts set isn't equal to the checked one.
if a, hasIP := target.Get(ip); !hasIP {
ok = true
} else if hosts, aok := a.(*stringutil.Set); aok {
ok = !hosts.Equal(b.(*stringutil.Set))
</s> add hp.table.Range(func(ip net.IP, recVal interface{}) (cont bool) {
var targetVal interface{}
targetVal, ok = target.Get(ip)
if !ok {
return false </s> remove set.Add(h)
</s> add rec.Aliases.Add(host) | https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9 | internal/aghnet/hostscontainer.go |
keep keep replace replace replace replace replace replace replace replace keep keep replace replace keep | <mask> }
<mask>
<mask> // addPair puts the pair of ip and host to the rules builder if needed. For
<mask> // each ip the first member of hosts will become the main one.
<mask> func (hp *hostsParser) addPairs(ip net.IP, hosts []string) {
<mask> v, ok := hp.table.Get(ip)
<mask> if !ok {
<mask> // This ip is added at the first time.
<mask> v = stringutil.NewSet()
<mask> hp.table.Set(ip, v)
<mask> }
<mask>
<mask> var set *stringutil.Set
<mask> set, ok = v.(*stringutil.Set)
<mask> if !ok {
</s> Pull request: all: use canonical names for hosts file runtime clients
Updates #4683.
Squashed commit of the following:
commit daa8fdaee574d4ac2171f6b13c5ce3f3fedd9801
Author: Ainar Garipov <[email protected]>
Date: Thu Jul 7 19:13:29 2022 +0300
all: use canonical names for hosts file runtime clients </s> remove hp.table.Range(func(ip net.IP, b interface{}) (cont bool) {
// ok is set to true if the target doesn't contain ip or if the
// appropriate hosts set isn't equal to the checked one.
if a, hasIP := target.Get(ip); !hasIP {
ok = true
} else if hosts, aok := a.(*stringutil.Set); aok {
ok = !hosts.Equal(b.(*stringutil.Set))
</s> add hp.table.Range(func(ip net.IP, recVal interface{}) (cont bool) {
var targetVal interface{}
targetVal, ok = target.Get(ip)
if !ok {
return false </s> add // addRules adds rules and rule translations for the line.
func (hp *hostsParser) addRules(ip net.IP, host, line string) {
rule, rulePtr := hp.writeRules(host, ip)
hp.translations[rule], hp.translations[rulePtr] = line, line
log.Debug("%s: added ip-host pair %q-%q", hostsContainerPref, ip, host)
}
</s> remove // Return true if every value from the IP map has no discrepancies with the
// appropriate one from the target.
return !ok
</s> add return ok </s> add // target's values must be of type *HostsRecord. </s> remove // Continue only if maps has no discrepancies.
return !ok
</s> add var rec *HostsRecord
rec, ok = recVal.(*HostsRecord)
if !ok {
log.Error("%s: comparing: unexpected type %T", hostsContainerPref, recVal)
return false
}
var targetRec *HostsRecord
targetRec, ok = targetVal.(*HostsRecord)
if !ok {
log.Error("%s: comparing: target: unexpected type %T", hostsContainerPref, targetVal)
return false
}
ok = rec.Equal(targetRec)
return ok | https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9 | internal/aghnet/hostscontainer.go |
keep keep keep replace keep replace keep keep | <mask> var set *stringutil.Set
<mask> set, ok = v.(*stringutil.Set)
<mask> if !ok {
<mask> log.Debug("%s: adding pairs: unexpected value type %T", hostsContainerPref, v)
<mask>
<mask> return
<mask> }
<mask>
</s> Pull request: all: use canonical names for hosts file runtime clients
Updates #4683.
Squashed commit of the following:
commit daa8fdaee574d4ac2171f6b13c5ce3f3fedd9801
Author: Ainar Garipov <[email protected]>
Date: Thu Jul 7 19:13:29 2022 +0300
all: use canonical names for hosts file runtime clients </s> remove var set *stringutil.Set
set, ok = v.(*stringutil.Set)
</s> add return rec.Canonical == other.Canonical && rec.Aliases.Equal(other.Aliases)
}
// addRecord puts the record for the IP address to the rules builder if needed.
// The first host is considered to be the canonical name for the IP address.
// hosts must have at least one name.
func (hp *hostsParser) addRecord(ip net.IP, hosts []string) {
line := strings.Join(append([]string{ip.String()}, hosts...), " ")
var rec *HostsRecord
v, ok := hp.table.Get(ip) </s> remove // Continue only if maps has no discrepancies.
return !ok
</s> add var rec *HostsRecord
rec, ok = recVal.(*HostsRecord)
if !ok {
log.Error("%s: comparing: unexpected type %T", hostsContainerPref, recVal)
return false
}
var targetRec *HostsRecord
targetRec, ok = targetVal.(*HostsRecord)
if !ok {
log.Error("%s: comparing: target: unexpected type %T", hostsContainerPref, targetVal)
return false
}
ok = rec.Equal(targetRec)
return ok </s> remove var set *stringutil.Set
set, ok = v.(*stringutil.Set)
require.True(t, ok)
</s> add require.IsType(t, (*HostsRecord)(nil), v) </s> remove assert.True(t, set.Equal(wantHosts))
</s> add rec, _ := v.(*HostsRecord)
require.NotNil(t, rec)
assert.Truef(t, rec.Equal(want), "%+v != %+v", rec, want) </s> remove // addPair puts the pair of ip and host to the rules builder if needed. For
// each ip the first member of hosts will become the main one.
func (hp *hostsParser) addPairs(ip net.IP, hosts []string) {
v, ok := hp.table.Get(ip)
if !ok {
// This ip is added at the first time.
v = stringutil.NewSet()
hp.table.Set(ip, v)
</s> add // HostsRecord represents a single hosts file record.
type HostsRecord struct {
Aliases *stringutil.Set
Canonical string
}
// Equal returns true if all fields of rec are equal to field in other or they
// both are nil.
func (rec *HostsRecord) Equal(other *HostsRecord) (ok bool) {
if rec == nil {
return other == nil | https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9 | internal/aghnet/hostscontainer.go |
keep replace replace replace keep keep keep replace keep | <mask>
<mask> processed := strings.Join(append([]string{ip.String()}, hosts...), " ")
<mask> for _, h := range hosts {
<mask> if set.Has(h) {
<mask> continue
<mask> }
<mask>
<mask> set.Add(h)
<mask>
</s> Pull request: all: use canonical names for hosts file runtime clients
Updates #4683.
Squashed commit of the following:
commit daa8fdaee574d4ac2171f6b13c5ce3f3fedd9801
Author: Ainar Garipov <[email protected]>
Date: Thu Jul 7 19:13:29 2022 +0300
all: use canonical names for hosts file runtime clients </s> remove return
</s> add rec.Canonical, hosts = hosts[0], hosts[1:]
hp.addRules(ip, rec.Canonical, line)
hp.table.Set(ip, rec)
} else {
rec, ok = v.(*HostsRecord)
if !ok {
log.Error("%s: adding pairs: unexpected type %T", hostsContainerPref, v)
return
} </s> remove log.Debug("%s: adding pairs: unexpected value type %T", hostsContainerPref, v)
</s> add rec = &HostsRecord{
Aliases: stringutil.NewSet(),
} </s> remove var set *stringutil.Set
set, ok = v.(*stringutil.Set)
</s> add return rec.Canonical == other.Canonical && rec.Aliases.Equal(other.Aliases)
}
// addRecord puts the record for the IP address to the rules builder if needed.
// The first host is considered to be the canonical name for the IP address.
// hosts must have at least one name.
func (hp *hostsParser) addRecord(ip net.IP, hosts []string) {
line := strings.Join(append([]string{ip.String()}, hosts...), " ")
var rec *HostsRecord
v, ok := hp.table.Get(ip) </s> remove rule, rulePtr := hp.writeRules(h, ip)
hp.translations[rule], hp.translations[rulePtr] = processed, processed
log.Debug("%s: added ip-host pair %q-%q", hostsContainerPref, ip, h)
</s> add hp.addRules(ip, host, line) </s> remove hosts, ok := v.(*stringutil.Set)
</s> add rec, ok := v.(*aghnet.HostsRecord) | https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9 | internal/aghnet/hostscontainer.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.