docstring_tokens
stringlengths
0
76.5k
code_tokens
stringlengths
75
1.81M
label_window
listlengths
4
2.12k
html_url
stringlengths
74
116
file_name
stringlengths
3
311
a, err = newAccessCtx(nil, clients, nil) require.NoError(t, err)
<mask> if !tc.allowed { <mask> allowedRules, disallowedRules = disallowedRules, allowedRules <mask> } <mask> <mask> aCtx, err := newAccessCtx(allowedRules, disallowedRules, nil) <mask> require.NoError(t, err) <mask> <mask> disallowed, rule := aCtx.IsBlockedIP(tc.ip) <mask> assert.Equal(...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/access_test.go
assert.True(t, a.isBlockedClientID(clientID))
<mask> <mask> aCtx, err := newAccessCtx(allowedRules, disallowedRules, nil) <mask> require.NoError(t, err) <mask> <mask> disallowed, rule := aCtx.IsBlockedIP(tc.ip) <mask> assert.Equal(t, tc.wantDis, disallowed) <mask> assert.Equal(t, tc.wantRule, rule) <mask> }) <mask> } <mask> } <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/access_test.go
func TestIsBlockedHost(t *testing.T) { a, err := newAccessCtx(nil, nil, []string{
<mask> }) <mask> } <mask> } <mask> <mask> func TestIsBlockedDomain(t *testing.T) { <mask> aCtx, err := newAccessCtx(nil, nil, []string{ <mask> "host1", <mask> "*.host.com", <mask> "||host3.com^", <mask> }) <mask> require.NoError(t, err) </s> Pull request: all: allow clientid in access settings ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/access_test.go
name string host string want bool
<mask> }) <mask> require.NoError(t, err) <mask> <mask> testCases := []struct { <mask> name string <mask> domain string <mask> want bool <mask> }{{ <mask> name: "plain_match", <mask> domain: "host1", <mask> want: true, <mask> }, { </s> Pull request: all: allow clientid in access se...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/access_test.go
name: "plain_match", host: "host1", want: true,
<mask> name string <mask> domain string <mask> want bool <mask> }{{ <mask> name: "plain_match", <mask> domain: "host1", <mask> want: true, <mask> }, { <mask> name: "plain_mismatch", <mask> domain: "host2", <mask> want: false, <mask> }, { </s> Pull request: all: allow client...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/access_test.go
name: "plain_mismatch", host: "host2", want: false,
<mask> name: "plain_match", <mask> domain: "host1", <mask> want: true, <mask> }, { <mask> name: "plain_mismatch", <mask> domain: "host2", <mask> want: false, <mask> }, { <mask> name: "wildcard_type-1_match_short", <mask> domain: "asdf.host.com", <mask> want: true, <mask> }, ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/access_test.go
name: "subdomain_match_short", host: "asdf.host.com", want: true,
<mask> name: "plain_mismatch", <mask> domain: "host2", <mask> want: false, <mask> }, { <mask> name: "wildcard_type-1_match_short", <mask> domain: "asdf.host.com", <mask> want: true, <mask> }, { <mask> name: "wildcard_type-1_match_long", <mask> domain: "qwer.asdf.host.com", <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/access_test.go
name: "subdomain_match_long", host: "qwer.asdf.host.com", want: true,
<mask> name: "wildcard_type-1_match_short", <mask> domain: "asdf.host.com", <mask> want: true, <mask> }, { <mask> name: "wildcard_type-1_match_long", <mask> domain: "qwer.asdf.host.com", <mask> want: true, <mask> }, { <mask> name: "wildcard_type-1_mismatch_no-lead", <mask> domain: ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/access_test.go
name: "subdomain_mismatch_no_lead", host: "host.com", want: false,
<mask> name: "wildcard_type-1_match_long", <mask> domain: "qwer.asdf.host.com", <mask> want: true, <mask> }, { <mask> name: "wildcard_type-1_mismatch_no-lead", <mask> domain: "host.com", <mask> want: false, <mask> }, { <mask> name: "wildcard_type-1_mismatch_bad-asterisk", <mask> do...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/access_test.go
name: "subdomain_mismatch_bad_asterisk", host: "asdf.zhost.com", want: false,
<mask> name: "wildcard_type-1_mismatch_no-lead", <mask> domain: "host.com", <mask> want: false, <mask> }, { <mask> name: "wildcard_type-1_mismatch_bad-asterisk", <mask> domain: "asdf.zhost.com", <mask> want: false, <mask> }, { <mask> name: "wildcard_type-2_match_simple", <mask> dom...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/access_test.go
name: "rule_match_simple", host: "host3.com", want: true,
<mask> name: "wildcard_type-1_mismatch_bad-asterisk", <mask> domain: "asdf.zhost.com", <mask> want: false, <mask> }, { <mask> name: "wildcard_type-2_match_simple", <mask> domain: "host3.com", <mask> want: true, <mask> }, { <mask> name: "wildcard_type-2_match_complex", <mask> domain...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/access_test.go
name: "rule_match_complex", host: "asdf.host3.com", want: true,
<mask> name: "wildcard_type-2_match_simple", <mask> domain: "host3.com", <mask> want: true, <mask> }, { <mask> name: "wildcard_type-2_match_complex", <mask> domain: "asdf.host3.com", <mask> want: true, <mask> }, { <mask> name: "wildcard_type-2_mismatch", <mask> domain: ".host3.com"...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/access_test.go
name: "rule_mismatch", host: ".host3.com", want: false,
<mask> name: "wildcard_type-2_match_complex", <mask> domain: "asdf.host3.com", <mask> want: true, <mask> }, { <mask> name: "wildcard_type-2_mismatch", <mask> domain: ".host3.com", <mask> want: false, <mask> }} <mask> <mask> for _, tc := range testCases { <mask> t.Run(tc.name, func(t...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/access_test.go
assert.Equal(t, tc.want, a.isBlockedHost(tc.host))
<mask> }} <mask> <mask> for _, tc := range testCases { <mask> t.Run(tc.name, func(t *testing.T) { <mask> assert.Equal(t, tc.want, aCtx.IsBlockedDomain(tc.domain)) <mask> }) <mask> } <mask> } </s> Pull request: all: allow clientid in access settings Updates #2624. Updates #3162. Squashed commit of ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/access_test.go
"encoding/binary"
<mask> import ( <mask> "crypto/tls" <mask> "fmt" <mask> "path" <mask> "strings" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet" <mask> "github.com/AdguardTeam/dnsproxy/proxy" </s> Pull request: all: allow clientid in access settings Updates #2624. Updates #3162. Squashed commit of t...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
// clientIDFromDNSContextHTTPS extracts the client's ID from the path of the
<mask> <mask> return clientID, nil <mask> } <mask> <mask> // processClientIDHTTPS extracts the client's ID from the path of the <mask> // client's DNS-over-HTTPS request. <mask> func processClientIDHTTPS(ctx *dnsContext) (rc resultCode) { <mask> pctx := ctx.proxyCtx <mask> r := pctx.HTTPRequest <mask> i...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
func clientIDFromDNSContextHTTPS(pctx *proxy.DNSContext) (clientID string, err error) {
<mask> } <mask> <mask> // processClientIDHTTPS extracts the client's ID from the path of the <mask> // client's DNS-over-HTTPS request. <mask> func processClientIDHTTPS(ctx *dnsContext) (rc resultCode) { <mask> pctx := ctx.proxyCtx <mask> r := pctx.HTTPRequest <mask> if r == nil { <mask> ctx.err = fmt.Er...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
return "", fmt.Errorf( "proxy ctx http request of proto %s is nil", pctx.Proto, )
<mask> func processClientIDHTTPS(ctx *dnsContext) (rc resultCode) { <mask> pctx := ctx.proxyCtx <mask> r := pctx.HTTPRequest <mask> if r == nil { <mask> ctx.err = fmt.Errorf("proxy ctx http request of proto %s is nil", pctx.Proto) <mask> <mask> return resultCodeError <mask> } <mask> <mask> origPath...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
return "", fmt.Errorf("client id check: invalid path %q", origPath)
<mask> parts = parts[1:] <mask> } <mask> <mask> if len(parts) == 0 || parts[0] != "dns-query" { <mask> ctx.err = fmt.Errorf("client id check: invalid path %q", origPath) <mask> <mask> return resultCodeError <mask> } <mask> <mask> clientID := "" <mask> switch len(parts) { <mask> case 1: </s> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
<mask> <mask> return resultCodeError <mask> } <mask> <mask> clientID := "" <mask> switch len(parts) { <mask> case 1: <mask> // Just /dns-query, no client ID. <mask> return resultCodeSuccess <mask> case 2: </s> Pull request: all: allow clientid in access settings Updates #2624. Updates #3162. S...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
return "", nil
<mask> clientID := "" <mask> switch len(parts) { <mask> case 1: <mask> // Just /dns-query, no client ID. <mask> return resultCodeSuccess <mask> case 2: <mask> clientID = parts[1] <mask> default: <mask> ctx.err = fmt.Errorf("client id check: invalid path %q: extra parts", origPath) <mask> </s> P...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
return "", fmt.Errorf("client id check: invalid path %q: extra parts", origPath)
<mask> return resultCodeSuccess <mask> case 2: <mask> clientID = parts[1] <mask> default: <mask> ctx.err = fmt.Errorf("client id check: invalid path %q: extra parts", origPath) <mask> <mask> return resultCodeError <mask> } <mask> <mask> err := ValidateClientID(clientID) <mask> if err != nil { ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
err = ValidateClientID(clientID)
<mask> <mask> return resultCodeError <mask> } <mask> <mask> err := ValidateClientID(clientID) <mask> if err != nil { <mask> ctx.err = fmt.Errorf("client id check: %w", err) <mask> <mask> return resultCodeError <mask> } </s> Pull request: all: allow clientid in access settings Updates #2624. Upd...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
return "", fmt.Errorf("client id check: %w", err)
<mask> } <mask> <mask> err := ValidateClientID(clientID) <mask> if err != nil { <mask> ctx.err = fmt.Errorf("client id check: %w", err) <mask> <mask> return resultCodeError <mask> } <mask> <mask> ctx.clientID = clientID <mask> <mask> return resultCodeSuccess </s> Pull request: all: allow clie...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
return clientID, nil
<mask> <mask> return resultCodeError <mask> } <mask> <mask> ctx.clientID = clientID <mask> <mask> return resultCodeSuccess <mask> } <mask> <mask> // tlsConn is a narrow interface for *tls.Conn to simplify testing. <mask> type tlsConn interface { <mask> ConnectionState() (cs tls.ConnectionState) <...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
// clientIDFromDNSContext extracts the client's ID from the server name of the // client's DoT or DoQ request or the path of the client's DoH. If the protocol // is not one of these, clientID is an empty string and err is nil. func (s *Server) clientIDFromDNSContext(pctx *proxy.DNSContext) (clientID string, err error)...
<mask> type quicSession interface { <mask> ConnectionState() (cs quic.ConnectionState) <mask> } <mask> <mask> // processClientID extracts the client's ID from the server name of the client's <mask> // DoT or DoQ request or the path of the client's DoH. <mask> func processClientID(dctx *dnsContext) (rc resultCo...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
return clientIDFromDNSContextHTTPS(pctx)
<mask> func processClientID(dctx *dnsContext) (rc resultCode) { <mask> pctx := dctx.proxyCtx <mask> proto := pctx.Proto <mask> if proto == proxy.ProtoHTTPS { <mask> return processClientIDHTTPS(dctx) <mask> } else if proto != proxy.ProtoTLS && proto != proxy.ProtoQUIC { <mask> return resultCodeSuccess <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
return "", nil
<mask> proto := pctx.Proto <mask> if proto == proxy.ProtoHTTPS { <mask> return processClientIDHTTPS(dctx) <mask> } else if proto != proxy.ProtoTLS && proto != proxy.ProtoQUIC { <mask> return resultCodeSuccess <mask> } <mask> <mask> srvConf := dctx.srv.conf <mask> hostSrvName := srvConf.TLSConfig.Ser...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
hostSrvName := s.conf.ServerName
<mask> } else if proto != proxy.ProtoTLS && proto != proxy.ProtoQUIC { <mask> return resultCodeSuccess <mask> } <mask> <mask> srvConf := dctx.srv.conf <mask> hostSrvName := srvConf.TLSConfig.ServerName <mask> if hostSrvName == "" { <mask> return resultCodeSuccess <mask> } <mask> <mask> cliSrvNam...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
return "", nil
<mask> <mask> srvConf := dctx.srv.conf <mask> hostSrvName := srvConf.TLSConfig.ServerName <mask> if hostSrvName == "" { <mask> return resultCodeSuccess <mask> } <mask> <mask> cliSrvName := "" <mask> if proto == proxy.ProtoTLS { <mask> conn := pctx.Conn </s> Pull request: all: allow clientid in ac...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
switch proto { case proxy.ProtoTLS:
<mask> return resultCodeSuccess <mask> } <mask> <mask> cliSrvName := "" <mask> if proto == proxy.ProtoTLS { <mask> conn := pctx.Conn <mask> tc, ok := conn.(tlsConn) <mask> if !ok { <mask> dctx.err = fmt.Errorf("proxy ctx conn of proto %s is %T, want *tls.Conn", proto, conn) <mask> </s> Pull r...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
return "", fmt.Errorf( "proxy ctx conn of proto %s is %T, want *tls.Conn", proto, conn, )
<mask> if proto == proxy.ProtoTLS { <mask> conn := pctx.Conn <mask> tc, ok := conn.(tlsConn) <mask> if !ok { <mask> dctx.err = fmt.Errorf("proxy ctx conn of proto %s is %T, want *tls.Conn", proto, conn) <mask> <mask> return resultCodeError <mask> } <mask> <mask> cliSrvName = tc.ConnectionSt...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
case proxy.ProtoQUIC:
<mask> return resultCodeError <mask> } <mask> <mask> cliSrvName = tc.ConnectionState().ServerName <mask> } else if proto == proxy.ProtoQUIC { <mask> qs, ok := pctx.QUICSession.(quicSession) <mask> if !ok { <mask> dctx.err = fmt.Errorf("proxy ctx quic session of proto %s is %T, want quic.Session"...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
return "", fmt.Errorf( "proxy ctx quic session of proto %s is %T, want quic.Session", proto, pctx.QUICSession, )
<mask> cliSrvName = tc.ConnectionState().ServerName <mask> } else if proto == proxy.ProtoQUIC { <mask> qs, ok := pctx.QUICSession.(quicSession) <mask> if !ok { <mask> dctx.err = fmt.Errorf("proxy ctx quic session of proto %s is %T, want quic.Session", proto, pctx.QUICSession) <mask> <mask> return r...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
clientID, err = clientIDFromClientServerName( hostSrvName, cliSrvName, s.conf.StrictSNICheck, )
<mask> <mask> cliSrvName = qs.ConnectionState().TLS.ServerName <mask> } <mask> <mask> clientID, err := clientIDFromClientServerName(hostSrvName, cliSrvName, srvConf.StrictSNICheck) <mask> if err != nil { <mask> dctx.err = fmt.Errorf("client id check: %w", err) <mask> <mask> return resultCodeError ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
return "", fmt.Errorf("client id check: %w", err) }
<mask> } <mask> <mask> clientID, err := clientIDFromClientServerName(hostSrvName, cliSrvName, srvConf.StrictSNICheck) <mask> if err != nil { <mask> dctx.err = fmt.Errorf("client id check: %w", err) <mask> <mask> return resultCodeError <mask> } <mask> <mask> dctx.clientID = clientID </s> Pull requ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
return clientID, nil } // processClientID puts the clientID into the DNS context, if there is one. func (s *Server) processClientID(dctx *dnsContext) (rc resultCode) { pctx := dctx.proxyCtx var key [8]byte binary.BigEndian.PutUint64(key[:], pctx.RequestID) clientIDData := s.clientIDCache.Get(key[:]) if clientID...
<mask> clientID, err := clientIDFromClientServerName(hostSrvName, cliSrvName, srvConf.StrictSNICheck) <mask> if err != nil { <mask> dctx.err = fmt.Errorf("client id check: %w", err) <mask> <mask> return resultCodeError <mask> } <mask> <mask> dctx.clientID = clientID <mask> <mask> return resultCode...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
dctx.clientID = string(clientIDData)
<mask> <mask> return resultCodeError <mask> } <mask> <mask> dctx.clientID = clientID <mask> <mask> return resultCodeSuccess <mask> } </s> Pull request: all: allow clientid in access settings Updates #2624. Updates #3162. Squashed commit of the following: commit 68860da717a23a0bfeba14b7fe10b5e4ad3872...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid.go
func TestServer_clientIDFromDNSContext(t *testing.T) {
<mask> <mask> return cs <mask> } <mask> <mask> func TestProcessClientID(t *testing.T) { <mask> testCases := []struct { <mask> name string <mask> proto string <mask> hostSrvName string <mask> cliSrvName string </s> Pull request: all: allow clientid in access settings Updates #26...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
proto proxy.Proto
<mask> <mask> func TestProcessClientID(t *testing.T) { <mask> testCases := []struct { <mask> name string <mask> proto string <mask> hostSrvName string <mask> cliSrvName string <mask> wantClientID string <mask> wantErrMsg string <mask> wantRes resultCode </s> Pull requ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
<mask> hostSrvName string <mask> cliSrvName string <mask> wantClientID string <mask> wantErrMsg string <mask> wantRes resultCode <mask> strictSNI bool <mask> }{{ <mask> name: "udp", <mask> proto: proxy.ProtoUDP, <mask> hostSrvName: "", </s> Pull request: all: a...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
<mask> hostSrvName: "", <mask> cliSrvName: "", <mask> wantClientID: "", <mask> wantErrMsg: "", <mask> wantRes: resultCodeSuccess, <mask> strictSNI: false, <mask> }, { <mask> name: "tls_no_client_id", <mask> proto: proxy.ProtoTLS, <mask> hostSrvName: "example.com...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
<mask> hostSrvName: "example.com", <mask> cliSrvName: "example.com", <mask> wantClientID: "", <mask> wantErrMsg: "", <mask> wantRes: resultCodeSuccess, <mask> strictSNI: true, <mask> }, { <mask> name: "tls_no_client_server_name", <mask> proto: proxy.ProtoTLS, <mask...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
<mask> cliSrvName: "", <mask> wantClientID: "", <mask> wantErrMsg: `client id check: client server name "" ` + <mask> `doesn't match host server name "example.com"`, <mask> wantRes: resultCodeError, <mask> strictSNI: true, <mask> }, { <mask> name: "tls_no_client_server_name_no_strict...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
<mask> hostSrvName: "example.com", <mask> cliSrvName: "", <mask> wantClientID: "", <mask> wantErrMsg: "", <mask> wantRes: resultCodeSuccess, <mask> strictSNI: false, <mask> }, { <mask> name: "tls_client_id", <mask> proto: proxy.ProtoTLS, <mask> hostSrvName: "exa...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
<mask> hostSrvName: "example.com", <mask> cliSrvName: "cli.example.com", <mask> wantClientID: "cli", <mask> wantErrMsg: "", <mask> wantRes: resultCodeSuccess, <mask> strictSNI: true, <mask> }, { <mask> name: "tls_client_id_hostname_error", <mask> proto: proxy.ProtoT...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
<mask> cliSrvName: "cli.example.net", <mask> wantClientID: "", <mask> wantErrMsg: `client id check: client server name "cli.example.net" ` + <mask> `doesn't match host server name "example.com"`, <mask> wantRes: resultCodeError, <mask> strictSNI: true, <mask> }, { <mask> name: "tls_i...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
<mask> cliSrvName: "!!!.example.com", <mask> wantClientID: "", <mask> wantErrMsg: `client id check: invalid client id "!!!": ` + <mask> `invalid char '!' at index 0`, <mask> wantRes: resultCodeError, <mask> strictSNI: true, <mask> }, { <mask> name: "tls_client_id_too_long", <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
<mask> wantClientID: "", <mask> wantErrMsg: `client id check: invalid client id "abcdefghijklmno` + <mask> `pqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789": ` + <mask> `label is too long, max: 63`, <mask> wantRes: resultCodeError, <mask> strictSNI: true, <mask> }, { <mask> name: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
<mask> hostSrvName: "example.com", <mask> cliSrvName: "cli.example.com", <mask> wantClientID: "cli", <mask> wantErrMsg: "", <mask> wantRes: resultCodeSuccess, <mask> strictSNI: true, <mask> }} <mask> <mask> for _, tc := range testCases { <mask> t.Run(tc.name, func(t *testing.T) {...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
pctx := &proxy.DNSContext{ Proto: tc.proto, Conn: conn, QUICSession: qs,
<mask> serverName: tc.cliSrvName, <mask> } <mask> } <mask> <mask> dctx := &dnsContext{ <mask> srv: srv, <mask> proxyCtx: &proxy.DNSContext{ <mask> Proto: tc.proto, <mask> Conn: conn, <mask> QUICSession: qs, <mask> }, <mask> } <mask> <mask> res...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
clientID, err := srv.clientIDFromDNSContext(pctx) assert.Equal(t, tc.wantClientID, clientID)
<mask> QUICSession: qs, <mask> }, <mask> } <mask> <mask> res := processClientID(dctx) <mask> assert.Equal(t, tc.wantRes, res) <mask> assert.Equal(t, tc.wantClientID, dctx.clientID) <mask> <mask> if tc.wantErrMsg == "" { <mask> assert.NoError(t, dctx.err) <mask> } else { <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
assert.NoError(t, err)
<mask> assert.Equal(t, tc.wantRes, res) <mask> assert.Equal(t, tc.wantClientID, dctx.clientID) <mask> <mask> if tc.wantErrMsg == "" { <mask> assert.NoError(t, dctx.err) <mask> } else { <mask> require.Error(t, dctx.err) <mask> assert.Equal(t, tc.wantErrMsg, dctx.err.Error()) <mask> }...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
require.Error(t, err) assert.Equal(t, tc.wantErrMsg, err.Error())
<mask> <mask> if tc.wantErrMsg == "" { <mask> assert.NoError(t, dctx.err) <mask> } else { <mask> require.Error(t, dctx.err) <mask> assert.Equal(t, tc.wantErrMsg, dctx.err.Error()) <mask> } <mask> }) <mask> } <mask> } <mask> </s> Pull request: all: allow clientid in access settings ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
func TestClientIDFromDNSContextHTTPS(t *testing.T) {
<mask> }) <mask> } <mask> } <mask> <mask> func TestProcessClientID_https(t *testing.T) { <mask> testCases := []struct { <mask> name string <mask> path string <mask> wantClientID string <mask> wantErrMsg string </s> Pull request: all: allow clientid in access settings Updates #...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
<mask> name string <mask> path string <mask> wantClientID string <mask> wantErrMsg string <mask> wantRes resultCode <mask> }{{ <mask> name: "no_client_id", <mask> path: "/dns-query", <mask> wantClientID: "", <mask> wantErrMsg: "", </s> Pull request:...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
<mask> name: "no_client_id", <mask> path: "/dns-query", <mask> wantClientID: "", <mask> wantErrMsg: "", <mask> wantRes: resultCodeSuccess, <mask> }, { <mask> name: "no_client_id_slash", <mask> path: "/dns-query/", <mask> wantClientID: "", <mask> wantEr...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
<mask> name: "no_client_id_slash", <mask> path: "/dns-query/", <mask> wantClientID: "", <mask> wantErrMsg: "", <mask> wantRes: resultCodeSuccess, <mask> }, { <mask> name: "client_id", <mask> path: "/dns-query/cli", <mask> wantClientID: "cli", <mask> wa...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
<mask> name: "client_id", <mask> path: "/dns-query/cli", <mask> wantClientID: "cli", <mask> wantErrMsg: "", <mask> wantRes: resultCodeSuccess, <mask> }, { <mask> name: "client_id_slash", <mask> path: "/dns-query/cli/", <mask> wantClientID: "cli", <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
<mask> name: "client_id_slash", <mask> path: "/dns-query/cli/", <mask> wantClientID: "cli", <mask> wantErrMsg: "", <mask> wantRes: resultCodeSuccess, <mask> }, { <mask> name: "bad_url", <mask> path: "/foo", <mask> wantClientID: "", <mask> wantErrMsg: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
<mask> name: "bad_url", <mask> path: "/foo", <mask> wantClientID: "", <mask> wantErrMsg: `client id check: invalid path "/foo"`, <mask> wantRes: resultCodeError, <mask> }, { <mask> name: "extra", <mask> path: "/dns-query/cli/foo", <mask> wantClientID: "",...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
<mask> name: "extra", <mask> path: "/dns-query/cli/foo", <mask> wantClientID: "", <mask> wantErrMsg: `client id check: invalid path "/dns-query/cli/foo": extra parts`, <mask> wantRes: resultCodeError, <mask> }, { <mask> name: "invalid_client_id", <mask> path: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
<mask> path: "/dns-query/!!!", <mask> wantClientID: "", <mask> wantErrMsg: `client id check: invalid client id "!!!": ` + <mask> `invalid char '!' at index 0`, <mask> wantRes: resultCodeError, <mask> }} <mask> <mask> for _, tc := range testCases { <mask> t.Run(tc.name, func(t *testing.T...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
pctx := &proxy.DNSContext{ Proto: proxy.ProtoHTTPS, HTTPRequest: r,
<mask> Path: tc.path, <mask> }, <mask> } <mask> <mask> dctx := &dnsContext{ <mask> proxyCtx: &proxy.DNSContext{ <mask> Proto: proxy.ProtoHTTPS, <mask> HTTPRequest: r, <mask> }, <mask> } <mask> <mask> res := processClientID(dctx) <mask> assert.Equal(t, tc.wa...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
clientID, err := clientIDFromDNSContextHTTPS(pctx) assert.Equal(t, tc.wantClientID, clientID)
<mask> HTTPRequest: r, <mask> }, <mask> } <mask> <mask> res := processClientID(dctx) <mask> assert.Equal(t, tc.wantRes, res) <mask> assert.Equal(t, tc.wantClientID, dctx.clientID) <mask> <mask> if tc.wantErrMsg == "" { <mask> assert.NoError(t, dctx.err) <mask> } else { <mask...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
assert.NoError(t, err)
<mask> assert.Equal(t, tc.wantRes, res) <mask> assert.Equal(t, tc.wantClientID, dctx.clientID) <mask> <mask> if tc.wantErrMsg == "" { <mask> assert.NoError(t, dctx.err) <mask> } else { <mask> require.Error(t, dctx.err) <mask> <mask> assert.Equal(t, tc.wantErrMsg, dctx.err.Error()) <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
require.Error(t, err)
<mask> <mask> if tc.wantErrMsg == "" { <mask> assert.NoError(t, dctx.err) <mask> } else { <mask> require.Error(t, dctx.err) <mask> <mask> assert.Equal(t, tc.wantErrMsg, dctx.err.Error()) <mask> } <mask> }) <mask> } </s> Pull request: all: allow clientid in access settings Updates #...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
assert.Equal(t, tc.wantErrMsg, err.Error())
<mask> assert.NoError(t, dctx.err) <mask> } else { <mask> require.Error(t, dctx.err) <mask> <mask> assert.Equal(t, tc.wantErrMsg, dctx.err.Error()) <mask> } <mask> }) <mask> } <mask> } </s> Pull request: all: allow clientid in access settings Updates #2624. Updates #3162. Squashed comm...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/clientid_test.go
&upstream.Options{
<mask> <mask> upstreams = aghstrings.FilterOut(upstreams, aghstrings.IsCommentOrEmpty) <mask> upstreamConfig, err := proxy.ParseUpstreamsConfig( <mask> upstreams, <mask> upstream.Options{ <mask> Bootstrap: s.conf.BootstrapDNS, <mask> Timeout: s.conf.UpstreamTimeout, <mask> }, <mask> ) <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/config.go
var uc *proxy.UpstreamConfig
<mask> } <mask> <mask> if len(upstreamConfig.Upstreams) == 0 { <mask> log.Info("warning: no default upstream servers specified, using %v", defaultDNS) <mask> var uc proxy.UpstreamConfig <mask> uc, err = proxy.ParseUpstreamsConfig( <mask> defaultDNS, <mask> upstream.Options{ <mask> Bootstrap:...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/config.go
&upstream.Options{
<mask> log.Info("warning: no default upstream servers specified, using %v", defaultDNS) <mask> var uc proxy.UpstreamConfig <mask> uc, err = proxy.ParseUpstreamsConfig( <mask> defaultDNS, <mask> upstream.Options{ <mask> Bootstrap: s.conf.BootstrapDNS, <mask> Timeout: s.conf.UpstreamTimeout, ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/config.go
s.conf.UpstreamConfig = upstreamConfig
<mask> } <mask> upstreamConfig.Upstreams = uc.Upstreams <mask> } <mask> <mask> s.conf.UpstreamConfig = &upstreamConfig <mask> return nil <mask> } <mask> <mask> // prepareIntlProxy - initializes DNS proxy that we use for internal DNS queries <mask> func (s *Server) prepareIntlProxy() { </s> Pull requ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/config.go
s.processClientID,
<mask> s.processDetermineLocal, <mask> s.processInternalHosts, <mask> s.processRestrictLocal, <mask> s.processInternalIPAddrs, <mask> processClientID, <mask> processFilteringBeforeRequest, <mask> s.processLocalPTR, <mask> s.processUpstream, <mask> processDNSSECAfterResponse, <mask> process...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dns.go
func (s *Server) setTableIPToHost(t *aghnet.IPMap) {
<mask> <mask> s.tableHostToIP = t <mask> } <mask> <mask> func (s *Server) setTableIPToHost(t ipToHostTable) { <mask> s.tableIPToHostLock.Lock() <mask> defer s.tableIPToHostLock.Unlock() <mask> <mask> s.tableIPToHost = t <mask> } </s> Pull request: all: allow clientid in access settings Updates #2624....
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dns.go
var ipToHost *aghnet.IPMap
<mask> return <mask> } <mask> <mask> var hostToIP hostToIPTable <mask> var ipToHost ipToHostTable <mask> if add { <mask> hostToIP = make(hostToIPTable) <mask> ipToHost = make(ipToHostTable) <mask> <mask> ll := s.dhcpServer.Leases(dhcpd.LeasesAll) </s> Pull request: all: allow clientid in access...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dns.go
<mask> <mask> var hostToIP hostToIPTable <mask> var ipToHost ipToHostTable <mask> if add { <mask> hostToIP = make(hostToIPTable) <mask> ipToHost = make(ipToHostTable) <mask> <mask> ll := s.dhcpServer.Leases(dhcpd.LeasesAll) <mask> <mask> for _, l := range ll { <mask> // TODO(a.garipov): Remo...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dns.go
hostToIP = make(hostToIPTable, len(ll)) ipToHost = aghnet.NewIPMap(len(ll))
<mask> var ipToHost *aghnet.IPMap <mask> if add { <mask> ll := s.dhcpServer.Leases(dhcpd.LeasesAll) <mask> <mask> for _, l := range ll { <mask> // TODO(a.garipov): Remove this after we're finished <mask> // with the client hostname validations in the DHCP <mask> // server code. <mask> err = ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dns.go
ipToHost.Set(l.IP, lowhost)
<mask> } <mask> <mask> lowhost := strings.ToLower(l.Hostname) <mask> <mask> ipToHost[l.IP.String()] = lowhost <mask> <mask> ip := make(net.IP, 4) <mask> copy(ip, l.IP.To4()) <mask> hostToIP[lowhost] = ip <mask> } </s> Pull request: all: allow clientid in access settings Updates #2624....
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dns.go
log.Debug("dns: added %d A/PTR entries from DHCP", ipToHost.Len())
<mask> copy(ip, l.IP.To4()) <mask> hostToIP[lowhost] = ip <mask> } <mask> <mask> log.Debug("dns: added %d A/PTR entries from DHCP", len(ipToHost)) <mask> } <mask> <mask> s.setTableHostToIP(hostToIP) <mask> s.setTableIPToHost(ipToHost) <mask> } </s> Pull request: all: allow clientid in access s...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dns.go
var v interface{} v, ok = s.tableIPToHost.Get(ip) var typOK bool if host, typOK = v.(string); !typOK { log.Error("dns: bad type %T in tableIPToHost for %s", v, ip) return "", false }
<mask> if s.tableIPToHost == nil { <mask> return "", false <mask> } <mask> <mask> host, ok = s.tableIPToHost[ip.String()] <mask> <mask> return host, ok <mask> } <mask> <mask> // Respond to PTR requests if the target IP is leased by our DHCP server and the </s> Pull request: all: allow clientid in ac...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dns.go
"github.com/AdguardTeam/golibs/cache"
<mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/dnsproxy/upstream" <mask> "github.com/AdguardTeam/golibs/errors" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/miekg/dns" <mask> ) <mask> </s> Pull request: all: allow clientid in access settings Updates #2624. ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dnsforward.go
// defaultClientIDCacheCount is the default count of items in the LRU client ID // cache. The assumption here is that there won't be more than this many // requests between the BeforeRequestHandler stage and the actual processing. const defaultClientIDCacheCount = 1024
<mask> // DefaultTimeout is the default upstream timeout <mask> const DefaultTimeout = 10 * time.Second <mask> <mask> const ( <mask> safeBrowsingBlockHost = "standard-block.dns.adguard.com" <mask> parentalBlockHost = "family-block.dns.adguard.com" <mask> ) <mask> <mask> var defaultDNS = []string{ </s>...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dnsforward.go
<mask> <mask> // hostToIPTable is an alias for the type of Server.tableHostToIP. <mask> type hostToIPTable = map[string]net.IP <mask> <mask> // ipToHostTable is an alias for the type of Server.tableIPToHost. <mask> // <mask> // TODO(a.garipov): Define an IPMap type in aghnet and use here and in other <mask> /...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dnsforward.go
tableIPToHost *aghnet.IPMap
<mask> <mask> tableHostToIP hostToIPTable <mask> tableHostToIPLock sync.Mutex <mask> <mask> tableIPToHost ipToHostTable <mask> tableIPToHostLock sync.Mutex <mask> <mask> // DNS proxy instance for internal usage <mask> // We don't Start() it and so no listen port is required. <mask> internalP...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dnsforward.go
// clientIDCache is a temporary storage for clientIDs that were // extracted during the BeforeRequestHandler stage. clientIDCache cache.Cache
<mask> tableIPToHostLock sync.Mutex <mask> <mask> // DNS proxy instance for internal usage <mask> // We don't Start() it and so no listen port is required. <mask> internalProxy *proxy.Proxy <mask> <mask> isRunning bool </s> Pull request: all: allow clientid in access settings Updates #2624. Updates #316...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dnsforward.go
clientIDCache: cache.New(cache.Config{ EnableLRU: true, MaxCount: defaultClientIDCacheCount, }),
<mask> subnetDetector: p.SubnetDetector, <mask> localDomainSuffix: localDomainSuffix, <mask> recDetector: newRecursionDetector(recursionTTL, cachedRecurrentReqNum), <mask> } <mask> <mask> // TODO(e.burkov): Enable the refresher after the actual implementation <mask> // passes the public testin...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dnsforward.go
var upsConfig *proxy.UpstreamConfig upsConfig, err = proxy.ParseUpstreamsConfig( localAddrs, &upstream.Options{ Bootstrap: bootstraps, Timeout: defaultLocalTimeout, // TODO(e.burkov): Should we verify server's ceritificates? }, )
<mask> } <mask> <mask> log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs) <mask> <mask> var upsConfig proxy.UpstreamConfig <mask> upsConfig, err = proxy.ParseUpstreamsConfig(localAddrs, upstream.Options{ <mask> Bootstrap: bootstraps, <mask> Timeout: defaultLocalTimeout, <mask...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dnsforward.go
UpstreamConfig: upsConfig,
<mask> } <mask> <mask> s.localResolvers = &proxy.Proxy{ <mask> Config: proxy.Config{ <mask> UpstreamConfig: &upsConfig, <mask> }, <mask> } <mask> <mask> return nil <mask> } </s> Pull request: all: allow clientid in access settings Updates #2624. Updates #3162. Squashed commit of the following:...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dnsforward.go
// IsBlockedClient returns true if the client is blocked by the current access // settings. func (s *Server) IsBlockedClient(ip net.IP, clientID string) (blocked bool, rule string) { s.serverLock.RLock() defer s.serverLock.RUnlock() allowlistMode := s.access.allowlistMode() blockedByIP, rule := s.access.isBlockedI...
<mask> p.ServeHTTP(w, r) <mask> } <mask> } <mask> <mask> // IsBlockedIP - return TRUE if this client should be blocked <mask> func (s *Server) IsBlockedIP(ip net.IP) (bool, string) { <mask> if ip == nil { <mask> return false, "" <mask> } <mask> <mask> return s.access.IsBlockedIP(ip) <mask> } </s>...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dnsforward.go
return blocked, rule
<mask> if ip == nil { <mask> return false, "" <mask> } <mask> <mask> return s.access.IsBlockedIP(ip) <mask> } </s> Pull request: all: allow clientid in access settings Updates #2624. Updates #3162. Squashed commit of the following: commit 68860da717a23a0bfeba14b7fe10b5e4ad38726d Author: Ainar Garipov <A...
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dnsforward.go
net string proto proxy.Proto
<mask> startDeferStop(t, s) <mask> <mask> testCases := []struct { <mask> name string <mask> proto string <mask> }{{ <mask> name: "message_over_udp", <mask> proto: proxy.ProtoUDP, <mask> }, { <mask> name: "message_over_tcp", </s> Pull request: all: allow clientid in access settings Updates ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dnsforward_test.go
net: "",
<mask> net string <mask> proto proxy.Proto <mask> }{{ <mask> name: "message_over_udp", <mask> proto: proxy.ProtoUDP, <mask> }, { <mask> name: "message_over_tcp", <mask> net: "tcp", </s> Pull request: all: allow clientid in access settings Updates #2624. Updates #3162. Squashed commit of t...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dnsforward_test.go
net: "tcp",
<mask> }, { <mask> name: "message_over_tcp", <mask> proto: proxy.ProtoTCP, <mask> }} <mask> <mask> for _, tc := range testCases { <mask> t.Run(tc.name, func(t *testing.T) { </s> Pull request: all: allow clientid in access settings Updates #2624. Updates #3162. Squashed commit of the following: com...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dnsforward_test.go
opts := &upstream.Options{InsecureSkipVerify: true}
<mask> startDeferStop(t, s) <mask> <mask> // Create a DNS-over-QUIC upstream. <mask> addr := s.dnsProxy.Addr(proxy.ProtoQUIC) <mask> opts := upstream.Options{InsecureSkipVerify: true} <mask> u, err := upstream.AddressToUpstream(fmt.Sprintf("%s://%s", proxy.ProtoQUIC, addr), opts) <mask> require.NoError(t,...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dnsforward_test.go
conn, err := dns.Dial("udp", addr.String())
<mask> startDeferStop(t, s) <mask> <mask> // Message over UDP. <mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP) <mask> conn, err := dns.Dial(proxy.ProtoUDP, addr.String()) <mask> require.NoErrorf(t, err, "cannot connect to the proxy: %s", err) <mask> <mask> sendTestMessagesAsync(t, conn) <mask> } <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dnsforward_test.go
client := &dns.Client{}
<mask> s := createTestServer(t, filterConf, forwardConf, nil) <mask> startDeferStop(t, s) <mask> <mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP).String() <mask> client := dns.Client{Net: proxy.ProtoUDP} <mask> <mask> yandexIP := net.IP{213, 180, 193, 56} <mask> googleIP, _ := resolver.HostToIPs("forcesaf...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dnsforward_test.go
<mask> } <mask> <mask> // Send a DNS request without question. <mask> _, _, err := (&dns.Client{ <mask> Net: proxy.ProtoUDP, <mask> Timeout: 500 * time.Millisecond, <mask> }).Exchange(&req, addr) <mask> <mask> assert.NoErrorf(t, err, "got a response to an invalid query") <mask> } </s> Pull req...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/dnsforward_test.go
"encoding/binary"
<mask> <mask> import ( <mask> "fmt" <mask> "strings" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet" <mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering" <mask> "github.com/AdguardTeam/dnsproxy/proxy" </s> Pull request: all: allow clientid in access settings Updates #2624. ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/filter.go
// beforeRequestHandler is the handler that is called before any other // processing, including logs. It performs access checks and puts the client // ID, if there is one, into the server's cache. func (s *Server) beforeRequestHandler( _ *proxy.Proxy, pctx *proxy.DNSContext, ) (reply bool, err error) { ip := aghnet...
<mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/miekg/dns" <mask> ) <mask> <mask> func (s *Server) beforeRequestHandler(_ *proxy.Proxy, d *proxy.DNSContext) (bool, error) { <mask> ip := aghnet.IPFromAddr(d.Addr) <mask> disallowed, _ := s.access.IsBlockedIP(ip) <mask> if disallowed { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/filter.go
if len(pctx.Req.Question) == 1 { host := strings.TrimSuffix(pctx.Req.Question[0].Name, ".") if s.access.isBlockedHost(host) { log.Debug("host %s is in access blocklist", host)
<mask> log.Tracef("Client IP %s is blocked by settings", ip) <mask> return false, nil <mask> } <mask> <mask> if len(d.Req.Question) == 1 { <mask> host := strings.TrimSuffix(d.Req.Question[0].Name, ".") <mask> if s.access.IsBlockedDomain(host) { <mask> log.Tracef("domain %s is blocked by access set...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e
internal/dnsforward/filter.go