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
bootstrapDNS, ok := newDNSConfig["bootstrap_dns"] if !ok {
<mask> return fmt.Errorf("dns configuration is not a map") <mask> } <mask> <mask> // Replace bootstrap_dns value filed with new array contains old bootstrap_dns inside <mask> if bootstrapDNS, ok := (newDNSConfig)["bootstrap_dns"]; ok { <mask> newBootstrapConfig := []string{fmt.Sprint(bootstrapDNS)} <mask...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
newBootstrapConfig := []string{fmt.Sprint(bootstrapDNS)} newDNSConfig["bootstrap_dns"] = newBootstrapConfig (*diskConfig)["dns"] = newDNSConfig
<mask> } <mask> <mask> // Bump schema version <mask> (*diskConfig)["schema_version"] = 3 <mask> <mask> return nil <mask> } <mask> </s> Pull request: home: rm var shadowing, vol. 4 Closes #2803. Squashed commit of the following: commit cb36cc8811160bb39a32fb8eddf962d0ebe9035a Author: Ainar Garipov <A....
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
var ipVal interface{} ipVal, ok = c["ip"]
<mask> for i := range arr { <mask> switch c := arr[i].(type) { <mask> <mask> case map[interface{}]interface{}: <mask> _ip, ok := c["ip"] <mask> ids := []string{} <mask> if ok { <mask> ip, ok := _ip.(string) <mask> if !ok { <mask> log.Fatalf("client.ip is not a string: %v",...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
var ip string ip, ok = ipVal.(string)
<mask> case map[interface{}]interface{}: <mask> _ip, ok := c["ip"] <mask> ids := []string{} <mask> if ok { <mask> ip, ok := _ip.(string) <mask> if !ok { <mask> log.Fatalf("client.ip is not a string: %v", _ip) <mask> return nil <mask> } <mask> if len(ip) != 0 { <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
log.Fatalf("client.ip is not a string: %v", ipVal)
<mask> ids := []string{} <mask> if ok { <mask> ip, ok := _ip.(string) <mask> if !ok { <mask> log.Fatalf("client.ip is not a string: %v", _ip) <mask> return nil <mask> } <mask> if len(ip) != 0 { <mask> ids = append(ids, ip) <mask> } </s> Pull request: home: r...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
var macVal interface{} macVal, ok = c["mac"]
<mask> ids = append(ids, ip) <mask> } <mask> } <mask> <mask> _mac, ok := c["mac"] <mask> if ok { <mask> mac, ok := _mac.(string) <mask> if !ok { <mask> log.Fatalf("client.mac is not a string: %v", _mac) <mask> return nil </s> Pull request: home: rm var shadowing,...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
var mac string mac, ok = macVal.(string)
<mask> } <mask> <mask> _mac, ok := c["mac"] <mask> if ok { <mask> mac, ok := _mac.(string) <mask> if !ok { <mask> log.Fatalf("client.mac is not a string: %v", _mac) <mask> return nil <mask> } <mask> if len(mac) != 0 { </s> Pull request: home: rm var shadowing, vol...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
log.Fatalf("client.mac is not a string: %v", macVal)
<mask> _mac, ok := c["mac"] <mask> if ok { <mask> mac, ok := _mac.(string) <mask> if !ok { <mask> log.Fatalf("client.mac is not a string: %v", _mac) <mask> return nil <mask> } <mask> if len(mac) != 0 { <mask> ids = append(ids, mac) <mask> } </s> Pull request...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
dhcpVal, ok := (*diskConfig)["dhcp"]
<mask> log.Printf("Upgrade yaml: 6 to 7") <mask> <mask> (*diskConfig)["schema_version"] = 7 <mask> <mask> _dhcp, ok := (*diskConfig)["dhcp"] <mask> if !ok { <mask> return nil <mask> } <mask> <mask> switch dhcp := _dhcp.(type) { </s> Pull request: home: rm var shadowing, vol. 4 Closes #2803. Squa...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
switch dhcp := dhcpVal.(type) {
<mask> if !ok { <mask> return nil <mask> } <mask> <mask> switch dhcp := _dhcp.(type) { <mask> case map[interface{}]interface{}: <mask> dhcpv4 := map[string]interface{}{} <mask> val, ok := dhcp["gateway_ip"].(string) <mask> if !ok { <mask> log.Fatalf("expecting dhcp.%s to be a string", "gateway...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
var str string str, ok = dhcp["gateway_ip"].(string)
<mask> } <mask> <mask> switch dhcp := _dhcp.(type) { <mask> case map[interface{}]interface{}: <mask> dhcpv4 := map[string]interface{}{} <mask> val, ok := dhcp["gateway_ip"].(string) <mask> if !ok { <mask> log.Fatalf("expecting dhcp.%s to be a string", "gateway_ip") <mask> return nil <mask> }...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
dhcpv4 := map[string]interface{}{ "gateway_ip": str, }
<mask> if !ok { <mask> log.Fatalf("expecting dhcp.%s to be a string", "gateway_ip") <mask> return nil <mask> } <mask> dhcpv4["gateway_ip"] = val <mask> delete(dhcp, "gateway_ip") <mask> <mask> val, ok = dhcp["subnet_mask"].(string) <mask> if !ok { <mask> log.Fatalf("expecting dhcp.%s to ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
str, ok = dhcp["subnet_mask"].(string)
<mask> } <mask> dhcpv4["gateway_ip"] = val <mask> delete(dhcp, "gateway_ip") <mask> <mask> val, ok = dhcp["subnet_mask"].(string) <mask> if !ok { <mask> log.Fatalf("expecting dhcp.%s to be a string", "subnet_mask") <mask> return nil <mask> } <mask> dhcpv4["subnet_mask"] = val </s> Pull r...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
dhcpv4["subnet_mask"] = str
<mask> if !ok { <mask> log.Fatalf("expecting dhcp.%s to be a string", "subnet_mask") <mask> return nil <mask> } <mask> dhcpv4["subnet_mask"] = val <mask> delete(dhcp, "subnet_mask") <mask> <mask> val, ok = dhcp["range_start"].(string) <mask> if !ok { <mask> log.Fatalf("expecting dhcp.%s ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
str, ok = dhcp["range_start"].(string)
<mask> } <mask> dhcpv4["subnet_mask"] = val <mask> delete(dhcp, "subnet_mask") <mask> <mask> val, ok = dhcp["range_start"].(string) <mask> if !ok { <mask> log.Fatalf("expecting dhcp.%s to be a string", "range_start") <mask> return nil <mask> } <mask> dhcpv4["range_start"] = val </s> Pull...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
dhcpv4["range_start"] = str
<mask> if !ok { <mask> log.Fatalf("expecting dhcp.%s to be a string", "range_start") <mask> return nil <mask> } <mask> dhcpv4["range_start"] = val <mask> delete(dhcp, "range_start") <mask> <mask> val, ok = dhcp["range_end"].(string) <mask> if !ok { <mask> log.Fatalf("expecting dhcp.%s to...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
str, ok = dhcp["range_end"].(string)
<mask> } <mask> dhcpv4["range_start"] = val <mask> delete(dhcp, "range_start") <mask> <mask> val, ok = dhcp["range_end"].(string) <mask> if !ok { <mask> log.Fatalf("expecting dhcp.%s to be a string", "range_end") <mask> return nil <mask> } <mask> dhcpv4["range_end"] = val </s> Pull reque...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
dhcpv4["range_end"] = str
<mask> if !ok { <mask> log.Fatalf("expecting dhcp.%s to be a string", "range_end") <mask> return nil <mask> } <mask> dhcpv4["range_end"] = val <mask> delete(dhcp, "range_end") <mask> <mask> intVal, ok := dhcp["lease_duration"].(int) <mask> if !ok { <mask> log.Fatalf("expecting dhcp.%s to...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
var n int n, ok = dhcp["lease_duration"].(int)
<mask> } <mask> dhcpv4["range_end"] = val <mask> delete(dhcp, "range_end") <mask> <mask> intVal, ok := dhcp["lease_duration"].(int) <mask> if !ok { <mask> log.Fatalf("expecting dhcp.%s to be an integer", "lease_duration") <mask> return nil <mask> } <mask> dhcpv4["lease_duration"] = intVal...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
dhcpv4["lease_duration"] = n
<mask> if !ok { <mask> log.Fatalf("expecting dhcp.%s to be an integer", "lease_duration") <mask> return nil <mask> } <mask> dhcpv4["lease_duration"] = intVal <mask> delete(dhcp, "lease_duration") <mask> <mask> intVal, ok = dhcp["icmp_timeout_msec"].(int) <mask> if !ok { <mask> log.Fatalf...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
n, ok = dhcp["icmp_timeout_msec"].(int)
<mask> } <mask> dhcpv4["lease_duration"] = intVal <mask> delete(dhcp, "lease_duration") <mask> <mask> intVal, ok = dhcp["icmp_timeout_msec"].(int) <mask> if !ok { <mask> log.Fatalf("expecting dhcp.%s to be an integer", "icmp_timeout_msec") <mask> return nil <mask> } <mask> dhcpv4["icmp_ti...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
dhcpv4["icmp_timeout_msec"] = n
<mask> if !ok { <mask> log.Fatalf("expecting dhcp.%s to be an integer", "icmp_timeout_msec") <mask> return nil <mask> } <mask> dhcpv4["icmp_timeout_msec"] = intVal <mask> delete(dhcp, "icmp_timeout_msec") <mask> <mask> dhcp["dhcpv4"] = dhcpv4 <mask> <mask> default: </s> Pull request: home:...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/upgrade.go
var cancel context.CancelFunc ctx, cancel = context.WithTimeout(ctx, shutdownTimeout) shutdownSrv(ctx, cancel, web.httpsServer.server)
<mask> } <mask> <mask> web.httpsServer.cond.L.Lock() <mask> if web.httpsServer.server != nil { <mask> ctx, cancel := context.WithTimeout(ctx, shutdownTimeout) <mask> err = web.httpsServer.server.Shutdown(ctx) <mask> cancel() <mask> if err != nil { <mask> log.Debug("error while shutting down HTTP...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/web.go
log.Info("stopping http server...")
<mask> } <mask> <mask> // Close gracefully shuts down the HTTP servers. <mask> func (web *Web) Close(ctx context.Context) { <mask> log.Info("Stopping HTTP server...") <mask> web.httpsServer.cond.L.Lock() <mask> web.httpsServer.shutdown = true <mask> web.httpsServer.cond.L.Unlock() <mask> <mask> shut :=...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/web.go
var cancel context.CancelFunc ctx, cancel = context.WithTimeout(ctx, shutdownTimeout)
<mask> web.httpsServer.cond.L.Lock() <mask> web.httpsServer.shutdown = true <mask> web.httpsServer.cond.L.Unlock() <mask> <mask> shut := func(srv *http.Server) { <mask> if srv == nil { <mask> return <mask> } <mask> ctx, cancel := context.WithTimeout(ctx, shutdownTimeout) <mask> defer cancel() ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/web.go
shutdownSrv(ctx, cancel, web.httpsServer.server) shutdownSrv(ctx, cancel, web.httpServer) shutdownSrv(ctx, cancel, web.httpServerBeta)
<mask> log.Debug("error while shutting down HTTP server: %s", err) <mask> } <mask> } <mask> <mask> shut(web.httpsServer.server) <mask> shut(web.httpServer) <mask> shut(web.httpServerBeta) <mask> <mask> log.Info("Stopped HTTP server") <mask> } <mask> <mask> func (web *Web) tlsServerLoop() { </s...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/web.go
log.Info("stopped http server")
<mask> shut(web.httpsServer.server) <mask> shut(web.httpServer) <mask> shut(web.httpServerBeta) <mask> <mask> log.Info("Stopped HTTP server") <mask> } <mask> <mask> func (web *Web) tlsServerLoop() { <mask> for { <mask> web.httpsServer.cond.L.Lock() </s> Pull request: home: rm var shadowing, vol. 4 ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/home/web.go
if IsOpenWrt() { // OpenWrt: "/tmp/hosts/dhcp.cfg01411c". a.hostsDirs = append(a.hostsDirs, "/tmp/hosts")
<mask> if len(hostsFn) != 0 { <mask> a.hostsFn = hostsFn <mask> } <mask> <mask> if IsOpenWRT() { <mask> a.hostsDirs = append(a.hostsDirs, "/tmp/hosts") // OpenWRT: "/tmp/hosts/dhcp.cfg01411c" <mask> } <mask> <mask> // Load hosts initially <mask> a.updateHosts() <mask> </s> Pull request: home: r...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/util/autohosts.go
// IsOpenWrt returns true if host OS is OpenWrt. func IsOpenWrt() bool {
<mask> } <mask> return strings.TrimSpace(s) <mask> } <mask> <mask> // IsOpenWRT returns true if host OS is OpenWRT. <mask> func IsOpenWRT() bool { <mask> if runtime.GOOS != "linux" { <mask> return false <mask> } <mask> <mask> const etcDir = "/etc" </s> Pull request: home: rm var shadowing, vol. 4 ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7e64205d449f7783716f989f0fb635dc80840ee4
internal/util/helpers.go
- ./build_release.sh
<mask> script: <mask> - node -v <mask> - npm -v <mask> # Prepare releases <mask> - ./release.sh <mask> - ls -l dist <mask> <mask> deploy: <mask> provider: releases <mask> api_key: $GITHUB_TOKEN </s> *: moved docker files to the packaging fo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f224658e0b3b0fb4799ffa44a943792d08bce41
.travis.yml
DOCKER_IMAGE_DEV_NAME=adguardhome-dev DOCKERFILE=packaging/docker/Dockerfile DOCKERFILE_HUB=packaging/docker/Dockerfile.travis
<mask> JSFILES = $(shell find client -path client/node_modules -prune -o -type f -name '*.js') <mask> STATIC = build/static/index.html <mask> CHANNEL ?= release <mask> <mask> TARGET=AdGuardHome <mask> <mask> .PHONY: all build clean <mask> all: build <mask> </s> *: moved docker files to the packaging folder...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f224658e0b3b0fb4799ffa44a943792d08bce41
Makefile
docker: docker build -t "$(DOCKER_IMAGE_DEV_NAME)" -f "$(DOCKERFILE)" . @echo Now you can run the docker image: @echo docker run --name "$(DOCKER_IMAGE_DEV_NAME)" -p 53:53/tcp -p 53:53/udp -p 3000:3000/tcp $(DOCKER_IMAGE_DEV_NAME)
<mask> CGO_ENABLED=0 go build -ldflags="-s -w -X main.version=$(GIT_VERSION) -X main.channel=$(CHANNEL) -X main.goarm=$(GOARM)" -asmflags="-trimpath=$(PWD)" -gcflags="-trimpath=$(PWD)" <mask> PATH=$(GOPATH)/bin:$(PATH) packr clean <mask> <mask> clean: <mask> $(MAKE) cleanfast <mask> rm -rf build <mask> rm ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f224658e0b3b0fb4799ffa44a943792d08bce41
Makefile
/filtering/tests/filtering.TestLotsOfRules*.pprof /filtering/tests/top-1m.csv
<mask> /build/* <mask> /build2/* <mask> /data/ <mask> /dist/ <mask> /dnsfilter/tests/dnsfilter.TestLotsOfRules*.pprof <mask> /dnsfilter/tests/top-1m.csv <mask> /launchpad_credentials <mask> /querylog.json* <mask> /snapcraft_login <mask> AdGuardHome* <mask> coverage.txt </s> Pull request: all: less annoying ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
.gitignore
"filtering",
<mask> "scopes": [ <mask> "", <mask> "ui", <mask> "global", <mask> "dnsfilter", <mask> "home", <mask> "dnsforward", <mask> "dhcpd", <mask> "querylog", <mask> "documentation", </s> Pull request: all: less annoying pkg names Merge in ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
changelog.config.js
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "os" <mask> "sort" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghstrings" <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/dnsproxy/upstream" <mask> "github.com/AdguardTeam/golibs/log" <ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/config.go
FilterHandler func(clientAddr net.IP, clientID string, settings *filtering.Settings) `yaml:"-"`
<mask> // Callbacks for other modules <mask> // -- <mask> <mask> // FilterHandler is an optional additional filtering callback. <mask> FilterHandler func(clientAddr net.IP, clientID string, settings *dnsfilter.FilteringSettings) `yaml:"-"` <mask> <mask> // GetCustomUpstreamByClient - a callback function t...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/config.go
ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of filtering features
<mask> <mask> // Protection configuration <mask> // -- <mask> <mask> ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features <mask> BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests <mask> BlockingIPv4 net....
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/config.go
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet" <mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd" <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/golibs/log" <mask> "git...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dns.go
setts *filtering.Settings
<mask> // *Server instead. <mask> srv *Server <mask> proxyCtx *proxy.DNSContext <mask> // setts are the filtering settings for the client. <mask> setts *dnsfilter.FilteringSettings <mask> startTime time.Time <mask> result *dnsfilter.Result <mask> // origResp is the response received from ups...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dns.go
result *filtering.Result
<mask> proxyCtx *proxy.DNSContext <mask> // setts are the filtering settings for the client. <mask> setts *dnsfilter.FilteringSettings <mask> startTime time.Time <mask> result *dnsfilter.Result <mask> // origResp is the response received from upstream. It is set when the <mask> // response is modi...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dns.go
result: &filtering.Result{},
<mask> func (s *Server) handleDNSRequest(_ *proxy.Proxy, d *proxy.DNSContext) error { <mask> ctx := &dnsContext{ <mask> srv: s, <mask> proxyCtx: d, <mask> result: &dnsfilter.Result{}, <mask> startTime: time.Now(), <mask> } <mask> <mask> type modProcessFunc func(ctx *dnsContext) (rc result...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dns.go
case filtering.Rewritten, filtering.RewrittenRule:
<mask> res := ctx.result <mask> var err error <mask> <mask> switch res.Reason { <mask> case dnsfilter.Rewritten, <mask> dnsfilter.RewrittenRule: <mask> <mask> if len(ctx.origQuestion.Name) == 0 { <mask> // origQuestion is set in case we get only CNAME without IP from rewrites table <mask> brea...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dns.go
case filtering.NotFilteredAllowList:
<mask> answer = append(answer, d.Res.Answer...) <mask> d.Res.Answer = answer <mask> } <mask> <mask> case dnsfilter.NotFilteredAllowList: <mask> // nothing <mask> <mask> default: <mask> if !ctx.protectionEnabled || // filters are disabled: there's nothing to check for <mask> !ctx.responseFro...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dns.go
ctx.result = &filtering.Result{}
<mask> } <mask> if ctx.result != nil { <mask> ctx.origResp = origResp2 // matched by response <mask> } else { <mask> ctx.result = &dnsfilter.Result{} <mask> } <mask> } <mask> <mask> return resultCodeSuccess <mask> } </s> Pull request: all: less annoying pkg names Merge in DNS/adguard-home f...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dns.go
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "testing" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet" <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest" <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/dnsproxy/upstream" ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dns_test.go
s := createTestServer(t, &filtering.Config{}, ServerConfig{
<mask> "251.252.253.254.in-addr.arpa.": {"host1.example.net."}, <mask> "1.1.168.192.in-addr.arpa.": {"some.local-client."}, <mask> }, <mask> } <mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{ <mask> UDPListenAddrs: []*net.UDPAddr{{}}, <mask> TCPListenAddrs: []*net.TCPAddr{{}},...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dns_test.go
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr" <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet" <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghstrings" <mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd" <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" <ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward.go
dnsFilter *filtering.DNSFilter // DNS filter instance
<mask> // <mask> // The zero Server is empty and ready for use. <mask> type Server struct { <mask> dnsProxy *proxy.Proxy // DNS proxy instance <mask> dnsFilter *dnsfilter.DNSFilter // DNS filter instance <mask> dhcpServer dhcpd.ServerInterface // DHCP server instance (optional) <mask> queryLog ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward.go
DNSFilter *filtering.DNSFilter
<mask> const defaultLocalDomainSuffix = ".lan." <mask> <mask> // DNSCreateParams are parameters to create a new server. <mask> type DNSCreateParams struct { <mask> DNSFilter *dnsfilter.DNSFilter <mask> Stats stats.Stats <mask> QueryLog querylog.QueryLog <mask> DHCPServer dhcpd.Serve...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward.go
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr" <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet" <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest" <mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd" <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
filterConf *filtering.Config,
<mask> } <mask> <mask> func createTestServer( <mask> t *testing.T, <mask> filterConf *dnsfilter.Config, <mask> forwardConf ServerConfig, <mask> localUps upstream.Upstream, <mask> ) (s *Server) { <mask> t.Helper() <mask> </s> Pull request: all: less annoying pkg names Merge in DNS/adguard-home from im...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
filters := []filtering.Filter{{
<mask> ||null.example.org^ <mask> 127.0.0.1 host.example.org <mask> @@||whitelist.example.org^ <mask> ||127.0.0.255` <mask> filters := []dnsfilter.Filter{{ <mask> ID: 0, Data: []byte(rules), <mask> }} <mask> <mask> f := dnsfilter.New(filterConf, filters) <mask> </s> Pull request: all: less annoying pk...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
f := filtering.New(filterConf, filters)
<mask> filters := []dnsfilter.Filter{{ <mask> ID: 0, Data: []byte(rules), <mask> }} <mask> <mask> f := dnsfilter.New(filterConf, filters) <mask> <mask> snd, err := aghnet.NewSubnetDetector() <mask> require.NoError(t, err) <mask> require.NotNil(t, snd) <mask> </s> Pull request: all: less annoying p...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
s = createTestServer(t, &filtering.Config{}, ServerConfig{
<mask> <mask> var keyPem []byte <mask> _, certPem, keyPem = createServerTLSConfig(t) <mask> <mask> s = createTestServer(t, &dnsfilter.Config{}, ServerConfig{ <mask> UDPListenAddrs: []*net.UDPAddr{{}}, <mask> TCPListenAddrs: []*net.TCPAddr{{}}, <mask> }, nil) <mask> <mask> tlsConf.CertificateChainD...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
s := createTestServer(t, &filtering.Config{}, ServerConfig{
<mask> } <mask> } <mask> <mask> func TestServer(t *testing.T) { <mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{ <mask> UDPListenAddrs: []*net.UDPAddr{{}}, <mask> TCPListenAddrs: []*net.TCPAddr{{}}, <mask> }, nil) <mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{ <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
s := createTestServer(t, &filtering.Config{}, ServerConfig{
<mask> } <mask> } <mask> <mask> func TestServerWithProtectionDisabled(t *testing.T) { <mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{ <mask> UDPListenAddrs: []*net.UDPAddr{{}}, <mask> TCPListenAddrs: []*net.TCPAddr{{}}, <mask> }, nil) <mask> s.conf.UpstreamConfig.Upstreams = []upstr...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
filterConf := &filtering.Config{
<mask> <mask> func TestServerRace(t *testing.T) { <mask> t.Skip("TODO(e.burkov): inspect the golibs/cache package for locks") <mask> <mask> filterConf := &dnsfilter.Config{ <mask> SafeBrowsingEnabled: true, <mask> SafeBrowsingCacheSize: 1000, <mask> SafeSearchEnabled: true, <mask> SafeSearchC...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
filterConf := &filtering.Config{
<mask> } <mask> <mask> func TestSafeSearch(t *testing.T) { <mask> resolver := &aghtest.TestResolver{} <mask> filterConf := &dnsfilter.Config{ <mask> SafeSearchEnabled: true, <mask> SafeSearchCacheSize: 1000, <mask> CacheTime: 30, <mask> CustomResolver: resolver, <mask> } </s> Pul...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
s := createTestServer(t, &filtering.Config{}, ServerConfig{
<mask> } <mask> } <mask> <mask> func TestInvalidRequest(t *testing.T) { <mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{ <mask> UDPListenAddrs: []*net.UDPAddr{{}}, <mask> TCPListenAddrs: []*net.TCPAddr{{}}, <mask> }, nil) <mask> startDeferStop(t, s) <mask> </s> Pull request: all: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
s := createTestServer(t, &filtering.Config{}, forwardConf, nil)
<mask> FilteringConfig: FilteringConfig{ <mask> ProtectionEnabled: true, <mask> }, <mask> } <mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) <mask> startDeferStop(t, s) <mask> <mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP) <mask> <mask> // Default blocking. </s> Pull reque...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
s := createTestServer(t, &filtering.Config{}, forwardConf, nil)
<mask> FilteringConfig: FilteringConfig{ <mask> ProtectionEnabled: true, <mask> }, <mask> } <mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) <mask> s.conf.GetCustomUpstreamByClient = func(_ string) *proxy.UpstreamConfig { <mask> return &proxy.UpstreamConfig{ <mask> Upstreams...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
s := createTestServer(t, &filtering.Config{}, ServerConfig{
<mask> "example.org.": {{127, 0, 0, 255}}, <mask> } <mask> <mask> func TestBlockCNAMEProtectionEnabled(t *testing.T) { <mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{ <mask> UDPListenAddrs: []*net.UDPAddr{{}}, <mask> TCPListenAddrs: []*net.TCPAddr{{}}, <mask> }, nil) <mask> tes...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
s := createTestServer(t, &filtering.Config{}, forwardConf, nil)
<mask> FilteringConfig: FilteringConfig{ <mask> ProtectionEnabled: true, <mask> }, <mask> } <mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) <mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{ <mask> &aghtest.TestUpstream{ <mask> CName: testCNAMEs, <mask> IPv4:...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
FilterHandler: func(_ net.IP, _ string, settings *filtering.Settings) {
<mask> UDPListenAddrs: []*net.UDPAddr{{}}, <mask> TCPListenAddrs: []*net.TCPAddr{{}}, <mask> FilteringConfig: FilteringConfig{ <mask> ProtectionEnabled: true, <mask> FilterHandler: func(_ net.IP, _ string, settings *dnsfilter.FilteringSettings) { <mask> settings.FilteringEnabled = false <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
s := createTestServer(t, &filtering.Config{}, forwardConf, nil)
<mask> settings.FilteringEnabled = false <mask> }, <mask> }, <mask> } <mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) <mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{ <mask> &aghtest.TestUpstream{ <mask> CName: testCNAMEs, <mask> IPv4: testIPv4, <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
s := createTestServer(t, &filtering.Config{}, forwardConf, nil)
<mask> ProtectionEnabled: true, <mask> BlockingMode: "null_ip", <mask> }, <mask> } <mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) <mask> startDeferStop(t, s) <mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP) <mask> <mask> // Nil filter blocking. <mask> req := dns.Msg{ ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
filters := []filtering.Filter{{
<mask> } <mask> <mask> func TestBlockedCustomIP(t *testing.T) { <mask> rules := "||nxdomain.example.org^\n||null.example.org^\n127.0.0.1 host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n" <mask> filters := []dnsfilter.Filter{{ <mask> ID: 0, <mask> Data: []byte(rules), <mask> }} <mask> <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
DNSFilter: filtering.New(&filtering.Config{}, filters),
<mask> <mask> var s *Server <mask> s, err = NewServer(DNSCreateParams{ <mask> DHCPServer: &testDHCP{}, <mask> DNSFilter: dnsfilter.New(&dnsfilter.Config{}, filters), <mask> SubnetDetector: snd, <mask> }) <mask> require.NoError(t, err) <mask> <mask> conf := &ServerConfig{ </s> Pull reque...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
s := createTestServer(t, &filtering.Config{}, forwardConf, nil)
<mask> FilteringConfig: FilteringConfig{ <mask> ProtectionEnabled: true, <mask> }, <mask> } <mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) <mask> startDeferStop(t, s) <mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP) <mask> <mask> // Hosts blocking. <mask> req := createTestM...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
filterConf := &filtering.Config{
<mask> Block: true, <mask> } <mask> ans4, _ := (&aghtest.TestResolver{}).HostToIPs(hostname) <mask> <mask> filterConf := &dnsfilter.Config{ <mask> SafeBrowsingEnabled: true, <mask> } <mask> forwardConf := ServerConfig{ <mask> UDPListenAddrs: []*net.UDPAddr{{}}, <mask> TCPListenAddrs: []*net.T...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
c := &filtering.Config{ Rewrites: []filtering.RewriteEntry{{
<mask> assert.Equal(t, ans4, a.A, "dns server %s returned wrong answer: %v", addr, a.A) <mask> } <mask> <mask> func TestRewrite(t *testing.T) { <mask> c := &dnsfilter.Config{ <mask> Rewrites: []dnsfilter.RewriteEntry{{ <mask> Domain: "test.com", <mask> Answer: "1.2.3.4", <mask> Type: dns.TypeA,...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
f := filtering.New(c, nil)
<mask> Answer: "example.org", <mask> Type: dns.TypeCNAME, <mask> }}, <mask> } <mask> f := dnsfilter.New(c, nil) <mask> <mask> snd, err := aghnet.NewSubnetDetector() <mask> require.NoError(t, err) <mask> require.NotNil(t, snd) <mask> </s> Pull request: all: less annoying pkg names Merge in D...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
DNSFilter: filtering.New(&filtering.Config{}, nil),
<mask> require.NotNil(t, snd) <mask> <mask> var s *Server <mask> s, err = NewServer(DNSCreateParams{ <mask> DNSFilter: dnsfilter.New(&dnsfilter.Config{}, nil), <mask> DHCPServer: &testDHCP{}, <mask> SubnetDetector: snd, <mask> }) <mask> require.NoError(t, err) <mask> </s> Pull request: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
c := filtering.Config{
<mask> assert.Equal(t, "myhost.", ptr.Ptr) <mask> } <mask> <mask> func TestPTRResponseFromHosts(t *testing.T) { <mask> c := dnsfilter.Config{ <mask> EtcHosts: &aghnet.EtcHostsContainer{}, <mask> } <mask> <mask> // Prepare test hosts file. <mask> hf, err := os.CreateTemp("", "") </s> Pull request: al...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
DNSFilter: filtering.New(&c, nil),
<mask> <mask> var s *Server <mask> s, err = NewServer(DNSCreateParams{ <mask> DHCPServer: &testDHCP{}, <mask> DNSFilter: dnsfilter.New(&c, nil), <mask> SubnetDetector: snd, <mask> }) <mask> require.NoError(t, err) <mask> <mask> s.conf.UDPListenAddrs = []*net.UDPAddr{{}} </s> Pull reques...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsforward_test.go
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "fmt" <mask> "net" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr" <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/AdguardTeam/urlfilter/rules" <mask> "...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsrewrite.go
func (s *Server) filterDNSRewrite(req *dns.Msg, res filtering.Result, d *proxy.DNSContext) (err error) {
<mask> } <mask> <mask> // filterDNSRewrite handles dnsrewrite filters. It constructs a DNS <mask> // response and sets it into d.Res. <mask> func (s *Server) filterDNSRewrite(req *dns.Msg, res dnsfilter.Result, d *proxy.DNSContext) (err error) { <mask> resp := s.makeResponse(req) <mask> dnsrr := res.DNSRewri...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsrewrite.go
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> import ( <mask> "net" <mask> "testing" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/urlfilter/rules" <mask> "github.com/miekg/dns" <mask> "github.com/stretchr/testify/assert" <mask> "github.c...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsrewrite_test.go
makeRes := func(rcode rules.RCode, rr rules.RRType, v rules.RRValue) (res filtering.Result) { resp := filtering.DNSRewriteResultResponse{
<mask> Qtype: qtype, <mask> }}, <mask> } <mask> } <mask> makeRes := func(rcode rules.RCode, rr rules.RRType, v rules.RRValue) (res dnsfilter.Result) { <mask> resp := dnsfilter.DNSRewriteResultResponse{ <mask> rr: []rules.RRValue{v}, <mask> } <mask> return dnsfilter.Result{ <mask> DNSRew...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsrewrite_test.go
return filtering.Result{ DNSRewriteResult: &filtering.DNSRewriteResult{
<mask> makeRes := func(rcode rules.RCode, rr rules.RRType, v rules.RRValue) (res dnsfilter.Result) { <mask> resp := dnsfilter.DNSRewriteResultResponse{ <mask> rr: []rules.RRValue{v}, <mask> } <mask> return dnsfilter.Result{ <mask> DNSRewriteResult: &dnsfilter.DNSRewriteResult{ <mask> RCode: r...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/dnsrewrite_test.go
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> import ( <mask> "fmt" <mask> "strings" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/golibs/log" <mask> <mask> "github.com/miekg/dns" <mask> ) </s> Pull request: all: less annoying pkg names ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/filter.go
func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings {
<mask> } <mask> <mask> // getClientRequestFilteringSettings looks up client filtering settings using <mask> // the client's IP address and ID, if any, from ctx. <mask> func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings { <mask> setts := s.dnsFilter.GetConfig() <mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/filter.go
func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) {
<mask> } <mask> <mask> // filterDNSRequest applies the dnsFilter and sets d.Res if the request was <mask> // filtered. <mask> func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) { <mask> d := ctx.proxyCtx <mask> req := d.Req <mask> host := strings.TrimSuffix(req.Question[0].Name, "...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/filter.go
return nil, fmt.Errorf("filtering failed to check host %q: %w", host, err)
<mask> host := strings.TrimSuffix(req.Question[0].Name, ".") <mask> res, err := s.dnsFilter.CheckHost(host, req.Question[0].Qtype, ctx.setts) <mask> if err != nil { <mask> // Return immediately if there's an error <mask> return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err) <mask> } e...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/filter.go
} else if res.Reason.In(filtering.Rewritten, filtering.RewrittenRule) &&
<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(dnsfi...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/filter.go
} else if res.Reason == filtering.RewrittenAutoHosts && len(res.ReverseHosts) != 0 {
<mask> // name. The original question is readded in <mask> // processFilteringAfterResponse. <mask> ctx.origQuestion = req.Question[0] <mask> req.Question[0].Name = dns.Fqdn(res.CanonName) <mask> } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { <mask> resp := s.make...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/filter.go
} else if res.Reason.In(filtering.Rewritten, filtering.RewrittenAutoHosts) {
<mask> resp.Answer = append(resp.Answer, ptr) <mask> } <mask> <mask> d.Res = resp <mask> } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenAutoHosts) { <mask> resp := s.makeResponse(req) <mask> <mask> name := host <mask> if len(res.CanonName) != 0 { <mask> resp.Answer = append...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/filter.go
} else if res.Reason == filtering.RewrittenRule {
<mask> } <mask> } <mask> <mask> d.Res = resp <mask> } else if res.Reason == dnsfilter.RewrittenRule { <mask> err = s.filterDNSRewrite(req, res, d) <mask> if err != nil { <mask> return nil, err <mask> } <mask> } </s> Pull request: all: less annoying pkg names Merge in DNS/adguard-home from...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/filter.go
func (s *Server) filterDNSResponse(ctx *dnsContext) (*filtering.Result, error) {
<mask> } <mask> <mask> // If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address. <mask> // If this is a match, we set a new response in d.Res and return. <mask> func (s *Server) filterDNSResponse(ctx *dnsContext) (*dnsfilter.Result, error) { <mask> d := ctx....
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/filter.go
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "path/filepath" <mask> "strings" <mask> "testing" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" <mask> "github.com/stretchr/testify/assert" <mask> "github.com/stretchr/testify/require" <mask> ) <mask> <mask> func loadTestData(t *testing.T, casesFileName string, cases int...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/http_test.go
filterConf := &filtering.Config{
<mask> <mask> const jsonExt = ".json" <mask> <mask> func TestDNSForwardHTTTP_handleGetConfig(t *testing.T) { <mask> filterConf := &dnsfilter.Config{ <mask> SafeBrowsingEnabled: true, <mask> SafeBrowsingCacheSize: 1000, <mask> SafeSearchEnabled: true, <mask> SafeSearchCacheSize: 1000, <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/http_test.go
filterConf := &filtering.Config{
<mask> } <mask> } <mask> <mask> func TestDNSForwardHTTTP_handleSetConfig(t *testing.T) { <mask> filterConf := &dnsfilter.Config{ <mask> SafeBrowsingEnabled: true, <mask> SafeBrowsingCacheSize: 1000, <mask> SafeSearchEnabled: true, <mask> SafeSearchCacheSize: 1000, <mask> ParentalCacheSize...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/http_test.go
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> import ( <mask> "net" <mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/AdguardTeam/urlfilter/rules" <mask> "github.com/miekg/dns" <mask> ) </s> Pull r...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/msg.go
func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *filtering.Result) *dns.Msg {
<mask> return resp <mask> } <mask> <mask> // genDNSFilterMessage generates a DNS message corresponding to the filtering result <mask> func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Result) *dns.Msg { <mask> m := d.Req <mask> <mask> if m.Question[0].Qtype != dns.TypeA && m.Quest...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/msg.go
case filtering.FilteredSafeBrowsing:
<mask> return s.genNXDomain(m) <mask> } <mask> <mask> switch result.Reason { <mask> case dnsfilter.FilteredSafeBrowsing: <mask> return s.genBlockedHost(m, s.conf.SafeBrowsingBlockHost, d) <mask> case dnsfilter.FilteredParental: <mask> return s.genBlockedHost(m, s.conf.ParentalBlockHost, d) <mask> d...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/msg.go
case filtering.FilteredParental:
<mask> <mask> switch result.Reason { <mask> case dnsfilter.FilteredSafeBrowsing: <mask> return s.genBlockedHost(m, s.conf.SafeBrowsingBlockHost, d) <mask> case dnsfilter.FilteredParental: <mask> return s.genBlockedHost(m, s.conf.ParentalBlockHost, d) <mask> default: <mask> // If the query was filtere...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/msg.go
// If the query was filtered by "Safe search", filtering also must return
<mask> return s.genBlockedHost(m, s.conf.SafeBrowsingBlockHost, d) <mask> case dnsfilter.FilteredParental: <mask> return s.genBlockedHost(m, s.conf.ParentalBlockHost, d) <mask> default: <mask> // If the query was filtered by "Safe search", dnsfilter also must return <mask> // the IP address that must be...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/msg.go
if result.Reason == filtering.FilteredSafeSearch &&
<mask> default: <mask> // If the query was filtered by "Safe search", dnsfilter also must return <mask> // the IP address that must be used in response. <mask> // In this case regardless of the filtering method, we should return it <mask> if result.Reason == dnsfilter.FilteredSafeSearch && <mask> len(...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/msg.go
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> import ( <mask> "strings" <mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" <mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog" <mask> "github.com/AdguardTeam/AdGuardHome/internal/stats" <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/stats.go
func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res filtering.Result) {
<mask> <mask> return resultCodeSuccess <mask> } <mask> <mask> func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res dnsfilter.Result) { <mask> if s.stats == nil { <mask> return <mask> } <mask> <mask> pctx := ctx.proxyCtx </s> Pull request: all: less annoying pkg names Merge in DN...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed
internal/dnsforward/stats.go