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
errortext := fmt.Errorf("Unable to write coredns config: %s", err)
<mask> return <mask> } <mask> err := writeCoreDNSConfig() <mask> if err != nil { <mask> errortext := fmt.Sprintf("Unable to write coredns config: %s", err) <mask> log.Println(errortext) <mask> http.Error(w, errortext, http.StatusInternalServerError) <mask> return <mask> } <mask> err = writeFilt...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/33fbccf0badee8a4c5f790d850d85e161536779f
control.go
return errortext
<mask> err := writeCoreDNSConfig() <mask> if err != nil { <mask> errortext := fmt.Sprintf("Unable to write coredns config: %s", err) <mask> log.Println(errortext) <mask> http.Error(w, errortext, http.StatusInternalServerError) <mask> return <mask> } <mask> err = writeFilterFile() <mask> if err != ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/33fbccf0badee8a4c5f790d850d85e161536779f
control.go
errortext := fmt.Errorf("Couldn't write filter file: %s", err)
<mask> return <mask> } <mask> err = writeFilterFile() <mask> if err != nil { <mask> errortext := fmt.Sprintf("Couldn't write filter file: %s", err) <mask> log.Println(errortext) <mask> http.Error(w, errortext, http.StatusInternalServerError) <mask> return <mask> } <mask> binarypath := filepath....
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/33fbccf0badee8a4c5f790d850d85e161536779f
control.go
return errortext
<mask> err = writeFilterFile() <mask> if err != nil { <mask> errortext := fmt.Sprintf("Couldn't write filter file: %s", err) <mask> log.Println(errortext) <mask> http.Error(w, errortext, http.StatusInternalServerError) <mask> return <mask> } <mask> binarypath := filepath.Join(config.ourBinaryDir, co...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/33fbccf0badee8a4c5f790d850d85e161536779f
control.go
errortext := fmt.Errorf("Unable to start coreDNS: %s", err)
<mask> coreDNSCommand.Stdout = os.Stdout <mask> coreDNSCommand.Stderr = os.Stderr <mask> err = coreDNSCommand.Start() <mask> if err != nil { <mask> errortext := fmt.Sprintf("Unable to start coreDNS: %s", err) <mask> log.Println(errortext) <mask> http.Error(w, errortext, http.StatusInternalServerError) ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/33fbccf0badee8a4c5f790d850d85e161536779f
control.go
return errortext
<mask> err = coreDNSCommand.Start() <mask> if err != nil { <mask> errortext := fmt.Sprintf("Unable to start coreDNS: %s", err) <mask> log.Println(errortext) <mask> http.Error(w, errortext, http.StatusInternalServerError) <mask> return <mask> } <mask> log.Printf("coredns PID: %v\n", coreDNSCommand.Pr...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/33fbccf0badee8a4c5f790d850d85e161536779f
control.go
<mask> http.Error(w, errortext, http.StatusInternalServerError) <mask> return <mask> } <mask> log.Printf("coredns PID: %v\n", coreDNSCommand.Process.Pid) <mask> fmt.Fprintf(w, "OK, PID %d\n", coreDNSCommand.Process.Pid) <mask> go childwaiter() <mask> } <mask> <mask> func childwaiter() { <mask> err :...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/33fbccf0badee8a4c5f790d850d85e161536779f
control.go
return nil } func handleStart(w http.ResponseWriter, r *http.Request) { if isRunning() { http.Error(w, fmt.Sprintf("Unable to start coreDNS: Already running"), 400) return } err := startDNSServer() if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } fmt.Fprintf(w, "OK, P...
<mask> } <mask> log.Printf("coredns PID: %v\n", coreDNSCommand.Process.Pid) <mask> go childwaiter() <mask> } <mask> <mask> func childwaiter() { <mask> err := coreDNSCommand.Wait() <mask> log.Printf("coredns terminated: %s\n", err) <mask> err = coreDNSCommand.Process.Release() </s> Move starting of core...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/33fbccf0badee8a4c5f790d850d85e161536779f
control.go
"dns_test_warning_toast": "Upstream \"{{key}}\" no responde a las peticiones de prueba y es posible que no funcione correctamente",
<mask> "updated_upstream_dns_toast": "Servidores DNS de subida guardados correctamente", <mask> "dns_test_ok_toast": "Los servidores DNS especificados funcionan correctamente", <mask> "dns_test_not_ok_toast": "Servidor \"{{key}}\": no se puede utilizar, por favor revisa si lo has escrito correctamente", ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3420becce38e72ef3870f086a86342788ba9a8f8
client/src/__locales/es.json
"form_error_gateway_ip": "Sewa tidak dapat memiliki alamat IP gateway",
<mask> "form_error_server_name": "Nama server tidak valid", <mask> "form_error_subnet": "Subnet \"{{cidr}}\" tidak berisi alamat IP \"{{ip}}\"", <mask> "form_error_positive": "Harus lebih dari 0", <mask> "out_of_range_error": "Harus di luar rentang \"{{start}}\"-\"{{end}}\"", <mask> "lower_rang...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3420becce38e72ef3870f086a86342788ba9a8f8
client/src/__locales/id.json
"dns_test_warning_toast": "Upstream \"{{key}}\" tidak menanggapi permintaan pengujian dan mungkin tidak berfungsi dengan baik",
<mask> "all_lists_up_to_date_toast": "Semua daftar sudah diperbarui", <mask> "updated_upstream_dns_toast": "Server upstream berhasil disimpan", <mask> "dns_test_ok_toast": "Server DNS yang ditentukan bekerja dengan benar", <mask> "dns_test_not_ok_toast": "Server \"{{key}}\": tidak dapat digunakan, m...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3420becce38e72ef3870f086a86342788ba9a8f8
client/src/__locales/id.json
"encryption_server_desc": "Jika disetel, AdGuard Home mendeteksi ClientID, merespons kueri DDR, dan melakukan validasi koneksi tambahan. Jika tidak disetel, fitur-fitur ini dinonaktifkan. Harus cocok dengan salah satu Nama DNS dalam sertifikat.",
<mask> "encryption_desc": "Enkripsi (HTTPS/QUIC/TLS) untuk DNS dan antarmuka admin", <mask> "encryption_config_saved": "Pengaturan enkripsi telah tersimpan", <mask> "encryption_server": "Nama server", <mask> "encryption_server_enter": "Masukkan nama domain anda", <mask> "encryption_server_desc"...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3420becce38e72ef3870f086a86342788ba9a8f8
client/src/__locales/id.json
"dns_test_warning_toast": "Upstream \"{{key}}\" reageert niet op testverzoeken en werkt mogelijk niet goed",
<mask> "updated_upstream_dns_toast": "Upstream-servers succesvol opgeslagen", <mask> "dns_test_ok_toast": "Opgegeven DNS-servers werken correct", <mask> "dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt, controleer of je het correct hebt geschreven", <mask> "unblock": "Deblokker...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3420becce38e72ef3870f086a86342788ba9a8f8
client/src/__locales/nl.json
"encryption_server_desc": "Indien ingesteld, detecteert AdGuard Home Client-ID's, reageert op DDR-zoekopdrachten en voert aanvullende verbindingsvalidaties uit. Indien niet ingesteld, zijn deze functies uitgeschakeld. Moet overeenkomen met een van de DNS-namen in het certificaat.",
<mask> "encryption_desc": "Encryptie (HTTPS/TLS) ondersteuning voor DNS en admin web interface", <mask> "encryption_config_saved": "Versleuteling configuratie opgeslagen", <mask> "encryption_server": "Server naam", <mask> "encryption_server_enter": "Voer domein naam in", <mask> "encryption_serv...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3420becce38e72ef3870f086a86342788ba9a8f8
client/src/__locales/nl.json
# Using NVS for managing Node.js versions on Windows NVS_HOME="C:\ProgramData" git clone --single-branch https://github.com/jasongin/nvs $NVS_HOME source $NVS_HOME/nvs.sh nvs add latest nvs use latest
<mask> npm install -g npm <mask> curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.23.8 <mask> ;; <mask> windows) <mask> choco install nvm <mask> nvm install node <mask> npm install -g np...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/344a0336b0f10451eb252c451a8c1e6baa836609
.travis.yml
node --version npm --version
<mask> case $TRAVIS_OS_NAME in <mask> linux | osx) <mask> npm --prefix client ci <mask> ;; <mask> windows) <mask> node --version </s> *: travis - use nvs on Windows </s> remove choco install nvm nvm install node npm install -g npm </s> add ...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/344a0336b0f10451eb252c451a8c1e6baa836609
.travis.yml
node --version npm --version nvs --version
<mask> ;; <mask> windows) <mask> npm --prefix client ci <mask> ;; <mask> esac <mask> </s> *: travis - use nvs on Windows </s> remove choco install nvm nvm install node npm install -g npm </s> add # Using NVS for managing Node.js versions on Wind...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/344a0336b0f10451eb252c451a8c1e6baa836609
.travis.yml
"sort"
<mask> "errors" <mask> "log" <mask> "strconv" <mask> "time" <mask> <mask> // ratelimiting and per-ip buckets <mask> "github.com/beefsack/go-rate" <mask> "github.com/patrickmn/go-cache" </s> Added ratelimit whitelist and tests </s> remove ratelimit int // in requests per second per IP </s> add rateli...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/345e4dc89a18aa0dd0f63458755126cb3f2f4235
coredns_plugin/ratelimit/ratelimit.go
<mask> "golang.org/x/net/context" <mask> ) <mask> <mask> const defaultRatelimit = 100 <mask> const defaultMaxRateLimitedIPs = 1024 * 1024 <mask> <mask> var ( <mask> tokenBuckets = cache.New(time.Hour, time.Hour) <mask> ) <mask> </s> Added ratelimit whitelist and tests </s> remove p.ratelimit = ratelim...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/345e4dc89a18aa0dd0f63458755126cb3f2f4235
coredns_plugin/ratelimit/ratelimit.go
if len(p.whitelist) > 0 && sort.SearchStrings(p.whitelist, ip) >= 0 { return true, nil }
<mask> <mask> func (p *plug) allowRequest(ip string) (bool, error) { <mask> if _, found := tokenBuckets.Get(ip); !found { <mask> tokenBuckets.Set(ip, rate.New(p.ratelimit, time.Second), time.Hour) <mask> } <mask> <mask> value, found := tokenBuckets.Get(ip) <mask> if !found { </s> Added ratelimit whitel...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/345e4dc89a18aa0dd0f63458755126cb3f2f4235
coredns_plugin/ratelimit/ratelimit.go
ratelimit int // in requests per second per IP whitelist []string // a list of whitelisted IP addresses
<mask> type plug struct { <mask> Next plugin.Handler <mask> <mask> // configuration for creating above <mask> ratelimit int // in requests per second per IP <mask> } <mask> <mask> func setup(c *caddy.Controller) error { <mask> p := &plug{ratelimit: defaultRatelimit} <mask> config := dnsserver.GetConfig...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/345e4dc89a18aa0dd0f63458755126cb3f2f4235
coredns_plugin/ratelimit/ratelimit.go
func setupPlugin(c *caddy.Controller) (*plug, error) {
<mask> // configuration for creating above <mask> ratelimit int // in requests per second per IP <mask> } <mask> <mask> func setup(c *caddy.Controller) error { <mask> p := &plug{ratelimit: defaultRatelimit} <mask> config := dnsserver.GetConfig(c) <mask> <mask> for c.Next() { <mask> args := c.Remainin...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/345e4dc89a18aa0dd0f63458755126cb3f2f4235
coredns_plugin/ratelimit/ratelimit.go
<mask> } <mask> <mask> func setup(c *caddy.Controller) error { <mask> p := &plug{ratelimit: defaultRatelimit} <mask> config := dnsserver.GetConfig(c) <mask> <mask> for c.Next() { <mask> args := c.RemainingArgs() <mask> if len(args) <= 0 { <mask> continue </s> Added ratelimit whitelist and tests <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/345e4dc89a18aa0dd0f63458755126cb3f2f4235
coredns_plugin/ratelimit/ratelimit.go
if len(args) > 0 { ratelimit, err := strconv.Atoi(args[0]) if err != nil { return nil, c.ArgErr() } p.ratelimit = ratelimit
<mask> config := dnsserver.GetConfig(c) <mask> <mask> for c.Next() { <mask> args := c.RemainingArgs() <mask> if len(args) <= 0 { <mask> continue <mask> } <mask> ratelimit, err := strconv.Atoi(args[0]) <mask> if err != nil { <mask> return c.ArgErr() <mask> } </s> Added ratelimit whitelis...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/345e4dc89a18aa0dd0f63458755126cb3f2f4235
coredns_plugin/ratelimit/ratelimit.go
for c.NextBlock() { switch c.Val() { case "whitelist": p.whitelist = c.RemainingArgs() if len(p.whitelist) > 0 { sort.Strings(p.whitelist) } }
<mask> args := c.RemainingArgs() <mask> if len(args) <= 0 { <mask> continue <mask> } <mask> ratelimit, err := strconv.Atoi(args[0]) <mask> if err != nil { <mask> return c.ArgErr() <mask> } <mask> p.ratelimit = ratelimit <mask> } <mask> <mask> config.AddPlugin(func(next plugin.Handler)...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/345e4dc89a18aa0dd0f63458755126cb3f2f4235
coredns_plugin/ratelimit/ratelimit.go
<mask> ratelimit, err := strconv.Atoi(args[0]) <mask> if err != nil { <mask> return c.ArgErr() <mask> } <mask> p.ratelimit = ratelimit <mask> } <mask> <mask> config.AddPlugin(func(next plugin.Handler) plugin.Handler { <mask> p.Next = next <mask> return p </s> Added ratelimit whitelist and t...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/345e4dc89a18aa0dd0f63458755126cb3f2f4235
coredns_plugin/ratelimit/ratelimit.go
return p, nil } func setup(c *caddy.Controller) error { p, err := setupPlugin(c) if err != nil { return err } config := dnsserver.GetConfig(c)
<mask> } <mask> } <mask> } <mask> <mask> config.AddPlugin(func(next plugin.Handler) plugin.Handler { <mask> p.Next = next <mask> return p <mask> }) </s> Added ratelimit whitelist and tests </s> remove p.ratelimit = ratelimit </s> add </s> remove ratelimit, err := strconv.Atoi(args[0]) if e...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/345e4dc89a18aa0dd0f63458755126cb3f2f4235
coredns_plugin/ratelimit/ratelimit.go
// Print the first message after logger is configured.
<mask> <mask> // Go memory hacks <mask> memoryUsage(args) <mask> <mask> // print the first message after logger is configured <mask> log.Println(version.Full()) <mask> log.Debug("Current working directory is %s", Context.workDir) <mask> if args.runningAsService { <mask> log.Info("AdGuard Home is runn...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/34c95f99f86df9dd8c0dcead98424add0523383f
internal/home/home.go
log.Debug("current working directory is %s", Context.workDir)
<mask> memoryUsage(args) <mask> <mask> // print the first message after logger is configured <mask> log.Println(version.Full()) <mask> log.Debug("Current working directory is %s", Context.workDir) <mask> if args.runningAsService { <mask> log.Info("AdGuard Home is running as a service") <mask> } <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/34c95f99f86df9dd8c0dcead98424add0523383f
internal/home/home.go
// Make sure that we see the microseconds in logs, as networking stuff can // happen pretty quickly.
<mask> if ls.Verbose { <mask> log.SetLevel(log.DEBUG) <mask> } <mask> <mask> // Make sure that we see the microseconds in logs, as networking stuff <mask> // can happen pretty quickly. <mask> log.SetFlags(log.LstdFlags | log.Lmicroseconds) <mask> <mask> if args.runningAsService && ls.LogFile == "" &&...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/34c95f99f86df9dd8c0dcead98424add0523383f
internal/home/home.go
// When running as a Windows service, use eventlog by default if nothing // else is configured. Otherwise, we'll simply lose the log output.
<mask> // can happen pretty quickly. <mask> log.SetFlags(log.LstdFlags | log.Lmicroseconds) <mask> <mask> if args.runningAsService && ls.LogFile == "" && runtime.GOOS == "windows" { <mask> // When running as a Windows service, use eventlog by default if nothing else is configured <mask> // Otherwise, we'l...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/34c95f99f86df9dd8c0dcead98424add0523383f
internal/home/home.go
if runtime.GOOS == "darwin" && action == "start" && !strings.HasPrefix(Context.workDir, "/Applications/") { log.Info("warning: service must be started from within the /Applications directory") }
<mask> // On OpenWrt, the service utility may not exist. We use our service script <mask> // directly in this case. <mask> func svcAction(s service.Service, action string) (err error) { <mask> err = service.Control(s, action) <mask> if err != nil && service.Platform() == "unix-systemv" && <mask> (action == "...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/34c95f99f86df9dd8c0dcead98424add0523383f
internal/home/service.go
Web ipport `json:"web"` DNS ipport `json:"dns"` Username string `json:"username,omitempty"` Password string `json:"password,omitempty"` Interfaces map[string]interface{} `json:"interfaces"`
<mask> Port int `json:"port"` <mask> } <mask> <mask> type firstRunData struct { <mask> Web ipport `json:"web"` <mask> DNS ipport `json:"dns"` <mask> Username string `json:"username,omitempty"` <mask> Password string `json:"password,omitempty"` <mask> } <mask> <mask> func handleGetDefaultA...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/34e14930deec600a24db4fb8ceaa1daa63776c1c
control.go
// fill out the fields
<mask> httpError(w, http.StatusServiceUnavailable, "Couldn't find any legible interface, plase try again later") <mask> return <mask> } <mask> <mask> // find an interface with an ipv4 address <mask> addr := findIPv4IfaceAddr(ifaces) <mask> if len(addr) == 0 { <mask> httpError(w, http.StatusServiceUna...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/34e14930deec600a24db4fb8ceaa1daa63776c1c
control.go
data.Interfaces = make(map[string]interface{}) for _, iface := range ifaces { data.Interfaces[iface.Name] = iface }
<mask> // fill out the fields <mask> data.Web.Port = 3000 // TODO: find out if port 80 is available -- if not, fall back to 3000 <mask> data.DNS.Port = 53 // TODO: find out if port 53 is available -- if not, show a big warning <mask> <mask> w.Header().Set("Content-Type", "application/json") <mask> err = j...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/34e14930deec600a24db4fb8ceaa1daa63776c1c
control.go
// TODO: validate that hosts and ports are bindable
<mask> <mask> spew.Dump(newSettings) <mask> config.firstRun = false <mask> config.BindHost = newSettings.Web.IP <mask> config.BindPort = newSettings.Web.Port <mask> config.DNS.BindHost = newSettings.DNS.IP </s> /install/get_default_addresses -- now it gives out list of interfaces </s> remove // find an in...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/34e14930deec600a24db4fb8ceaa1daa63776c1c
control.go
// map's values are guaranteed to be of type of *HostsRecord.
<mask> return nil <mask> } <mask> <mask> // Upd returns the channel into which the updates are sent. The receivable <mask> // map's values are guaranteed to be of type of *stringutil.Set. <mask> func (hc *HostsContainer) Upd() (updates <-chan *netutil.IPMap) { <mask> return hc.updates <mask> } <mask> <ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer.go
hp.addRecord(ip, hosts)
<mask> if ip == nil || len(hosts) == 0 { <mask> continue <mask> } <mask> <mask> hp.addPairs(ip, hosts) <mask> } <mask> <mask> return nil, true, s.Err() <mask> } <mask> </s> Pull request: all: use canonical names for hosts file runtime clients Updates #4683. Squashed commit of the following: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer.go
// HostsRecord represents a single hosts file record. type HostsRecord struct { Aliases *stringutil.Set Canonical string } // Equal returns true if all fields of rec are equal to field in other or they // both are nil. func (rec *HostsRecord) Equal(other *HostsRecord) (ok bool) { if rec == nil { return other ==...
<mask> <mask> return ip, hosts <mask> } <mask> <mask> // addPair puts the pair of ip and host to the rules builder if needed. For <mask> // each ip the first member of hosts will become the main one. <mask> func (hp *hostsParser) addPairs(ip net.IP, hosts []string) { <mask> v, ok := hp.table.Get(ip) <mask...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer.go
return rec.Canonical == other.Canonical && rec.Aliases.Equal(other.Aliases) } // addRecord puts the record for the IP address to the rules builder if needed. // The first host is considered to be the canonical name for the IP address. // hosts must have at least one name. func (hp *hostsParser) addRecord(ip net.IP, h...
<mask> v = stringutil.NewSet() <mask> hp.table.Set(ip, v) <mask> } <mask> <mask> var set *stringutil.Set <mask> set, ok = v.(*stringutil.Set) <mask> if !ok { <mask> log.Debug("%s: adding pairs: unexpected value type %T", hostsContainerPref, v) <mask> <mask> return <mask> } </s> Pull request: ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer.go
rec = &HostsRecord{ Aliases: stringutil.NewSet(), }
<mask> <mask> var set *stringutil.Set <mask> set, ok = v.(*stringutil.Set) <mask> if !ok { <mask> log.Debug("%s: adding pairs: unexpected value type %T", hostsContainerPref, v) <mask> <mask> return <mask> } <mask> <mask> processed := strings.Join(append([]string{ip.String()}, hosts...), " ") </s>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer.go
rec.Canonical, hosts = hosts[0], hosts[1:] hp.addRules(ip, rec.Canonical, line) hp.table.Set(ip, rec) } else { rec, ok = v.(*HostsRecord) if !ok { log.Error("%s: adding pairs: unexpected type %T", hostsContainerPref, v) return }
<mask> set, ok = v.(*stringutil.Set) <mask> if !ok { <mask> log.Debug("%s: adding pairs: unexpected value type %T", hostsContainerPref, v) <mask> <mask> return <mask> } <mask> <mask> processed := strings.Join(append([]string{ip.String()}, hosts...), " ") <mask> for _, h := range hosts { <mask> if...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer.go
for _, host := range hosts { if rec.Canonical == host || rec.Aliases.Has(host) {
<mask> <mask> return <mask> } <mask> <mask> processed := strings.Join(append([]string{ip.String()}, hosts...), " ") <mask> for _, h := range hosts { <mask> if set.Has(h) { <mask> continue <mask> } <mask> <mask> set.Add(h) <mask> </s> Pull request: all: use canonical names for hosts file r...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer.go
rec.Aliases.Add(host)
<mask> if set.Has(h) { <mask> continue <mask> } <mask> <mask> set.Add(h) <mask> <mask> rule, rulePtr := hp.writeRules(h, ip) <mask> hp.translations[rule], hp.translations[rulePtr] = processed, processed <mask> <mask> log.Debug("%s: added ip-host pair %q-%q", hostsContainerPref, ip, h) </s> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer.go
hp.addRules(ip, host, line)
<mask> } <mask> <mask> set.Add(h) <mask> <mask> rule, rulePtr := hp.writeRules(h, ip) <mask> hp.translations[rule], hp.translations[rulePtr] = processed, processed <mask> <mask> log.Debug("%s: added ip-host pair %q-%q", hostsContainerPref, ip, h) <mask> } <mask> } <mask> <mask> // writeRules ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer.go
// addRules adds rules and rule translations for the line. func (hp *hostsParser) addRules(ip net.IP, host, line string) { rule, rulePtr := hp.writeRules(host, ip) hp.translations[rule], hp.translations[rulePtr] = line, line log.Debug("%s: added ip-host pair %q-%q", hostsContainerPref, ip, host) }
<mask> } <mask> <mask> // writeRules writes the actual rule for the qtype and the PTR for the host-ip <mask> // pair into internal builders. <mask> func (hp *hostsParser) writeRules(host string, ip net.IP) (rule, rulePtr string) { <mask> arpa, err := netutil.IPToReversedAddr(ip) <mask> if err != nil { <mask>...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer.go
// target's values must be of type *HostsRecord.
<mask> } <mask> <mask> // equalSet returns true if the internal hosts table just parsed equals target. <mask> func (hp *hostsParser) equalSet(target *netutil.IPMap) (ok bool) { <mask> if target == nil { <mask> // hp.table shouldn't appear nil since it's initialized on each refresh. <mask> return target == ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer.go
hp.table.Range(func(ip net.IP, recVal interface{}) (cont bool) { var targetVal interface{} targetVal, ok = target.Get(ip) if !ok { return false
<mask> if hp.table.Len() != target.Len() { <mask> return false <mask> } <mask> <mask> hp.table.Range(func(ip net.IP, b interface{}) (cont bool) { <mask> // ok is set to true if the target doesn't contain ip or if the <mask> // appropriate hosts set isn't equal to the checked one. <mask> if a, hasIP ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer.go
var rec *HostsRecord rec, ok = recVal.(*HostsRecord) if !ok { log.Error("%s: comparing: unexpected type %T", hostsContainerPref, recVal) return false } var targetRec *HostsRecord targetRec, ok = targetVal.(*HostsRecord) if !ok { log.Error("%s: comparing: target: unexpected type %T", hostsContai...
<mask> } else if hosts, aok := a.(*stringutil.Set); aok { <mask> ok = !hosts.Equal(b.(*stringutil.Set)) <mask> } <mask> <mask> // Continue only if maps has no discrepancies. <mask> return !ok <mask> }) <mask> <mask> // Return true if every value from the IP map has no discrepancies with the <ma...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer.go
return ok
<mask> // Continue only if maps has no discrepancies. <mask> return !ok <mask> }) <mask> <mask> // Return true if every value from the IP map has no discrepancies with the <mask> // appropriate one from the target. <mask> return !ok <mask> } <mask> <mask> // sendUpd tries to send the parsed data to ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer.go
"github.com/AdguardTeam/golibs/netutil"
<mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest" <mask> "github.com/AdguardTeam/golibs/errors" <mask> "github.com/AdguardTeam/golibs/stringutil" <mask> "github.com/AdguardTeam/golibs/testutil" <mask> "github.com/AdguardTeam/urlfilter" <mask> "github.com/AdguardTeam/urlfi...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
checkRefresh := func(t *testing.T, want *HostsRecord) { t.Helper() var ok bool var upd *netutil.IPMap select { case upd, ok = <-hc.Upd(): require.True(t, ok) require.NotNil(t, upd) case <-time.After(1 * time.Second): t.Fatal("did not receive after 1s") }
<mask> hc, err := NewHostsContainer(0, testFS, w, "dir") <mask> require.NoError(t, err) <mask> testutil.CleanupAndRequireSuccess(t, hc.Close) <mask> <mask> checkRefresh := func(t *testing.T, wantHosts *stringutil.Set) { <mask> upd, ok := <-hc.Upd() <mask> require.True(t, ok) <mask> require.NotNil(t, ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
require.IsType(t, (*HostsRecord)(nil), v)
<mask> <mask> v, ok := upd.Get(ip) <mask> require.True(t, ok) <mask> <mask> var set *stringutil.Set <mask> set, ok = v.(*stringutil.Set) <mask> require.True(t, ok) <mask> <mask> assert.True(t, set.Equal(wantHosts)) <mask> } <mask> <mask> t.Run("initial_refresh", func(t *testing.T) { </s> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
rec, _ := v.(*HostsRecord) require.NotNil(t, rec) assert.Truef(t, rec.Equal(want), "%+v != %+v", rec, want)
<mask> var set *stringutil.Set <mask> set, ok = v.(*stringutil.Set) <mask> require.True(t, ok) <mask> <mask> assert.True(t, set.Equal(wantHosts)) <mask> } <mask> <mask> t.Run("initial_refresh", func(t *testing.T) { <mask> checkRefresh(t, stringutil.NewSet("hostname")) <mask> }) </s> Pull reque...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
checkRefresh(t, &HostsRecord{ Aliases: stringutil.NewSet(), Canonical: "hostname", })
<mask> assert.True(t, set.Equal(wantHosts)) <mask> } <mask> <mask> t.Run("initial_refresh", func(t *testing.T) { <mask> checkRefresh(t, stringutil.NewSet("hostname")) <mask> }) <mask> <mask> t.Run("second_refresh", func(t *testing.T) { <mask> testFS["dir/file2"] = &fstest.MapFile{Data: []byte(ipStr...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
checkRefresh(t, &HostsRecord{ Aliases: stringutil.NewSet("alias"), Canonical: "hostname", })
<mask> <mask> t.Run("second_refresh", func(t *testing.T) { <mask> testFS["dir/file2"] = &fstest.MapFile{Data: []byte(ipStr + ` alias` + nl)} <mask> eventsCh <- event{} <mask> checkRefresh(t, stringutil.NewSet("hostname", "alias")) <mask> }) <mask> <mask> t.Run("double_refresh", func(t *testing.T) { ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
<mask> <mask> require.NoError(t, fstest.TestFS(testdata, "etc_hosts")) <mask> <mask> testCases := []struct { <mask> want []*rules.DNSRewrite <mask> name string <mask> req *urlfilter.DNSRequest <mask> }{{ <mask> want: []*rules.DNSRewrite{{ <mask> RCode: dns.RcodeSuccess, <mask> Value: ne...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
name string want []*rules.DNSRewrite
<mask> require.NoError(t, fstest.TestFS(testdata, "etc_hosts")) <mask> <mask> testCases := []struct { <mask> req *urlfilter.DNSRequest <mask> }{{ <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "simplehost", <mask> DNSType: dns.TypeA, <mask> }, </s> Pull request: all: use canonical names...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
req: &urlfilter.DNSRequest{ Hostname: "simplehost", DNSType: dns.TypeA, }, name: "simple",
<mask> req *urlfilter.DNSRequest <mask> name string <mask> want []*rules.DNSRewrite <mask> }{{ <mask> want: []*rules.DNSRewrite{{ <mask> RCode: dns.RcodeSuccess, <mask> Value: net.IPv4(1, 0, 0, 1), <mask> RRType: dns.TypeA, <mask> }, { <mask> RCode: dns.RcodeSuccess, </s> Pull requ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
}, {
<mask> RCode: dns.RcodeSuccess, <mask> Value: net.ParseIP("::1"), <mask> RRType: dns.TypeAAAA, <mask> }}, <mask> name: "simple", <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "simplehost", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { </s> Pull request: all: use canonical ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
Hostname: "hello.world",
<mask> RRType: dns.TypeAAAA, <mask> }}, <mask> name: "simple", <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "simplehost", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { <mask> want: []*rules.DNSRewrite{{ <mask> RCode: dns.RcodeSuccess, </s> Pull request: all: use canonical n...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
name: "hello_alias",
<mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "simplehost", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { <mask> want: []*rules.DNSRewrite{{ <mask> RCode: dns.RcodeSuccess, <mask> Value: net.IPv4(1, 0, 0, 0), <mask> RRType: dns.TypeA, <mask> }, { </s> Pull request: all: us...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
}, {
<mask> RCode: dns.RcodeSuccess, <mask> Value: net.ParseIP("::"), <mask> RRType: dns.TypeAAAA, <mask> }}, <mask> name: "hello_alias", <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "hello.world", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { </s> Pull request: all: use canon...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
Hostname: "hello.world.again",
<mask> RRType: dns.TypeAAAA, <mask> }}, <mask> name: "hello_alias", <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "hello.world", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { <mask> want: []*rules.DNSRewrite{{ <mask> RCode: dns.RcodeSuccess, </s> Pull request: all: use canon...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
name: "other_line_alias",
<mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "hello.world", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { <mask> want: []*rules.DNSRewrite{{ <mask> RCode: dns.RcodeSuccess, <mask> Value: net.IPv4(1, 0, 0, 0), <mask> RRType: dns.TypeA, <mask> }, { </s> Pull request: all: u...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
<mask> RCode: dns.RcodeSuccess, <mask> Value: net.ParseIP("::"), <mask> RRType: dns.TypeAAAA, <mask> }}, <mask> name: "other_line_alias", <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "hello.world.again", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { <mask> want: []*rule...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
<mask> Hostname: "hello.world.again", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { <mask> want: []*rules.DNSRewrite{}, <mask> name: "hello_subdomain", <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "say.hello", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { </s> Pull req...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
name: "hello_subdomain",
<mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "say.hello", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { <mask> want: []*rules.DNSRewrite{}, <mask> name: "hello_alias_subdomain", <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "say.hello.world", <mask> DNSType: dns.TypeA,...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
}, {
<mask> DNSType: dns.TypeA, <mask> }, <mask> }, { <mask> want: []*rules.DNSRewrite{}, <mask> name: "hello_alias_subdomain", <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "say.hello.world", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { </s> Pull request: all: use canonical names...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
name: "hello_alias_subdomain", want: []*rules.DNSRewrite{},
<mask> DNSType: dns.TypeA, <mask> }, <mask> }, { <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "for.testing", <mask> DNSType: dns.TypeA, <mask> }, <mask> name: "lots_of_aliases", </s> Pull request: all: use canonical names for hosts file runtime clients Updates #4683. Squashed commi...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
req: &urlfilter.DNSRequest{ Hostname: "for.testing", DNSType: dns.TypeA, }, name: "lots_of_aliases",
<mask> name: "hello_alias_subdomain", <mask> want: []*rules.DNSRewrite{}, <mask> }, { <mask> want: []*rules.DNSRewrite{{ <mask> RCode: dns.RcodeSuccess, <mask> RRType: dns.TypeA, <mask> Value: net.IPv4(1, 0, 0, 2), <mask> }, { <mask> RCode: dns.RcodeSuccess, </s> Pull request: all: use...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
}, {
<mask> RCode: dns.RcodeSuccess, <mask> RRType: dns.TypeAAAA, <mask> Value: net.ParseIP("::2"), <mask> }}, <mask> name: "lots_of_aliases", <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "for.testing", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { </s> Pull request: all: use ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
Hostname: "1.0.0.1.in-addr.arpa", DNSType: dns.TypePTR,
<mask> Value: net.ParseIP("::2"), <mask> }}, <mask> name: "lots_of_aliases", <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "for.testing", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { <mask> want: []*rules.DNSRewrite{{ <mask> RCode: dns.RcodeSuccess, <mask> RRType: dns.T...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
name: "reverse",
<mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "for.testing", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { <mask> want: []*rules.DNSRewrite{{ <mask> RCode: dns.RcodeSuccess, <mask> RRType: dns.TypePTR, <mask> Value: "simplehost.", <mask> }}, </s> Pull request: all: use can...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
<mask> RCode: dns.RcodeSuccess, <mask> RRType: dns.TypePTR, <mask> Value: "simplehost.", <mask> }}, <mask> name: "reverse", <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "1.0.0.1.in-addr.arpa", <mask> DNSType: dns.TypePTR, <mask> }, <mask> }, { <mask> want: []*rules.DNSRewr...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
<mask> Hostname: "1.0.0.1.in-addr.arpa", <mask> DNSType: dns.TypePTR, <mask> }, <mask> }, { <mask> want: []*rules.DNSRewrite{}, <mask> name: "non-existing", <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "nonexisting", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { </s> Pull...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
name: "non-existing", want: []*rules.DNSRewrite{},
<mask> DNSType: dns.TypeA, <mask> }, <mask> }, { <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "1.0.0.1.in-addr.arpa", <mask> DNSType: dns.TypeSRV, <mask> }, <mask> name: "bad_type", </s> Pull request: all: use canonical names for hosts file runtime clients Updates #4683. Squashed c...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
<mask> Hostname: "nonexisting", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { <mask> want: nil, <mask> name: "bad_type", <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "1.0.0.1.in-addr.arpa", <mask> DNSType: dns.TypeSRV, <mask> }, <mask> }, { </s> Pull request: all: use can...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
name: "bad_type", want: nil,
<mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "1.0.0.1.in-addr.arpa", <mask> DNSType: dns.TypeSRV, <mask> }, <mask> }, { <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "domain", <mask> DNSType: dns.TypeA, <mask> }, </s> Pull request: all: use canonical names for hosts file ru...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
req: &urlfilter.DNSRequest{ Hostname: "domain", DNSType: dns.TypeA, }, name: "issue_4216_4_6",
<mask> want: nil, <mask> }, { <mask> want: []*rules.DNSRewrite{{ <mask> RCode: dns.RcodeSuccess, <mask> RRType: dns.TypeA, <mask> Value: net.IPv4(4, 2, 1, 6), </s> Pull request: all: use canonical names for hosts file runtime clients Updates #4683. Squashed commit of the following: commit daa8...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
}, {
<mask> RCode: dns.RcodeSuccess, <mask> RRType: dns.TypeAAAA, <mask> Value: net.ParseIP("::42"), <mask> }}, <mask> name: "issue_4216_4_6", <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "domain", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { </s> Pull request: all: use canon...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
Hostname: "domain4",
<mask> Value: net.ParseIP("::42"), <mask> }}, <mask> name: "issue_4216_4_6", <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "domain", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { <mask> want: []*rules.DNSRewrite{{ <mask> RCode: dns.RcodeSuccess, </s> Pull request: all: use ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
name: "issue_4216_4",
<mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "domain", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { <mask> want: []*rules.DNSRewrite{{ <mask> RCode: dns.RcodeSuccess, <mask> RRType: dns.TypeA, <mask> Value: net.IPv4(7, 5, 3, 1), <mask> }, { </s> Pull request: all: use ca...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
}, {
<mask> RCode: dns.RcodeSuccess, <mask> RRType: dns.TypeA, <mask> Value: net.IPv4(1, 3, 5, 7), <mask> }}, <mask> name: "issue_4216_4", <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "domain4", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { </s> Pull request: all: use canonica...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
Hostname: "domain6", DNSType: dns.TypeAAAA,
<mask> Value: net.IPv4(1, 3, 5, 7), <mask> }}, <mask> name: "issue_4216_4", <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "domain4", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { <mask> want: []*rules.DNSRewrite{{ <mask> RCode: dns.RcodeSuccess, <mask> RRType: dns.TypeAA...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
name: "issue_4216_6",
<mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "domain4", <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { <mask> want: []*rules.DNSRewrite{{ <mask> RCode: dns.RcodeSuccess, <mask> RRType: dns.TypeAAAA, <mask> Value: net.ParseIP("::13"), <mask> }, { </s> Pull request: all: use...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
<mask> RCode: dns.RcodeSuccess, <mask> RRType: dns.TypeAAAA, <mask> Value: net.ParseIP("::31"), <mask> }}, <mask> name: "issue_4216_6", <mask> req: &urlfilter.DNSRequest{ <mask> Hostname: "domain6", <mask> DNSType: dns.TypeAAAA, <mask> }, <mask> }} <mask> <mask> stubWatcher := a...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/hostscontainer_test.go
// defined by refreshIvl. It disables auto-refreshing if refreshIvl is 0. If
<mask> refresh() (err error) <mask> } <mask> <mask> // NewSystemResolvers returns a SystemResolvers with the cache refresh rate <mask> // defined by refreshIvl. It disables auto-resfreshing if refreshIvl is 0. If <mask> // nil is passed for hostGenFunc, the default generator will be used. <mask> func NewSyste...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/aghnet/systemresolvers.go
rc, ok := clients.findRuntimeClientLocked(ip)
<mask> } <mask> <mask> // addHostLocked adds a new IP-hostname pairing. For internal use only. <mask> func (clients *clientsContainer) addHostLocked(ip net.IP, host string, src clientSource) (ok bool) { <mask> var rc *RuntimeClient <mask> rc, ok = clients.findRuntimeClientLocked(ip) <mask> if ok { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/home/clients.go
rec, ok := v.(*aghnet.HostsRecord)
<mask> clients.rmHostsBySrc(ClientSourceHostsFile) <mask> <mask> n := 0 <mask> hosts.Range(func(ip net.IP, v interface{}) (cont bool) { <mask> hosts, ok := v.(*stringutil.Set) <mask> if !ok { <mask> log.Error("dns: bad type %T in ipToRC for %s", v, ip) <mask> <mask> return true <mask> } </s>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/home/clients.go
clients.addHostLocked(ip, rec.Canonical, ClientSourceHostsFile) n++
<mask> <mask> return true <mask> } <mask> <mask> hosts.Range(func(name string) (cont bool) { <mask> if clients.addHostLocked(ip, name, ClientSourceHostsFile) { <mask> n++ <mask> } <mask> <mask> return true <mask> }) <mask> <mask> return true <mask> }) <mask> <mask> log.Deb...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/home/clients.go
log.Debug("clients: added %d client aliases from system hosts file", n)
<mask> <mask> return true <mask> }) <mask> <mask> log.Debug("clients: added %d client aliases from system hosts-file", n) <mask> } <mask> <mask> // addFromSystemARP adds the IP-hostname pairings from the output of the arp -a <mask> // command. <mask> func (clients *clientsContainer) addFromSystemARP() ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3505ce87397372f79bc067f6afa8cead833426a9
internal/home/clients.go
Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><span className="logs__text" title={value}>{value}</span></div>),
<mask> Header: 'IP', <mask> accessor: 'ip', <mask> }, { <mask> Header: 'Requests count', <mask> accessor: 'domain', <mask> Cell: ({ value }) => { <mask> const { </s> Fix footer links Closes #360
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/35368619b0d7ed0fb838d749cd7b2f63ae9c9aa3
client/src/components/Dashboard/BlockedDomains.js
Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><span className="logs__text" title={value}>{value}</span></div>),
<mask> columns = [{ <mask> Header: 'IP', <mask> accessor: 'ip', <mask> }, { <mask> Header: 'Requests count', <mask> accessor: 'count', <mask> Cell: ({ value }) => { <mask> const percent = getPercent(this.props.dnsQueries, value); <mask> co...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/35368619b0d7ed0fb838d749cd7b2f63ae9c9aa3
client/src/components/Dashboard/Clients.js
Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><span className="logs__text" title={value}>{value}</span></div>),
<mask> columns = [{ <mask> Header: 'IP', <mask> accessor: 'ip', <mask> }, { <mask> Header: 'Requests count', <mask> accessor: 'count', <mask> Cell: ({ value }) => { <mask> const percent = getPercent(this.props.dnsQueries, value); <mask> co...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/35368619b0d7ed0fb838d749cd7b2f63ae9c9aa3
client/src/components/Dashboard/QueriedDomains.js
"example_upstream_doq": "terenkripsi <0>DNS-over-QUIC</0>;",
<mask> "example_upstream_regular": "DNS reguler (melalui UDP);", <mask> "example_upstream_udp": "DNS biasa (lebih dari UDP, nama host);", <mask> "example_upstream_dot": "terenkripsi <0>DNS-over-TLS</0>;", <mask> "example_upstream_doh": "terenkripsi <0>DNS-over-HTTPS</0>;", <mask> "example_upstr...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/368a98fb296da349ed7fb99b03c4ed6b7d0dda3a
client/src/__locales/id.json
"encryption_doq": "Port DNS-over-QUIC ", "encryption_doq_desc": "Jika port ini diatur secara sepesifik, AdGuard Home akan menjalankan server DNS-lewat-QUIC pada port ini.",
<mask> "encryption_https": "Port HTTPS", <mask> "encryption_https_desc": "Jika port HTTPS dikonfigurasi, antarmuka admin Home AdGuard akan dapat diakses melalui HTTPS, dan itu juga akan memberikan DNS-over-HTTPS di lokasi '/ dns-query'.", <mask> "encryption_dot": "Port DNS-over-TLS", <mask> "encrypt...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/368a98fb296da349ed7fb99b03c4ed6b7d0dda3a
client/src/__locales/id.json
"example_upstream_doq": "<0>DNS su QUIC</0> crittografato;",
<mask> "example_upstream_regular": "DNS regolare (over UDP);", <mask> "example_upstream_udp": "DNS regolare (over UDP, nome host);", <mask> "example_upstream_dot": "<0>DNS su TLS</0> crittografato;", <mask> "example_upstream_doh": "<0>DNS su HTTPS</0> crittografato;", <mask> "example_upstream_d...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/368a98fb296da349ed7fb99b03c4ed6b7d0dda3a
client/src/__locales/it.json
"example_upstream_doq": "versleutelde <0>DNS-via-QUIC</0>;",
<mask> "example_upstream_regular": "standaard DNS (over UDP);", <mask> "example_upstream_udp": "standaard DNS (via UDP, hostnaam);", <mask> "example_upstream_dot": "versleutelde <0>DNS-via-TLS</0>;", <mask> "example_upstream_doh": "versleutelde <0>DNS-via-HTTPS</0>;", <mask> "example_upstream_d...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/368a98fb296da349ed7fb99b03c4ed6b7d0dda3a
client/src/__locales/nl.json
<mask> "strconv" <mask> "syscall" <mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/log" <mask> "github.com/gobuffalo/packr" <mask> "golang.org/x/crypto/ssh/terminal" <mask> ) <mask> <mask> // VersionString will be set through ldflags, contains current version </s> move log wrapper libr...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/368e2d1ebd51bbb48a6df208299630666853f985
app.go