docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep keep keep keep replace replace replace replace keep keep keep
|
<mask> func haveAdminRights() (bool, error) {
<mask> return os.Getuid() == 0, nil
<mask> }
<mask>
<mask> func sendProcessSignal(pid int, sig syscall.Signal) error {
<mask> return syscall.Kill(pid, sig)
<mask> }
<mask>
<mask> func isOpenWrt() (ok bool) {
<mask> return false
<mask> }
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps
|
https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f
|
internal/aghos/os_freebsd.go
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> // requires returning an error.
<mask> return os.Getuid() == 0, nil
<mask> }
<mask>
<mask> func sendProcessSignal(pid int, sig syscall.Signal) error {
<mask> return syscall.Kill(pid, sig)
<mask> }
<mask>
<mask> func isOpenWrt() (ok bool) {
<mask> var err error
<mask> ok, err = FileWalker(func(r io.Reader) (_ []string, cont bool, err error) {
<mask> const osNameData = "openwrt"
<mask>
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return Unsupported("kill")
}
</s> add </s> remove // SendProcessSignal sends signal to a process.
func SendProcessSignal(pid int, sig syscall.Signal) error {
return sendProcessSignal(pid, sig)
}
</s> add </s> remove parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("Can't read PID file %s: bad value", pidfile)
return
</s> add } else {
parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("can't read pid file %s: bad value", pidfile)
return
}
if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
log.Error("can't read pid file %s: %s", pidfile, err)
return
} </s> remove "syscall"
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f
|
internal/aghos/os_linux.go
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> package aghos
<mask>
<mask> import (
<mask> "syscall"
<mask>
<mask> "golang.org/x/sys/windows"
<mask> )
<mask>
<mask> func setRlimit(val uint64) (err error) {
<mask> return Unsupported("setrlimit")
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove "syscall"
</s> add "strconv"
"strings"
"github.com/AdguardTeam/golibs/log" </s> add "bufio" </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove // SendProcessSignal sends signal to a process.
func SendProcessSignal(pid int, sig syscall.Signal) error {
return sendProcessSignal(pid, sig)
}
</s> add </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f
|
internal/aghos/os_windows.go
|
keep keep keep keep replace replace replace replace keep keep keep
|
<mask> }
<mask> return true, nil
<mask> }
<mask>
<mask> func sendProcessSignal(pid int, sig syscall.Signal) error {
<mask> return Unsupported("kill")
<mask> }
<mask>
<mask> func isOpenWrt() (ok bool) {
<mask> return false
<mask> }
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove // SendProcessSignal sends signal to a process.
func SendProcessSignal(pid int, sig syscall.Signal) error {
return sendProcessSignal(pid, sig)
}
</s> add </s> remove parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("Can't read PID file %s: bad value", pidfile)
return
</s> add } else {
parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("can't read pid file %s: bad value", pidfile)
return
}
if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
log.Error("can't read pid file %s: %s", pidfile, err)
return
} </s> remove
data = []byte(psdata)
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f
|
internal/aghos/os_windows.go
|
keep keep add keep keep keep keep
|
<mask> }
<mask>
<mask> pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName)
<mask> data, err := os.ReadFile(pidfile)
<mask> if errors.Is(err, os.ErrNotExist) {
<mask> if pid, err = aghos.PIDByCommand(serviceName, os.Getpid()); err != nil {
<mask> log.Error("finding AdGuardHome process: %s", err)
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove var code int
var psdata string
code, psdata, err = aghos.RunCommand("ps", "-C", serviceName, "-o", "pid=")
if err != nil || code != 0 {
log.Error("finding AdGuardHome process: code: %d, error: %s", code, err)
</s> add if pid, err = aghos.PIDByCommand(serviceName, os.Getpid()); err != nil {
log.Error("finding AdGuardHome process: %s", err) </s> remove
data = []byte(psdata)
</s> add </s> remove parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("Can't read PID file %s: bad value", pidfile)
return
</s> add } else {
parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("can't read pid file %s: bad value", pidfile)
return
}
if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
log.Error("can't read pid file %s: %s", pidfile, err)
return
} </s> remove pid, err := strconv.Atoi(strings.TrimSpace(parts[0]))
if err != nil {
log.Error("Can't read PID file %s: %s", pidfile, err)
</s> add var proc *os.Process
if proc, err = os.FindProcess(pid); err != nil {
log.Error("can't send signal to pid %d: %s", pid, err)
</s> remove s := bufio.NewScanner(stdoutLimited)
</s> add s := bufio.NewScanner(stdout) </s> remove err = aghos.SendProcessSignal(pid, syscall.SIGHUP)
if err != nil {
log.Error("Can't send signal to PID %d: %s", pid, err)
</s> add if err = proc.Signal(syscall.SIGHUP); err != nil {
log.Error("Can't send signal to pid %d: %s", pid, err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f
|
internal/home/service.go
|
keep keep keep replace replace replace replace replace keep keep keep replace replace keep keep keep keep
|
<mask> pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName)
<mask> data, err := os.ReadFile(pidfile)
<mask> if errors.Is(err, os.ErrNotExist) {
<mask> var code int
<mask> var psdata string
<mask> code, psdata, err = aghos.RunCommand("ps", "-C", serviceName, "-o", "pid=")
<mask> if err != nil || code != 0 {
<mask> log.Error("finding AdGuardHome process: code: %d, error: %s", code, err)
<mask>
<mask> return
<mask> }
<mask>
<mask> data = []byte(psdata)
<mask> } else if err != nil {
<mask> log.Error("reading pid file %s: %s", pidfile, err)
<mask>
<mask> return
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> add var pid int </s> remove }
</s> add </s> remove parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("Can't read PID file %s: bad value", pidfile)
return
</s> add } else {
parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("can't read pid file %s: bad value", pidfile)
return
}
if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
log.Error("can't read pid file %s: %s", pidfile, err)
return
} </s> remove pid, err := strconv.Atoi(strings.TrimSpace(parts[0]))
if err != nil {
log.Error("Can't read PID file %s: %s", pidfile, err)
</s> add var proc *os.Process
if proc, err = os.FindProcess(pid); err != nil {
log.Error("can't send signal to pid %d: %s", pid, err)
</s> remove err = aghos.SendProcessSignal(pid, syscall.SIGHUP)
if err != nil {
log.Error("Can't send signal to PID %d: %s", pid, err)
</s> add if err = proc.Signal(syscall.SIGHUP); err != nil {
log.Error("Can't send signal to pid %d: %s", pid, err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f
|
internal/home/service.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> } else if err != nil {
<mask> log.Error("reading pid file %s: %s", pidfile, err)
<mask>
<mask> return
<mask> }
<mask>
<mask> parts := strings.SplitN(string(data), "\n", 2)
<mask> if len(parts) == 0 {
<mask> log.Error("Can't read PID file %s: bad value", pidfile)
<mask> return
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("Can't read PID file %s: bad value", pidfile)
return
</s> add } else {
parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("can't read pid file %s: bad value", pidfile)
return
}
if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
log.Error("can't read pid file %s: %s", pidfile, err)
return
} </s> remove pid, err := strconv.Atoi(strings.TrimSpace(parts[0]))
if err != nil {
log.Error("Can't read PID file %s: %s", pidfile, err)
</s> add var proc *os.Process
if proc, err = os.FindProcess(pid); err != nil {
log.Error("can't send signal to pid %d: %s", pid, err)
</s> remove
data = []byte(psdata)
</s> add </s> remove err = aghos.SendProcessSignal(pid, syscall.SIGHUP)
if err != nil {
log.Error("Can't send signal to PID %d: %s", pid, err)
</s> add if err = proc.Signal(syscall.SIGHUP); err != nil {
log.Error("Can't send signal to pid %d: %s", pid, err)
</s> remove log.Debug("Sent signal to PID %d", pid)
</s> add log.Debug("sent signal to PID %d", pid) </s> remove var code int
var psdata string
code, psdata, err = aghos.RunCommand("ps", "-C", serviceName, "-o", "pid=")
if err != nil || code != 0 {
log.Error("finding AdGuardHome process: code: %d, error: %s", code, err)
</s> add if pid, err = aghos.PIDByCommand(serviceName, os.Getpid()); err != nil {
log.Error("finding AdGuardHome process: %s", err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f
|
internal/home/service.go
|
keep keep replace replace replace replace keep keep replace replace replace keep
|
<mask> }
<mask>
<mask> parts := strings.SplitN(string(data), "\n", 2)
<mask> if len(parts) == 0 {
<mask> log.Error("Can't read PID file %s: bad value", pidfile)
<mask> return
<mask> }
<mask>
<mask> pid, err := strconv.Atoi(strings.TrimSpace(parts[0]))
<mask> if err != nil {
<mask> log.Error("Can't read PID file %s: %s", pidfile, err)
<mask> return
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove }
</s> add </s> remove err = aghos.SendProcessSignal(pid, syscall.SIGHUP)
if err != nil {
log.Error("Can't send signal to PID %d: %s", pid, err)
</s> add if err = proc.Signal(syscall.SIGHUP); err != nil {
log.Error("Can't send signal to pid %d: %s", pid, err)
</s> remove
data = []byte(psdata)
</s> add </s> remove log.Debug("Sent signal to PID %d", pid)
</s> add log.Debug("sent signal to PID %d", pid) </s> remove var code int
var psdata string
code, psdata, err = aghos.RunCommand("ps", "-C", serviceName, "-o", "pid=")
if err != nil || code != 0 {
log.Error("finding AdGuardHome process: code: %d, error: %s", code, err)
</s> add if pid, err = aghos.PIDByCommand(serviceName, os.Getpid()); err != nil {
log.Error("finding AdGuardHome process: %s", err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f
|
internal/home/service.go
|
keep keep keep keep replace replace replace keep keep replace keep
|
<mask> if err != nil {
<mask> log.Error("Can't read PID file %s: %s", pidfile, err)
<mask> return
<mask> }
<mask> err = aghos.SendProcessSignal(pid, syscall.SIGHUP)
<mask> if err != nil {
<mask> log.Error("Can't send signal to PID %d: %s", pid, err)
<mask> return
<mask> }
<mask> log.Debug("Sent signal to PID %d", pid)
<mask> }
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove pid, err := strconv.Atoi(strings.TrimSpace(parts[0]))
if err != nil {
log.Error("Can't read PID file %s: %s", pidfile, err)
</s> add var proc *os.Process
if proc, err = os.FindProcess(pid); err != nil {
log.Error("can't send signal to pid %d: %s", pid, err)
</s> remove parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("Can't read PID file %s: bad value", pidfile)
return
</s> add } else {
parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("can't read pid file %s: bad value", pidfile)
return
}
if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
log.Error("can't read pid file %s: %s", pidfile, err)
return
} </s> remove }
</s> add </s> remove
data = []byte(psdata)
</s> add </s> remove // SendProcessSignal sends signal to a process.
func SendProcessSignal(pid int, sig syscall.Signal) error {
return sendProcessSignal(pid, sig)
}
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f
|
internal/home/service.go
|
keep keep keep keep replace keep keep
|
<mask> {{.Name}}_env="IS_DAEMON=1"
<mask> {{.Name}}_user="root"
<mask> pidfile="/var/run/${name}.pid"
<mask> command="/usr/sbin/daemon"
<mask> command_args="-P ${pidfile} -f -r {{.WorkingDirectory}}/{{.Name}}"
<mask> run_rc_command "$1"
<mask> `
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove log.Debug("Sent signal to PID %d", pid)
</s> add log.Debug("sent signal to PID %d", pid) </s> remove var stdoutLimited io.Reader
stdoutLimited, err = aghio.LimitReader(stdout, aghos.MaxCmdOutputSize)
if err != nil {
return nil, fmt.Errorf("limiting stdout reader: %w", err)
}
</s> add </s> remove s := bufio.NewScanner(stdoutLimited)
</s> add s := bufio.NewScanner(stdout) </s> add "bufio" </s> add "io" </s> add "path"
|
https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f
|
internal/home/service.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> go 1.13
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.23.4
<mask> github.com/AdguardTeam/golibs v0.3.0
<mask> github.com/AdguardTeam/urlfilter v0.7.0
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/etcd-io/bbolt v1.3.3
<mask> github.com/go-test/deep v1.0.4 // indirect
</s> -(dnsforward): use dnsproxy v0.23.5 - fix DO caching </s> remove github.com/AdguardTeam/dnsproxy v0.23.4 h1:23o1mOdORJrkuMgRHXVa1oO0zRf+lZ1K6l9HxdLr+Ig=
github.com/AdguardTeam/dnsproxy v0.23.4/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
</s> add github.com/AdguardTeam/dnsproxy v0.23.5 h1:allfgFioe0e6QvSqKVeS0ZQAo9jHR+2XdNuT1isK7og=
github.com/AdguardTeam/dnsproxy v0.23.5/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0= </s> remove github.com/miekg/dns v1.1.19
</s> add github.com/miekg/dns v1.1.26 </s> remove golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0
golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed
</s> add golang.org/x/crypto v0.0.0-20191219195013-becbf705a915
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 </s> add golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g=
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= </s> add golang.org/x/crypto v0.0.0-20191219195013-becbf705a915 h1:aJ0ex187qoXrJHPo8ZasVTASQB7llQP6YeNzgDALPRk=
golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
https://github.com/AdguardTeam/AdGuardHome/commit/5556e34e7e82a9f15d3bb67c6a01e6ac220c0a7d
|
go.mod
|
keep keep replace keep keep keep replace replace replace
|
<mask> github.com/kardianos/service v0.0.0-20181115005516-4c239ee84e7b
<mask> github.com/krolaw/dhcp4 v0.0.0-20180925202202-7cead472c414
<mask> github.com/miekg/dns v1.1.19
<mask> github.com/sparrc/go-ping v0.0.0-20181106165434-ef3ab45e41b0
<mask> github.com/stretchr/testify v1.4.0
<mask> go.etcd.io/bbolt v1.3.3 // indirect
<mask> golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc
<mask> golang.org/x/net v0.0.0-20191002035440-2ec189313ef0
<mask> golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed
</s> -(dnsforward): use dnsproxy v0.23.5 - fix DO caching </s> add golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g=
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove github.com/AdguardTeam/dnsproxy v0.23.4
</s> add github.com/AdguardTeam/dnsproxy v0.23.5 </s> add golang.org/x/crypto v0.0.0-20191219195013-becbf705a915 h1:aJ0ex187qoXrJHPo8ZasVTASQB7llQP6YeNzgDALPRk=
golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= </s> add github.com/miekg/dns v1.1.26 h1:gPxPSwALAeHJSjarOs00QjVdV9QoBvc1D2ujQUr5BzU=
github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= </s> add golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
https://github.com/AdguardTeam/AdGuardHome/commit/5556e34e7e82a9f15d3bb67c6a01e6ac220c0a7d
|
go.mod
|
replace replace keep keep keep keep keep
|
<mask> github.com/AdguardTeam/dnsproxy v0.23.4 h1:23o1mOdORJrkuMgRHXVa1oO0zRf+lZ1K6l9HxdLr+Ig=
<mask> github.com/AdguardTeam/dnsproxy v0.23.4/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
<mask> github.com/AdguardTeam/golibs v0.2.4 h1:GUssokegKxKF13K67Pgl0ZGwqHjNN6X7sep5ik6ORdY=
<mask> github.com/AdguardTeam/golibs v0.2.4/go.mod h1:R3M+mAg3nWG4X4Hsag5eef/TckHFH12ZYhK7AzJc8+U=
<mask> github.com/AdguardTeam/golibs v0.3.0 h1:1zO8ulGEOdXDDM++Ap4sYfTsT/Z4tZBZtiWSA4ykcOU=
<mask> github.com/AdguardTeam/golibs v0.3.0/go.mod h1:R3M+mAg3nWG4X4Hsag5eef/TckHFH12ZYhK7AzJc8+U=
<mask> github.com/AdguardTeam/gomitmproxy v0.1.2/go.mod h1:Mrt/3EfiXIYY2aZ7KsLuCUJzUARD/fWJ119IfzOB13M=
</s> -(dnsforward): use dnsproxy v0.23.5 - fix DO caching </s> remove github.com/AdguardTeam/dnsproxy v0.23.4
</s> add github.com/AdguardTeam/dnsproxy v0.23.5 </s> add golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g=
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= </s> add golang.org/x/crypto v0.0.0-20191219195013-becbf705a915 h1:aJ0ex187qoXrJHPo8ZasVTASQB7llQP6YeNzgDALPRk=
golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= </s> add github.com/miekg/dns v1.1.26 h1:gPxPSwALAeHJSjarOs00QjVdV9QoBvc1D2ujQUr5BzU=
github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= </s> remove golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0
golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed
</s> add golang.org/x/crypto v0.0.0-20191219195013-becbf705a915
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76
|
https://github.com/AdguardTeam/AdGuardHome/commit/5556e34e7e82a9f15d3bb67c6a01e6ac220c0a7d
|
go.sum
|
keep add keep keep keep keep keep keep
|
<mask> github.com/miekg/dns v1.1.19 h1:0ymbfaLG1/utH2+BydNiF+dx1jSEmdr/nylOtkGHZZg=
<mask> github.com/miekg/dns v1.1.19/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
<mask> github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
<mask> github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
<mask> github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
<mask> github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
</s> -(dnsforward): use dnsproxy v0.23.5 - fix DO caching </s> remove github.com/miekg/dns v1.1.19
</s> add github.com/miekg/dns v1.1.26 </s> remove golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0
golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed
</s> add golang.org/x/crypto v0.0.0-20191219195013-becbf705a915
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 </s> add golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g=
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= </s> add golang.org/x/crypto v0.0.0-20191219195013-becbf705a915 h1:aJ0ex187qoXrJHPo8ZasVTASQB7llQP6YeNzgDALPRk=
golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= </s> remove github.com/AdguardTeam/dnsproxy v0.23.4 h1:23o1mOdORJrkuMgRHXVa1oO0zRf+lZ1K6l9HxdLr+Ig=
github.com/AdguardTeam/dnsproxy v0.23.4/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
</s> add github.com/AdguardTeam/dnsproxy v0.23.5 h1:allfgFioe0e6QvSqKVeS0ZQAo9jHR+2XdNuT1isK7og=
github.com/AdguardTeam/dnsproxy v0.23.5/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
|
https://github.com/AdguardTeam/AdGuardHome/commit/5556e34e7e82a9f15d3bb67c6a01e6ac220c0a7d
|
go.sum
|
keep keep keep add keep keep keep keep keep
|
<mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
<mask> golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc h1:KyTYo8xkh/2WdbFLUyQwBS0Jfn3qfZ9QmuPbok2oENE=
<mask> golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20190119204137-ed066c81e75e h1:MDa3fSUp6MdYHouVmCCNz/zaH2a6CRcxY3VhT/K3C5Q=
<mask> golang.org/x/net v0.0.0-20190119204137-ed066c81e75e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
</s> -(dnsforward): use dnsproxy v0.23.5 - fix DO caching </s> remove golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0
golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed
</s> add golang.org/x/crypto v0.0.0-20191219195013-becbf705a915
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 </s> remove github.com/miekg/dns v1.1.19
</s> add github.com/miekg/dns v1.1.26 </s> add golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g=
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= </s> add github.com/miekg/dns v1.1.26 h1:gPxPSwALAeHJSjarOs00QjVdV9QoBvc1D2ujQUr5BzU=
github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= </s> remove github.com/AdguardTeam/dnsproxy v0.23.4 h1:23o1mOdORJrkuMgRHXVa1oO0zRf+lZ1K6l9HxdLr+Ig=
github.com/AdguardTeam/dnsproxy v0.23.4/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
</s> add github.com/AdguardTeam/dnsproxy v0.23.5 h1:allfgFioe0e6QvSqKVeS0ZQAo9jHR+2XdNuT1isK7og=
github.com/AdguardTeam/dnsproxy v0.23.5/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
|
https://github.com/AdguardTeam/AdGuardHome/commit/5556e34e7e82a9f15d3bb67c6a01e6ac220c0a7d
|
go.sum
|
keep keep add keep keep keep keep keep keep
|
<mask> golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20191002035440-2ec189313ef0 h1:2mqDk8w/o6UmeUCu5Qiq2y7iMf6anbx+YA8d1JFoFrs=
<mask> golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
<mask> golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
<mask> golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
</s> -(dnsforward): use dnsproxy v0.23.5 - fix DO caching </s> remove golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0
golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed
</s> add golang.org/x/crypto v0.0.0-20191219195013-becbf705a915
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 </s> remove github.com/miekg/dns v1.1.19
</s> add github.com/miekg/dns v1.1.26 </s> add golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g=
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add golang.org/x/crypto v0.0.0-20191219195013-becbf705a915 h1:aJ0ex187qoXrJHPo8ZasVTASQB7llQP6YeNzgDALPRk=
golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= </s> add github.com/miekg/dns v1.1.26 h1:gPxPSwALAeHJSjarOs00QjVdV9QoBvc1D2ujQUr5BzU=
github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= </s> remove github.com/AdguardTeam/dnsproxy v0.23.4 h1:23o1mOdORJrkuMgRHXVa1oO0zRf+lZ1K6l9HxdLr+Ig=
github.com/AdguardTeam/dnsproxy v0.23.4/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
</s> add github.com/AdguardTeam/dnsproxy v0.23.5 h1:allfgFioe0e6QvSqKVeS0ZQAo9jHR+2XdNuT1isK7og=
github.com/AdguardTeam/dnsproxy v0.23.5/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
|
https://github.com/AdguardTeam/AdGuardHome/commit/5556e34e7e82a9f15d3bb67c6a01e6ac220c0a7d
|
go.sum
|
keep keep add keep keep keep keep
|
<mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed h1:5TJcLJn2a55mJjzYk0yOoqN8X1OdvBDUnaZaKKyQtkY=
<mask> golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
</s> -(dnsforward): use dnsproxy v0.23.5 - fix DO caching </s> remove golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0
golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed
</s> add golang.org/x/crypto v0.0.0-20191219195013-becbf705a915
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 </s> remove github.com/AdguardTeam/dnsproxy v0.23.4 h1:23o1mOdORJrkuMgRHXVa1oO0zRf+lZ1K6l9HxdLr+Ig=
github.com/AdguardTeam/dnsproxy v0.23.4/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
</s> add github.com/AdguardTeam/dnsproxy v0.23.5 h1:allfgFioe0e6QvSqKVeS0ZQAo9jHR+2XdNuT1isK7og=
github.com/AdguardTeam/dnsproxy v0.23.5/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0= </s> remove github.com/AdguardTeam/dnsproxy v0.23.4
</s> add github.com/AdguardTeam/dnsproxy v0.23.5 </s> add golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= </s> add golang.org/x/crypto v0.0.0-20191219195013-becbf705a915 h1:aJ0ex187qoXrJHPo8ZasVTASQB7llQP6YeNzgDALPRk=
golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= </s> add github.com/miekg/dns v1.1.26 h1:gPxPSwALAeHJSjarOs00QjVdV9QoBvc1D2ujQUr5BzU=
github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
|
https://github.com/AdguardTeam/AdGuardHome/commit/5556e34e7e82a9f15d3bb67c6a01e6ac220c0a7d
|
go.sum
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "load_balancing": "Load-balancing",
<mask> "load_balancing_desc": "Query one upstream server at a time. AdGuard Home will use the weighted random algorithm to pick the server so that the fastest server is used more often.",
<mask> "bootstrap_dns": "Bootstrap DNS servers",
<mask> "bootstrap_dns_desc": "Bootstrap DNS servers are used to resolve IP addresses of the DoH/DoT resolvers you specify as upstreams.",
<mask> "local_ptr_title": "Private DNS servers",
<mask> "local_ptr_desc": "The DNS servers that AdGuard Home uses for local PTR queries. These servers are used to resolve the hostnames of clients with private IP addresses, for example \"192.168.12.34\", using rDNS. If not set, AdGuard Home uses the default DNS resolvers of your OS.",
<mask> "local_ptr_placeholder": "Enter one server address per line",
<mask> "resolve_clients_title": "Enable reverse resolving of clients' IP addresses",
<mask> "resolve_clients_desc": "If enabled, AdGuard Home will attempt to reversely resolve clients' IP addresses into their hostnames by sending PTR queries to corresponding resolvers (private DNS servers for local clients, upstream server for clients with public IP addresses).",
<mask> "check_dhcp_servers": "Check for DHCP servers",
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers_title": "Use private rDNS resolvers",
"use_private_ptr_resolvers_desc": "Perform reverse DNS lookups for locally-served addresses using these upstream servers. If disabled, AdGuard Home responds with NXDOMAIN to all such PTR requests except for clients known from DHCP, /etc/hosts, and so on.", </s> add // UsePrivateRDNS defines if the PTR requests for unknown addresses from
// locally-served networks should be resolved via private PTR resolvers.
UsePrivateRDNS bool
</s> add // usePrivate is used to store the state of current private RDNS
// resolving settings and to react to it's changes.
usePrivate uint32
</s> add // UsePrivateRDNS defines if the PTR requests for unknown addresses from
// locally-served networks should be resolved via private PTR resolvers.
UsePrivateRDNS bool `yaml:"use_private_ptr_resolvers"`
</s> add // ResolvesPrivatePTR returns true if the RDNSExchanger is able to
// resolve PTR requests for locally-served addresses.
ResolvesPrivatePTR() (ok bool) </s> remove // Reconfigure applies the new configuration to the DNS server
</s> add // Reconfigure applies the new configuration to the DNS server.
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
client/src/__locales/en.json
|
keep keep keep add keep keep keep keep
|
<mask> "local_ptr_desc": "The DNS servers that AdGuard Home uses for local PTR queries. These servers are used to resolve the hostnames of clients with private IP addresses, for example \"192.168.12.34\", using rDNS. If not set, AdGuard Home uses the default DNS resolvers of your OS.",
<mask> "local_ptr_placeholder": "Enter one server address per line",
<mask> "resolve_clients_title": "Enable reverse resolving of clients' IP addresses",
<mask> "resolve_clients_desc": "If enabled, AdGuard Home will attempt to reversely resolve clients' IP addresses into their hostnames by sending PTR queries to corresponding resolvers (private DNS servers for local clients, upstream server for clients with public IP addresses).",
<mask> "check_dhcp_servers": "Check for DHCP servers",
<mask> "save_config": "Save configuration",
<mask> "enabled_dhcp": "DHCP server enabled",
<mask> "disabled_dhcp": "DHCP server disabled",
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove "local_ptr_title": "Private DNS servers",
</s> add "local_ptr_title": "Private reverse DNS servers", </s> add // UsePrivateRDNS defines if the PTR requests for unknown addresses from
// locally-served networks should be resolved via private PTR resolvers.
UsePrivateRDNS bool
</s> add // UsePrivateRDNS defines if the PTR requests for unknown addresses from
// locally-served networks should be resolved via private PTR resolvers.
UsePrivateRDNS bool `yaml:"use_private_ptr_resolvers"`
</s> add // usePrivate is used to store the state of current private RDNS
// resolving settings and to react to it's changes.
usePrivate uint32
</s> add // ResolvesPrivatePTR returns true if the RDNSExchanger is able to
// resolve PTR requests for locally-served addresses.
ResolvesPrivatePTR() (ok bool) </s> remove var err error
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
client/src/__locales/en.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> <div className="col-12">
<mask> <Examples />
<mask> <hr />
<mask> </div>
<mask> <div className="col-12 mb-4">
<mask> <label
<mask> className="form__label form__label--with-desc"
<mask> htmlFor="bootstrap_dns"
<mask> >
<mask> <Trans>bootstrap_dns</Trans>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove <div className="col-12 mb-4">
</s> add <div className="col-12"> </s> add <div className="mt-4">
<Field
name="use_private_ptr_resolvers"
type="checkbox"
component={CheckboxField}
placeholder={t('use_private_ptr_resolvers_title')}
subtitle={t('use_private_ptr_resolvers_desc')}
disabled={processingSetConfig}
/>
</div>
</div>
<div className="col-12">
<hr /> </s> add use_private_ptr_resolvers, </s> remove return
</s> add return true </s> remove // Begin adds the ip to the resolving queue if it is not cached or already
// resolved.
func (r *RDNS) Begin(ip net.IP) {
</s> add // ensurePrivateCache ensures that the state of the RDNS cache is consistent
// with the current private client RDNS resolving settings.
//
// TODO(e.burkov): Clearing cache each time this value changed is not a perfect
// approach since only unresolved locally-served addresses should be removed.
// Implement when improving the cache.
func (r *RDNS) ensurePrivateCache() {
var usePrivate uint32
if r.exchanger.ResolvesPrivatePTR() {
usePrivate = 1
}
if atomic.CompareAndSwapUint32(&r.usePrivate, 1-usePrivate, usePrivate) {
r.ipCache.Clear()
}
}
// isCached returns true if ip is already cached and not expired yet. It also
// caches it otherwise.
func (r *RDNS) isCached(ip net.IP) (ok bool) { </s> add 'use_private_ptr_resolvers':
'type': 'boolean'
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
client/src/components/Settings/Dns/Upstream/Form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> </div>
<mask> <div className="col-12">
<mask> <hr />
<mask> </div>
<mask> <div className="col-12 mb-4">
<mask> <label
<mask> className="form__label form__label--with-desc"
<mask> htmlFor="local_ptr"
<mask> >
<mask> <Trans>local_ptr_title</Trans>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove <div className="col-12 mb-4">
</s> add <div className="col-12 mb-2"> </s> add <div className="mt-4">
<Field
name="use_private_ptr_resolvers"
type="checkbox"
component={CheckboxField}
placeholder={t('use_private_ptr_resolvers_title')}
subtitle={t('use_private_ptr_resolvers_desc')}
disabled={processingSetConfig}
/>
</div>
</div>
<div className="col-12">
<hr /> </s> add use_private_ptr_resolvers, </s> remove return
</s> add return true </s> remove // Begin adds the ip to the resolving queue if it is not cached or already
// resolved.
func (r *RDNS) Begin(ip net.IP) {
</s> add // ensurePrivateCache ensures that the state of the RDNS cache is consistent
// with the current private client RDNS resolving settings.
//
// TODO(e.burkov): Clearing cache each time this value changed is not a perfect
// approach since only unresolved locally-served addresses should be removed.
// Implement when improving the cache.
func (r *RDNS) ensurePrivateCache() {
var usePrivate uint32
if r.exchanger.ResolvesPrivatePTR() {
usePrivate = 1
}
if atomic.CompareAndSwapUint32(&r.usePrivate, 1-usePrivate, usePrivate) {
r.ipCache.Clear()
}
}
// isCached returns true if ip is already cached and not expired yet. It also
// caches it otherwise.
func (r *RDNS) isCached(ip net.IP) (ok bool) { </s> add 'use_private_ptr_resolvers':
'type': 'boolean'
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
client/src/components/Settings/Dns/Upstream/Form.js
|
keep keep keep add keep keep keep keep
|
<mask> placeholder={t('local_ptr_placeholder')}
<mask> disabled={processingSetConfig}
<mask> normalizeOnBlur={removeEmptyLines}
<mask> />
<mask> </div>
<mask> <div className="col-12 mb-4">
<mask> <Field
<mask> name="resolve_clients"
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove <div className="col-12 mb-4">
</s> add <div className="col-12 mb-2"> </s> remove <div className="col-12 mb-4">
</s> add <div className="col-12"> </s> add use_private_ptr_resolvers, </s> add 'use_private_ptr_resolvers':
'type': 'boolean' </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> remove s.RLock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
client/src/components/Settings/Dns/Upstream/Form.js
|
keep add keep keep keep keep keep keep
|
<mask> resolve_clients,
<mask> local_ptr_upstreams,
<mask> } = useSelector((state) => state.dnsConfig, shallowEqual);
<mask>
<mask> const upstream_dns_file = useSelector((state) => state.dnsConfig.upstream_dns_file);
<mask>
<mask> const handleSubmit = (values) => {
<mask> const {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add use_private_ptr_resolvers, </s> add use_private_ptr_resolvers, </s> add //
// TODO(e.burkov): Is ARP a higher priority source than DHCP? </s> add use_private_ptr_resolvers, </s> add // ResolvesPrivatePTR returns true if the RDNSExchanger is able to
// resolve PTR requests for locally-served addresses.
ResolvesPrivatePTR() (ok bool) </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
err = s.localResolvers.Resolve(ctx)
} else {
err = s.internalProxy.Resolve(ctx)
}
</s> add err = resolver.Resolve(ctx)
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
client/src/components/Settings/Dns/Upstream/index.js
|
keep keep keep add keep keep keep keep
|
<mask> upstream_dns,
<mask> upstream_mode,
<mask> resolve_clients,
<mask> local_ptr_upstreams,
<mask> } = values;
<mask>
<mask> const dnsConfig = {
<mask> bootstrap_dns,
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add use_private_ptr_resolvers, </s> add use_private_ptr_resolvers, </s> add use_private_ptr_resolvers, </s> add UsePrivateRDNS *bool `json:"use_private_ptr_resolvers"` </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
err = s.localResolvers.Resolve(ctx)
} else {
err = s.internalProxy.Resolve(ctx)
}
</s> add err = resolver.Resolve(ctx)
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
client/src/components/Settings/Dns/Upstream/index.js
|
keep add keep keep keep keep keep keep
|
<mask> resolve_clients,
<mask> local_ptr_upstreams,
<mask> ...(upstream_dns_file ? null : { upstream_dns }),
<mask> };
<mask>
<mask> dispatch(setDnsConfig(dnsConfig));
<mask> };
<mask>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add use_private_ptr_resolvers, </s> add use_private_ptr_resolvers, </s> add use_private_ptr_resolvers, </s> add if usePrivate {
rDNS.usePrivate = 1
} </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
client/src/components/Settings/Dns/Upstream/index.js
|
keep add keep keep keep keep keep keep
|
<mask> resolve_clients,
<mask> local_ptr_upstreams,
<mask> }}
<mask> onSubmit={handleSubmit}
<mask> />
<mask> </div>
<mask> </div>
<mask> </Card>;
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add <div className="mt-4">
<Field
name="use_private_ptr_resolvers"
type="checkbox"
component={CheckboxField}
placeholder={t('use_private_ptr_resolvers_title')}
subtitle={t('use_private_ptr_resolvers_desc')}
disabled={processingSetConfig}
/>
</div>
</div>
<div className="col-12">
<hr /> </s> remove <div className="col-12 mb-4">
</s> add <div className="col-12"> </s> remove <div className="col-12 mb-4">
</s> add <div className="col-12 mb-2"> </s> add use_private_ptr_resolvers, </s> add use_private_ptr_resolvers, </s> add use_private_ptr_resolvers,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
client/src/components/Settings/Dns/Upstream/index.js
|
keep keep keep keep replace replace replace replace replace replace keep replace keep
|
<mask> DisallowedClients []string `json:"disallowed_clients"`
<mask> BlockedHosts []string `json:"blocked_hosts"`
<mask> }
<mask>
<mask> func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
<mask> s.RLock()
<mask> j := accessListJSON{
<mask> AllowedClients: s.conf.AllowedClients,
<mask> DisallowedClients: s.conf.DisallowedClients,
<mask> BlockedHosts: s.conf.BlockedHosts,
<mask> }
<mask> s.RUnlock()
<mask>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add UsePrivateRDNS: &usePrivateRDNS, </s> remove // ServeHTTP is a HTTP handler method we use to provide DNS-over-HTTPS
</s> add // ServeHTTP is a HTTP handler method we use to provide DNS-over-HTTPS. </s> remove s.RLock()
p := s.dnsProxy
s.RUnlock()
if p != nil { // an attempt to protect against race in case we're here after Close() was called
</s> add var p *proxy.Proxy
func() {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
p = s.dnsProxy
}()
if p != nil { </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/access.go
|
keep keep keep replace keep keep keep keep replace replace replace replace replace
|
<mask> return
<mask> }
<mask>
<mask> s.Lock()
<mask> s.conf.AllowedClients = j.AllowedClients
<mask> s.conf.DisallowedClients = j.DisallowedClients
<mask> s.conf.BlockedHosts = j.BlockedHosts
<mask> s.access = a
<mask> s.Unlock()
<mask> s.conf.ConfigModified()
<mask>
<mask> log.Debug("Access: updated lists: %d, %d, %d",
<mask> len(j.AllowedClients), len(j.DisallowedClients), len(j.BlockedHosts))
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove s.Lock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> add if dc.UsePrivateRDNS != nil {
s.conf.UsePrivateRDNS = *dc.UsePrivateRDNS
}
</s> remove err := s.ipset.Close()
if err != nil {
</s> add if err := s.ipset.Close(); err != nil {
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/access.go
|
keep keep keep add keep keep keep keep
|
<mask>
<mask> // ResolveClients signals if the RDNS should resolve clients' addresses.
<mask> ResolveClients bool
<mask>
<mask> // LocalPTRResolvers is a slice of addresses to be used as upstreams for
<mask> // resolving PTR queries for local addresses.
<mask> LocalPTRResolvers []string
<mask> }
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add // UsePrivateRDNS defines if the PTR requests for unknown addresses from
// locally-served networks should be resolved via private PTR resolvers.
UsePrivateRDNS bool `yaml:"use_private_ptr_resolvers"`
</s> add // ResolvesPrivatePTR returns true if the RDNSExchanger is able to
// resolve PTR requests for locally-served addresses.
ResolvesPrivatePTR() (ok bool) </s> remove "local_ptr_title": "Private DNS servers",
</s> add "local_ptr_title": "Private reverse DNS servers", </s> add "use_private_ptr_resolvers_title": "Use private rDNS resolvers",
"use_private_ptr_resolvers_desc": "Perform reverse DNS lookups for locally-served addresses using these upstream servers. If disabled, AdGuard Home responds with NXDOMAIN to all such PTR requests except for clients known from DHCP, /etc/hosts, and so on.", </s> add // usePrivate is used to store the state of current private RDNS
// resolving settings and to react to it's changes.
usePrivate uint32
</s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/config.go
|
keep add keep keep keep keep
|
<mask> }
<mask>
<mask> if !s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> return resultCodeSuccess
<mask> }
<mask>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err </s> add var resolver *proxy.Proxy = s.localResolvers
if !s.subnetDetector.IsLocallyServedNetwork(ip) {
resolver = s.internalProxy
} else if !s.conf.UsePrivateRDNS {
return "", nil
}
</s> add // Do not even put into query log. </s> add if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
var err error
ctx.result, err = s.filterDNSRequest(ctx) </s> remove s.RUnlock()
</s> add </s> remove if ctx.protectionEnabled {
if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
ctx.result, err = s.filterDNSRequest(ctx)
</s> add if !ctx.protectionEnabled {
return resultCodeSuccess
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dns.go
|
keep keep keep replace replace replace keep replace keep keep keep keep
|
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> err := s.localResolvers.Resolve(d)
<mask> if err != nil {
<mask> ctx.err = err
<mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> if d.Res == nil {
<mask> d.Res = s.genNXDomain(d.Req)
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
var err error
ctx.result, err = s.filterDNSRequest(ctx) </s> add // Do not even put into query log. </s> remove s.RUnlock()
</s> add </s> add } else if res == nil {
continue </s> remove d.Res = s.genDNSFilterMessage(d, &res)
</s> add d.Res = s.genDNSFilterMessage(d, res)
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dns.go
|
keep keep add keep keep keep keep keep
|
<mask> if d.Res == nil {
<mask> d.Res = s.genNXDomain(d.Req)
<mask>
<mask> return resultCodeFinish
<mask> }
<mask>
<mask> return resultCodeSuccess
<mask> }
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove return resultCodeError
</s> add return resultCodeError
} </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err </s> remove d.Res = s.genDNSFilterMessage(d, &res)
</s> add d.Res = s.genDNSFilterMessage(d, res) </s> add } else if res == nil {
continue </s> remove return &res, nil
</s> add return res, nil </s> add if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
var err error
ctx.result, err = s.filterDNSRequest(ctx)
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dns.go
|
keep replace replace replace replace replace replace replace keep replace keep
|
<mask>
<mask> s.RLock()
<mask> // Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
<mask> // This could happen after proxy server has been stopped, but its workers are not yet exited.
<mask> //
<mask> // A better approach is for proxy.Stop() to wait until all its workers exit,
<mask> // but this would require the Upstream interface to have Close() function
<mask> // (to prevent from hanging while waiting for unresponsive DNS server to respond).
<mask>
<mask> var err error
<mask> ctx.protectionEnabled = s.conf.ProtectionEnabled && s.dnsFilter != nil
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.RLock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove s.RLock()
// Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
// This could happen after proxy server has been stopped, but its workers are not yet exited.
if !s.conf.ProtectionEnabled || s.dnsFilter == nil {
s.RUnlock()
continue
}
res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, ctx.setts)
s.RUnlock()
</s> add res, err := s.checkHostRules(host, d.Req.Question[0].Qtype, ctx.setts) </s> remove // Close - close object
</s> add // Close gracefully closes the server. It is safe for concurrent use.
//
// TODO(e.burkov): A better approach would be making Stop method waiting for all
// its workers finished. But it would require the upstream.Upstream to have the
// Close method to prevent from hanging while waiting for unresponsive server to
// respond. </s> remove if ctx.protectionEnabled {
if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
ctx.result, err = s.filterDNSRequest(ctx)
</s> add if !ctx.protectionEnabled {
return resultCodeSuccess </s> remove // If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address.
// If this is a match, we set a new response in d.Res and return.
</s> add // checkHostRules checks the host against filters. It is safe for concurrent
// use.
func (s *Server) checkHostRules(host string, qtype uint16, setts *filtering.Settings) (
r *filtering.Result,
err error,
) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
if s.dnsFilter == nil {
return nil, nil
}
var res filtering.Result
res, err = s.dnsFilter.CheckHostRules(host, qtype, setts)
if err != nil {
return nil, err
}
return &res, err
}
// If response contains CNAME, A or AAAA records, we apply filtering to each
// canonical host name or IP address. If this is a match, we set a new response
// in d.Res and return.
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dns.go
|
keep keep replace replace replace replace replace keep replace keep
|
<mask> var err error
<mask> ctx.protectionEnabled = s.conf.ProtectionEnabled && s.dnsFilter != nil
<mask> if ctx.protectionEnabled {
<mask> if ctx.setts == nil {
<mask> ctx.setts = s.getClientRequestFilteringSettings(ctx)
<mask> }
<mask> ctx.result, err = s.filterDNSRequest(ctx)
<mask> }
<mask> s.RUnlock()
<mask>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
var err error
ctx.result, err = s.filterDNSRequest(ctx) </s> remove var err error
</s> add </s> remove s.RLock()
// Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
// This could happen after proxy server has been stopped, but its workers are not yet exited.
//
// A better approach is for proxy.Stop() to wait until all its workers exit,
// but this would require the Upstream interface to have Close() function
// (to prevent from hanging while waiting for unresponsive DNS server to respond).
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err </s> remove return resultCodeError
</s> add return resultCodeError
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dns.go
|
keep keep keep add keep keep keep keep
|
<mask> if !ctx.protectionEnabled {
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> if err != nil {
<mask> ctx.err = err
<mask>
<mask> return resultCodeError
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err </s> remove return resultCodeError
</s> add return resultCodeError
} </s> remove s.RUnlock()
</s> add </s> remove if ctx.protectionEnabled {
if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
ctx.result, err = s.filterDNSRequest(ctx)
</s> add if !ctx.protectionEnabled {
return resultCodeSuccess </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
err = s.localResolvers.Resolve(ctx)
} else {
err = s.internalProxy.Resolve(ctx)
}
</s> add err = resolver.Resolve(ctx) </s> remove err := s.ipset.Close()
if err != nil {
</s> add if err := s.ipset.Close(); err != nil {
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dns.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> })
<mask> }
<mask> }
<mask>
<mask> func TestLocalRestriction(t *testing.T) {
<mask> ups := &aghtest.TestUpstream{
<mask> Reverse: map[string][]string{
<mask> "251.252.253.254.in-addr.arpa.": {"host1.example.net."},
<mask> "1.1.168.192.in-addr.arpa.": {"some.local-client."},
<mask> },
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove dns.conf.ResolveClients = false
for _, tc := range testCases {
host, eerr := dns.Exchange(tc.req)
</s> add srv.conf.UsePrivateRDNS = false </s> remove host, eerr := dns.Exchange(tc.req)
</s> add host, eerr := srv.Exchange(tc.req) </s> remove dns.localResolvers = &proxy.Proxy{
</s> add srv.localResolvers = &proxy.Proxy{ </s> remove require.NoError(t, eerr)
assert.Empty(t, host)
}
</s> add host, eerr := srv.Exchange(localIP)
require.NoError(t, eerr)
assert.Empty(t, host) </s> add "github.com/stretchr/testify/require" </s> remove
s.Unlock()
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dns_test.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> internalProxy *proxy.Proxy
<mask>
<mask> isRunning bool
<mask>
<mask> sync.RWMutex
<mask> conf ServerConfig
<mask> }
<mask>
<mask> // defaultLocalDomainSuffix is the default suffix used to detect internal hosts
<mask> // when no suffix is provided.
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add // serverLock protects Server.
serverLock sync.RWMutex </s> add // UsePrivateRDNS defines if the PTR requests for unknown addresses from
// locally-served networks should be resolved via private PTR resolvers.
UsePrivateRDNS bool
</s> add // ResolvesPrivatePTR returns true if the RDNSExchanger is able to
// resolve PTR requests for locally-served addresses.
ResolvesPrivatePTR() (ok bool) </s> add // UsePrivateRDNS defines if the PTR requests for unknown addresses from
// locally-served networks should be resolved via private PTR resolvers.
UsePrivateRDNS bool `yaml:"use_private_ptr_resolvers"`
</s> add // usePrivate is used to store the state of current private RDNS
// resolving settings and to react to it's changes.
usePrivate uint32
</s> remove // IsRunning returns true if the DNS server is running
</s> add // IsRunning returns true if the DNS server is running.
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward.go
|
keep keep add keep keep keep keep keep
|
<mask> isRunning bool
<mask>
<mask> conf ServerConfig
<mask> }
<mask>
<mask> // defaultLocalDomainSuffix is the default suffix used to detect internal hosts
<mask> // when no suffix is provided.
<mask> //
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove sync.RWMutex
</s> add </s> add // UsePrivateRDNS defines if the PTR requests for unknown addresses from
// locally-served networks should be resolved via private PTR resolvers.
UsePrivateRDNS bool
</s> add // ResolvesPrivatePTR returns true if the RDNSExchanger is able to
// resolve PTR requests for locally-served addresses.
ResolvesPrivatePTR() (ok bool) </s> add // UsePrivateRDNS defines if the PTR requests for unknown addresses from
// locally-served networks should be resolved via private PTR resolvers.
UsePrivateRDNS bool `yaml:"use_private_ptr_resolvers"`
</s> add // usePrivate is used to store the state of current private RDNS
// resolving settings and to react to it's changes.
usePrivate uint32
</s> remove // IsRunning returns true if the DNS server is running
</s> add // IsRunning returns true if the DNS server is running.
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward.go
|
keep keep keep keep replace keep replace keep keep
|
<mask>
<mask> return s
<mask> }
<mask>
<mask> // Close - close object
<mask> func (s *Server) Close() {
<mask> s.Lock()
<mask> s.dnsFilter = nil
<mask> s.stats = nil
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> add s.conf.UsePrivateRDNS = true </s> remove
s.Unlock()
</s> add </s> remove s.RLock()
p := s.dnsProxy
s.RUnlock()
if p != nil { // an attempt to protect against race in case we're here after Close() was called
</s> add var p *proxy.Proxy
func() {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
p = s.dnsProxy
}()
if p != nil { </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward.go
|
keep replace replace keep keep replace replace keep keep keep keep
|
<mask>
<mask> err := s.ipset.Close()
<mask> if err != nil {
<mask> log.Error("closing ipset: %s", err)
<mask> }
<mask>
<mask> s.Unlock()
<mask> }
<mask>
<mask> // WriteDiskConfig - write configuration
<mask> func (s *Server) WriteDiskConfig(c *FilteringConfig) {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.RLock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove s.RUnlock()
</s> add }
func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
j := s.accessListJSON() </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> add } else if res == nil {
continue
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask>
<mask> // WriteDiskConfig - write configuration
<mask> func (s *Server) WriteDiskConfig(c *FilteringConfig) {
<mask> s.RLock()
<mask> sc := s.conf.FilteringConfig
<mask> *c = sc
<mask> c.RatelimitWhitelist = aghstrings.CloneSlice(sc.RatelimitWhitelist)
<mask> c.BootstrapDNS = aghstrings.CloneSlice(sc.BootstrapDNS)
<mask> c.AllowedClients = aghstrings.CloneSlice(sc.AllowedClients)
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove
s.Unlock()
</s> add </s> remove s.RUnlock()
</s> add </s> remove s.Lock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients bool) {
s.RLock()
defer s.RUnlock()
</s> add func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients, resolvePTR bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove // Reconfigure applies the new configuration to the DNS server
</s> add // Reconfigure applies the new configuration to the DNS server.
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward.go
|
keep keep keep keep replace keep keep keep replace replace replace keep
|
<mask> c.AllowedClients = aghstrings.CloneSlice(sc.AllowedClients)
<mask> c.DisallowedClients = aghstrings.CloneSlice(sc.DisallowedClients)
<mask> c.BlockedHosts = aghstrings.CloneSlice(sc.BlockedHosts)
<mask> c.UpstreamDNS = aghstrings.CloneSlice(sc.UpstreamDNS)
<mask> s.RUnlock()
<mask> }
<mask>
<mask> // RDNSSettings returns the copy of actual RDNS configuration.
<mask> func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients bool) {
<mask> s.RLock()
<mask> defer s.RUnlock()
<mask>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove return aghstrings.CloneSlice(s.conf.LocalPTRResolvers), s.conf.ResolveClients
</s> add return aghstrings.CloneSlice(s.conf.LocalPTRResolvers),
s.conf.ResolveClients,
s.conf.UsePrivateRDNS </s> remove s.RLock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove // IsRunning returns true if the DNS server is running
</s> add // IsRunning returns true if the DNS server is running. </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients bool) {
<mask> s.RLock()
<mask> defer s.RUnlock()
<mask>
<mask> return aghstrings.CloneSlice(s.conf.LocalPTRResolvers), s.conf.ResolveClients
<mask> }
<mask>
<mask> // Resolve - get IP addresses by host name from an upstream server.
<mask> // No request/response filtering is performed.
<mask> // Query log and Stats are not updated.
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients bool) {
s.RLock()
defer s.RUnlock()
</s> add func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients, resolvePTR bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove s.RUnlock()
</s> add </s> remove // If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address.
// If this is a match, we set a new response in d.Res and return.
</s> add // checkHostRules checks the host against filters. It is safe for concurrent
// use.
func (s *Server) checkHostRules(host string, qtype uint16, setts *filtering.Settings) (
r *filtering.Result,
err error,
) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
if s.dnsFilter == nil {
return nil, nil
}
var res filtering.Result
res, err = s.dnsFilter.CheckHostRules(host, qtype, setts)
if err != nil {
return nil, err
}
return &res, err
}
// If response contains CNAME, A or AAAA records, we apply filtering to each
// canonical host name or IP address. If this is a match, we set a new response
// in d.Res and return. </s> add // ResolvesPrivatePTR implements the RDNSExchanger interface for *Server.
func (s *Server) ResolvesPrivatePTR() (ok bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
return s.conf.UsePrivateRDNS
}
</s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward.go
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> // No request/response filtering is performed.
<mask> // Query log and Stats are not updated.
<mask> // This method may be called before Start().
<mask> func (s *Server) Resolve(host string) ([]net.IPAddr, error) {
<mask> s.RLock()
<mask> defer s.RUnlock()
<mask> return s.internalProxy.LookupIPAddr(host)
<mask> }
<mask>
<mask> // RDNSExchanger is a resolver for clients' addresses.
<mask> type RDNSExchanger interface {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove return aghstrings.CloneSlice(s.conf.LocalPTRResolvers), s.conf.ResolveClients
</s> add return aghstrings.CloneSlice(s.conf.LocalPTRResolvers),
s.conf.ResolveClients,
s.conf.UsePrivateRDNS </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> add // ResolvesPrivatePTR implements the RDNSExchanger interface for *Server.
func (s *Server) ResolvesPrivatePTR() (ok bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
return s.conf.UsePrivateRDNS
}
</s> remove // ServeHTTP is a HTTP handler method we use to provide DNS-over-HTTPS
</s> add // ServeHTTP is a HTTP handler method we use to provide DNS-over-HTTPS. </s> remove aghtest.Exchanger
</s> add ex aghtest.Exchanger
usePrivate bool </s> add // ResolvesPrivatePTR returns true if the RDNSExchanger is able to
// resolve PTR requests for locally-served addresses.
ResolvesPrivatePTR() (ok bool)
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward.go
|
keep keep add keep keep keep keep keep
|
<mask> // Exchange tries to resolve the ip in a suitable way, e.g. either as
<mask> // local or as external.
<mask> Exchange(ip net.IP) (host string, err error)
<mask> }
<mask>
<mask> const (
<mask> // rDNSEmptyAnswerErr is returned by Exchange method when the answer
<mask> // section of respond is empty.
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove aghtest.Exchanger
</s> add ex aghtest.Exchanger
usePrivate bool </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> add // UsePrivateRDNS defines if the PTR requests for unknown addresses from
// locally-served networks should be resolved via private PTR resolvers.
UsePrivateRDNS bool
</s> remove // If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address.
// If this is a match, we set a new response in d.Res and return.
</s> add // checkHostRules checks the host against filters. It is safe for concurrent
// use.
func (s *Server) checkHostRules(host string, qtype uint16, setts *filtering.Settings) (
r *filtering.Result,
err error,
) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
if s.dnsFilter == nil {
return nil, nil
}
var res filtering.Result
res, err = s.dnsFilter.CheckHostRules(host, qtype, setts)
if err != nil {
return nil, err
}
return &res, err
}
// If response contains CNAME, A or AAAA records, we apply filtering to each
// canonical host name or IP address. If this is a match, we set a new response
// in d.Res and return. </s> remove // Begin adds the ip to the resolving queue if it is not cached or already
// resolved.
func (r *RDNS) Begin(ip net.IP) {
</s> add // ensurePrivateCache ensures that the state of the RDNS cache is consistent
// with the current private client RDNS resolving settings.
//
// TODO(e.burkov): Clearing cache each time this value changed is not a perfect
// approach since only unresolved locally-served addresses should be removed.
// Implement when improving the cache.
func (r *RDNS) ensurePrivateCache() {
var usePrivate uint32
if r.exchanger.ResolvesPrivatePTR() {
usePrivate = 1
}
if atomic.CompareAndSwapUint32(&r.usePrivate, 1-usePrivate, usePrivate) {
r.ipCache.Clear()
}
}
// isCached returns true if ip is already cached and not expired yet. It also
// caches it otherwise.
func (r *RDNS) isCached(ip net.IP) (ok bool) { </s> add return false
}
// Begin adds the ip to the resolving queue if it is not cached or already
// resolved.
func (r *RDNS) Begin(ip net.IP) {
r.ensurePrivateCache()
if r.isCached(ip) {
return
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward.go
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> )
<mask>
<mask> // Exchange implements the RDNSExchanger interface for *Server.
<mask> func (s *Server) Exchange(ip net.IP) (host string, err error) {
<mask> s.RLock()
<mask> defer s.RUnlock()
<mask>
<mask> if !s.conf.ResolveClients {
<mask> return "", nil
<mask> }
<mask>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove aghtest.Exchanger
</s> add ex aghtest.Exchanger
usePrivate bool </s> add // ResolvesPrivatePTR implements the RDNSExchanger interface for *Server.
func (s *Server) ResolvesPrivatePTR() (ok bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
return s.conf.UsePrivateRDNS
}
</s> add // ResolvesPrivatePTR returns true if the RDNSExchanger is able to
// resolve PTR requests for locally-served addresses.
ResolvesPrivatePTR() (ok bool) </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove // IsRunning returns true if the DNS server is running
</s> add // IsRunning returns true if the DNS server is running.
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward.go
|
keep keep add keep keep keep keep
|
<mask> return "", nil
<mask> }
<mask>
<mask> arpa := dns.Fqdn(aghnet.ReverseAddr(ip))
<mask> req := &dns.Msg{
<mask> MsgHdr: dns.MsgHdr{
<mask> Id: dns.Id(),
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove aghtest.Exchanger
</s> add ex aghtest.Exchanger
usePrivate bool </s> remove resp, err := e.Exchanger.Exchange(req)
</s> add resp, err := e.ex.Exchange(req) </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
err = s.localResolvers.Resolve(ctx)
} else {
err = s.internalProxy.Resolve(ctx)
}
</s> add err = resolver.Resolve(ctx) </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err </s> remove return resultCodeError
</s> add return resultCodeError
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward.go
|
keep keep keep keep replace replace replace replace replace keep keep keep keep keep
|
<mask> StartTime: time.Now(),
<mask> }
<mask>
<mask> var resp *dns.Msg
<mask> if s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> err = s.localResolvers.Resolve(ctx)
<mask> } else {
<mask> err = s.internalProxy.Resolve(ctx)
<mask> }
<mask> if err != nil {
<mask> return "", err
<mask> }
<mask>
<mask> resp = ctx.Res
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
var err error
ctx.result, err = s.filterDNSRequest(ctx) </s> remove resp, err := e.Exchanger.Exchange(req)
</s> add resp, err := e.ex.Exchange(req) </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err </s> add } else if res == nil {
continue </s> remove d.Res = s.genDNSFilterMessage(d, &res)
</s> add d.Res = s.genDNSFilterMessage(d, res) </s> remove return resultCodeError
</s> add return resultCodeError
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward.go
|
keep keep add keep keep keep keep
|
<mask> return strings.TrimSuffix(ptr.Ptr, "."), nil
<mask> }
<mask>
<mask> // Start starts the DNS server.
<mask> func (s *Server) Start() error {
<mask> s.serverLock.Lock()
<mask> defer s.serverLock.Unlock()
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove // Reconfigure applies the new configuration to the DNS server
</s> add // Reconfigure applies the new configuration to the DNS server. </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward.go
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> }
<mask>
<mask> // Start starts the DNS server.
<mask> func (s *Server) Start() error {
<mask> s.Lock()
<mask> defer s.Unlock()
<mask> return s.startLocked()
<mask> }
<mask>
<mask> // startLocked starts the DNS server without locking. For internal use only.
<mask> func (s *Server) startLocked() error {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> add // ResolvesPrivatePTR implements the RDNSExchanger interface for *Server.
func (s *Server) ResolvesPrivatePTR() (ok bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
return s.conf.UsePrivateRDNS
}
</s> remove // Reconfigure applies the new configuration to the DNS server
</s> add // Reconfigure applies the new configuration to the DNS server. </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove // IsRunning returns true if the DNS server is running
</s> add // IsRunning returns true if the DNS server is running.
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward.go
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> }
<mask>
<mask> // Stop stops the DNS server.
<mask> func (s *Server) Stop() error {
<mask> s.Lock()
<mask> defer s.Unlock()
<mask> return s.stopLocked()
<mask> }
<mask>
<mask> // stopLocked stops the DNS server without locking. For internal use only.
<mask> func (s *Server) stopLocked() error {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> remove // Reconfigure applies the new configuration to the DNS server
</s> add // Reconfigure applies the new configuration to the DNS server. </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> add // ResolvesPrivatePTR implements the RDNSExchanger interface for *Server.
func (s *Server) ResolvesPrivatePTR() (ok bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
return s.conf.UsePrivateRDNS
}
</s> remove // IsRunning returns true if the DNS server is running
</s> add // IsRunning returns true if the DNS server is running.
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward.go
|
keep keep keep replace keep keep keep keep keep keep keep keep replace replace
|
<mask> return nil
<mask> }
<mask>
<mask> // IsRunning returns true if the DNS server is running
<mask> func (s *Server) IsRunning() bool {
<mask> s.RLock()
<mask> defer s.RUnlock()
<mask> return s.isRunning
<mask> }
<mask>
<mask> // IsRunning returns true if the DNS server is running
<mask> func (s *Server) IsRunning() bool {
<mask> s.RLock()
<mask> defer s.RUnlock()
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove // Reconfigure applies the new configuration to the DNS server
</s> add // Reconfigure applies the new configuration to the DNS server. </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> remove func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients bool) {
s.RLock()
defer s.RUnlock()
</s> add func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients, resolvePTR bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward.go
|
keep keep replace keep replace replace
|
<mask> }
<mask>
<mask> // Reconfigure applies the new configuration to the DNS server
<mask> func (s *Server) Reconfigure(config *ServerConfig) error {
<mask> s.Lock()
<mask> defer s.Unlock()
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> add // ResolvesPrivatePTR implements the RDNSExchanger interface for *Server.
func (s *Server) ResolvesPrivatePTR() (ok bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
return s.conf.UsePrivateRDNS
}
</s> remove // IsRunning returns true if the DNS server is running
</s> add // IsRunning returns true if the DNS server is running.
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward.go
|
keep replace keep replace replace replace replace keep
|
<mask>
<mask> // ServeHTTP is a HTTP handler method we use to provide DNS-over-HTTPS
<mask> func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
<mask> s.RLock()
<mask> p := s.dnsProxy
<mask> s.RUnlock()
<mask> if p != nil { // an attempt to protect against race in case we're here after Close() was called
<mask> p.ServeHTTP(w, r)
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove // If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address.
// If this is a match, we set a new response in d.Res and return.
</s> add // checkHostRules checks the host against filters. It is safe for concurrent
// use.
func (s *Server) checkHostRules(host string, qtype uint16, setts *filtering.Settings) (
r *filtering.Result,
err error,
) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
if s.dnsFilter == nil {
return nil, nil
}
var res filtering.Result
res, err = s.dnsFilter.CheckHostRules(host, qtype, setts)
if err != nil {
return nil, err
}
return &res, err
}
// If response contains CNAME, A or AAAA records, we apply filtering to each
// canonical host name or IP address. If this is a match, we set a new response
// in d.Res and return. </s> remove s.RUnlock()
</s> add }
func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
j := s.accessListJSON() </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove s.RLock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
s.RLock()
j := accessListJSON{
AllowedClients: s.conf.AllowedClients,
DisallowedClients: s.conf.DisallowedClients,
BlockedHosts: s.conf.BlockedHosts,
</s> add func (s *Server) accessListJSON() (j accessListJSON) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
return accessListJSON{
AllowedClients: aghstrings.CloneSlice(s.conf.AllowedClients),
DisallowedClients: aghstrings.CloneSlice(s.conf.DisallowedClients),
BlockedHosts: aghstrings.CloneSlice(s.conf.BlockedHosts),
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward.go
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> err = s.Prepare(nil)
<mask> require.NoError(t, err)
<mask>
<mask> s.Lock()
<mask> defer s.Unlock()
<mask>
<mask> if localUps != nil {
<mask> s.localResolvers.Config.UpstreamConfig.Upstreams = []upstream.Upstream{localUps}
<mask> }
<mask>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add s.conf.UsePrivateRDNS = true </s> remove err := s.ipset.Close()
if err != nil {
</s> add if err := s.ipset.Close(); err != nil { </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove
s.Unlock()
</s> add </s> remove dns.subnetDetector, err = aghnet.NewSubnetDetector()
</s> add srv.subnetDetector, err = aghnet.NewSubnetDetector()
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward_test.go
|
keep keep add keep keep keep keep
|
<mask>
<mask> if localUps != nil {
<mask> s.localResolvers.Config.UpstreamConfig.Upstreams = []upstream.Upstream{localUps}
<mask> }
<mask>
<mask> return s
<mask> }
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove config.DNS.FilteringConfig = c
config.DNS.LocalPTRResolvers, config.DNS.ResolveClients = s.RDNSSettings()
</s> add dns := &config.DNS
dns.FilteringConfig = c
dns.LocalPTRResolvers,
dns.ResolveClients,
dns.UsePrivateRDNS = s.RDNSSettings() </s> add if dc.UsePrivateRDNS != nil {
s.conf.UsePrivateRDNS = *dc.UsePrivateRDNS
}
</s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err </s> remove return resultCodeError
</s> add return resultCodeError
} </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
err = s.localResolvers.Resolve(ctx)
} else {
err = s.internalProxy.Resolve(ctx)
}
</s> add err = resolver.Resolve(ctx)
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward_test.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> Hostname: "some-host",
<mask> Block: true,
<mask> }
<mask>
<mask> dns := NewCustomServer(&proxy.Proxy{
<mask> Config: proxy.Config{
<mask> UpstreamConfig: &proxy.UpstreamConfig{
<mask> Upstreams: []upstream.Upstream{extUpstream},
<mask> },
<mask> },
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove dns.localResolvers = &proxy.Proxy{
</s> add srv.localResolvers = &proxy.Proxy{ </s> remove dns.conf.ResolveClients = true
</s> add srv.conf.ResolveClients = true
srv.conf.UsePrivateRDNS = true </s> add UsePrivateRDNS: true, </s> remove host, eerr := dns.Exchange(tc.req)
</s> add host, eerr := srv.Exchange(tc.req) </s> remove Exchanger: aghtest.Exchanger{
</s> add ex: aghtest.Exchanger{ </s> remove config.DNS.FilteringConfig = c
config.DNS.LocalPTRResolvers, config.DNS.ResolveClients = s.RDNSSettings()
</s> add dns := &config.DNS
dns.FilteringConfig = c
dns.LocalPTRResolvers,
dns.ResolveClients,
dns.UsePrivateRDNS = s.RDNSSettings()
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward_test.go
|
keep replace keep keep replace keep keep
|
<mask> })
<mask> dns.conf.ResolveClients = true
<mask>
<mask> var err error
<mask> dns.subnetDetector, err = aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove dns.conf.ResolveClients = false
for _, tc := range testCases {
host, eerr := dns.Exchange(tc.req)
</s> add srv.conf.UsePrivateRDNS = false </s> remove require.NoError(t, eerr)
assert.Empty(t, host)
}
</s> add host, eerr := srv.Exchange(localIP)
require.NoError(t, eerr)
assert.Empty(t, host) </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> add if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
var err error
ctx.result, err = s.filterDNSRequest(ctx) </s> remove if ctx.protectionEnabled {
if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
ctx.result, err = s.filterDNSRequest(ctx)
</s> add if !ctx.protectionEnabled {
return resultCodeSuccess
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward_test.go
|
keep replace keep keep keep keep replace keep keep
|
<mask> }
<mask> dns.localResolvers = &proxy.Proxy{
<mask> Config: pcfg,
<mask> }
<mask>
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> host, eerr := dns.Exchange(tc.req)
<mask>
<mask> require.ErrorIs(t, eerr, tc.wantErr)
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove dns.conf.ResolveClients = false
for _, tc := range testCases {
host, eerr := dns.Exchange(tc.req)
</s> add srv.conf.UsePrivateRDNS = false </s> remove require.NoError(t, eerr)
assert.Empty(t, host)
}
</s> add host, eerr := srv.Exchange(localIP)
require.NoError(t, eerr)
assert.Empty(t, host) </s> remove func TestLocalRestriction(t *testing.T) {
</s> add func TestServer_ProcessRestrictLocal(t *testing.T) { </s> remove dns := NewCustomServer(&proxy.Proxy{
</s> add srv := NewCustomServer(&proxy.Proxy{ </s> add "github.com/stretchr/testify/require"
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward_test.go
|
keep keep keep keep replace replace replace keep replace replace replace
|
<mask> })
<mask> }
<mask>
<mask> t.Run("resolving_disabled", func(t *testing.T) {
<mask> dns.conf.ResolveClients = false
<mask> for _, tc := range testCases {
<mask> host, eerr := dns.Exchange(tc.req)
<mask>
<mask> require.NoError(t, eerr)
<mask> assert.Empty(t, host)
<mask> }
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove host, eerr := dns.Exchange(tc.req)
</s> add host, eerr := srv.Exchange(tc.req) </s> remove dns.localResolvers = &proxy.Proxy{
</s> add srv.localResolvers = &proxy.Proxy{ </s> remove dns.subnetDetector, err = aghnet.NewSubnetDetector()
</s> add srv.subnetDetector, err = aghnet.NewSubnetDetector() </s> remove func TestLocalRestriction(t *testing.T) {
</s> add func TestServer_ProcessRestrictLocal(t *testing.T) { </s> remove dns.conf.ResolveClients = true
</s> add srv.conf.ResolveClients = true
srv.conf.UsePrivateRDNS = true
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/dnsforward_test.go
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> return &res, err
<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) (*filtering.Result, error) {
<mask> d := ctx.proxyCtx
<mask> for _, a := range d.Res.Answer {
<mask> host := ""
<mask>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove // ServeHTTP is a HTTP handler method we use to provide DNS-over-HTTPS
</s> add // ServeHTTP is a HTTP handler method we use to provide DNS-over-HTTPS. </s> remove return aghstrings.CloneSlice(s.conf.LocalPTRResolvers), s.conf.ResolveClients
</s> add return aghstrings.CloneSlice(s.conf.LocalPTRResolvers),
s.conf.ResolveClients,
s.conf.UsePrivateRDNS </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove s.RLock()
p := s.dnsProxy
s.RUnlock()
if p != nil { // an attempt to protect against race in case we're here after Close() was called
</s> add var p *proxy.Proxy
func() {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
p = s.dnsProxy
}()
if p != nil { </s> remove aghtest.Exchanger
</s> add ex aghtest.Exchanger
usePrivate bool </s> remove s.RLock()
// Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
// This could happen after proxy server has been stopped, but its workers are not yet exited.
//
// A better approach is for proxy.Stop() to wait until all its workers exit,
// but this would require the Upstream interface to have Close() function
// (to prevent from hanging while waiting for unresponsive DNS server to respond).
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/filter.go
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> default:
<mask> continue
<mask> }
<mask>
<mask> s.RLock()
<mask> // Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
<mask> // This could happen after proxy server has been stopped, but its workers are not yet exited.
<mask> if !s.conf.ProtectionEnabled || s.dnsFilter == nil {
<mask> s.RUnlock()
<mask> continue
<mask> }
<mask> res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, ctx.setts)
<mask> s.RUnlock()
<mask>
<mask> if err != nil {
<mask> return nil, err
<mask> } else if res.IsFiltered {
<mask> d.Res = s.genDNSFilterMessage(d, &res)
<mask> log.Debug("DNSFwd: Matched %s by response: %s", d.Req.Question[0].Name, host)
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add } else if res == nil {
continue </s> remove s.RLock()
// Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
// This could happen after proxy server has been stopped, but its workers are not yet exited.
//
// A better approach is for proxy.Stop() to wait until all its workers exit,
// but this would require the Upstream interface to have Close() function
// (to prevent from hanging while waiting for unresponsive DNS server to respond).
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove s.RLock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove d.Res = s.genDNSFilterMessage(d, &res)
</s> add d.Res = s.genDNSFilterMessage(d, res) </s> remove return &res, nil
</s> add return res, nil </s> remove if ctx.protectionEnabled {
if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
ctx.result, err = s.filterDNSRequest(ctx)
</s> add if !ctx.protectionEnabled {
return resultCodeSuccess
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/filter.go
|
keep keep keep add keep keep keep keep
|
<mask>
<mask> res, err := s.checkHostRules(host, d.Req.Question[0].Qtype, ctx.setts)
<mask> if err != nil {
<mask> return nil, err
<mask> } else if res.IsFiltered {
<mask> d.Res = s.genDNSFilterMessage(d, res)
<mask> log.Debug("DNSFwd: Matched %s by response: %s", d.Req.Question[0].Name, host)
<mask>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove d.Res = s.genDNSFilterMessage(d, &res)
</s> add d.Res = s.genDNSFilterMessage(d, res) </s> remove return &res, nil
</s> add return res, nil </s> remove s.RLock()
// Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
// This could happen after proxy server has been stopped, but its workers are not yet exited.
if !s.conf.ProtectionEnabled || s.dnsFilter == nil {
s.RUnlock()
continue
}
res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, ctx.setts)
s.RUnlock()
</s> add res, err := s.checkHostRules(host, d.Req.Question[0].Qtype, ctx.setts) </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err </s> remove return resultCodeError
</s> add return resultCodeError
} </s> remove err := s.ipset.Close()
if err != nil {
</s> add if err := s.ipset.Close(); err != nil {
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/filter.go
|
keep keep replace keep replace keep
|
<mask> return nil, err
<mask> } else if res.IsFiltered {
<mask> d.Res = s.genDNSFilterMessage(d, &res)
<mask> log.Debug("DNSFwd: Matched %s by response: %s", d.Req.Question[0].Name, host)
<mask> return &res, nil
<mask> }
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add } else if res == nil {
continue </s> remove s.RLock()
// Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
// This could happen after proxy server has been stopped, but its workers are not yet exited.
if !s.conf.ProtectionEnabled || s.dnsFilter == nil {
s.RUnlock()
continue
}
res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, ctx.setts)
s.RUnlock()
</s> add res, err := s.checkHostRules(host, d.Req.Question[0].Qtype, ctx.setts) </s> remove return resultCodeError
</s> add return resultCodeError
} </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
err = s.localResolvers.Resolve(ctx)
} else {
err = s.internalProxy.Resolve(ctx)
}
</s> add err = resolver.Resolve(ctx) </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/filter.go
|
keep add keep keep keep keep keep keep
|
<mask> CacheMaxTTL *uint32 `json:"cache_ttl_max"`
<mask> ResolveClients *bool `json:"resolve_clients"`
<mask> LocalPTRUpstreams *[]string `json:"local_ptr_upstreams"`
<mask> }
<mask>
<mask> func (s *Server) getDNSConfig() dnsConfig {
<mask> s.serverLock.RLock()
<mask> defer s.serverLock.RUnlock()
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> add // ResolvesPrivatePTR implements the RDNSExchanger interface for *Server.
func (s *Server) ResolvesPrivatePTR() (ok bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
return s.conf.UsePrivateRDNS
}
</s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients bool) {
s.RLock()
defer s.RUnlock()
</s> add func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients, resolvePTR bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove s.RLock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/http.go
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> LocalPTRUpstreams *[]string `json:"local_ptr_upstreams"`
<mask> }
<mask>
<mask> func (s *Server) getDNSConfig() dnsConfig {
<mask> s.RLock()
<mask> defer s.RUnlock()
<mask>
<mask> upstreams := aghstrings.CloneSliceOrEmpty(s.conf.UpstreamDNS)
<mask> upstreamFile := s.conf.UpstreamDNSFileName
<mask> bootstraps := aghstrings.CloneSliceOrEmpty(s.conf.BootstrapDNS)
<mask> protectionEnabled := s.conf.ProtectionEnabled
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add UsePrivateRDNS *bool `json:"use_private_ptr_resolvers"` </s> remove func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
s.RLock()
j := accessListJSON{
AllowedClients: s.conf.AllowedClients,
DisallowedClients: s.conf.DisallowedClients,
BlockedHosts: s.conf.BlockedHosts,
</s> add func (s *Server) accessListJSON() (j accessListJSON) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
return accessListJSON{
AllowedClients: aghstrings.CloneSlice(s.conf.AllowedClients),
DisallowedClients: aghstrings.CloneSlice(s.conf.DisallowedClients),
BlockedHosts: aghstrings.CloneSlice(s.conf.BlockedHosts), </s> remove s.RUnlock()
</s> add }
func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
j := s.accessListJSON() </s> remove
s.Unlock()
</s> add </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove s.RLock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/http.go
|
keep keep add keep keep keep keep keep keep
|
<mask> cacheMinTTL := s.conf.CacheMinTTL
<mask> cacheMaxTTL := s.conf.CacheMaxTTL
<mask> resolveClients := s.conf.ResolveClients
<mask> localPTRUpstreams := aghstrings.CloneSliceOrEmpty(s.conf.LocalPTRResolvers)
<mask> var upstreamMode string
<mask> if s.conf.FastestAddr {
<mask> upstreamMode = "fastest_addr"
<mask> } else if s.conf.AllServers {
<mask> upstreamMode = "parallel"
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add var resolver *proxy.Proxy = s.localResolvers
if !s.subnetDetector.IsLocallyServedNetwork(ip) {
resolver = s.internalProxy
} else if !s.conf.UsePrivateRDNS {
return "", nil
}
</s> remove dns.subnetDetector, err = aghnet.NewSubnetDetector()
</s> add srv.subnetDetector, err = aghnet.NewSubnetDetector() </s> add } else if res == nil {
continue </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
err = s.localResolvers.Resolve(ctx)
} else {
err = s.internalProxy.Resolve(ctx)
}
</s> add err = resolver.Resolve(ctx) </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err </s> remove config.DNS.FilteringConfig = c
config.DNS.LocalPTRResolvers, config.DNS.ResolveClients = s.RDNSSettings()
</s> add dns := &config.DNS
dns.FilteringConfig = c
dns.LocalPTRResolvers,
dns.ResolveClients,
dns.UsePrivateRDNS = s.RDNSSettings()
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/http.go
|
keep keep add keep keep keep keep keep keep
|
<mask> CacheMaxTTL: &cacheMaxTTL,
<mask> UpstreamMode: &upstreamMode,
<mask> ResolveClients: &resolveClients,
<mask> LocalPTRUpstreams: &localPTRUpstreams,
<mask> }
<mask> }
<mask>
<mask> func (s *Server) handleGetConfig(w http.ResponseWriter, r *http.Request) {
<mask> resp := s.getDNSConfig()
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.RUnlock()
</s> add }
func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
j := s.accessListJSON() </s> remove func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
s.RLock()
j := accessListJSON{
AllowedClients: s.conf.AllowedClients,
DisallowedClients: s.conf.DisallowedClients,
BlockedHosts: s.conf.BlockedHosts,
</s> add func (s *Server) accessListJSON() (j accessListJSON) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
return accessListJSON{
AllowedClients: aghstrings.CloneSlice(s.conf.AllowedClients),
DisallowedClients: aghstrings.CloneSlice(s.conf.DisallowedClients),
BlockedHosts: aghstrings.CloneSlice(s.conf.BlockedHosts), </s> remove // ServeHTTP is a HTTP handler method we use to provide DNS-over-HTTPS
</s> add // ServeHTTP is a HTTP handler method we use to provide DNS-over-HTTPS. </s> remove s.RLock()
p := s.dnsProxy
s.RUnlock()
if p != nil { // an attempt to protect against race in case we're here after Close() was called
</s> add var p *proxy.Proxy
func() {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
p = s.dnsProxy
}()
if p != nil { </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
err = s.localResolvers.Resolve(ctx)
} else {
err = s.internalProxy.Resolve(ctx)
}
</s> add err = resolver.Resolve(ctx) </s> remove
s.Unlock()
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/http.go
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> return restart
<mask> }
<mask>
<mask> func (s *Server) setConfig(dc dnsConfig) (restart bool) {
<mask> s.Lock()
<mask> defer s.Unlock()
<mask>
<mask> if dc.ProtectionEnabled != nil {
<mask> s.conf.ProtectionEnabled = *dc.ProtectionEnabled
<mask> }
<mask>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> add // ResolvesPrivatePTR implements the RDNSExchanger interface for *Server.
func (s *Server) ResolvesPrivatePTR() (ok bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
return s.conf.UsePrivateRDNS
}
</s> remove
s.Unlock()
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/http.go
|
keep keep keep add keep keep keep keep
|
<mask> if dc.ResolveClients != nil {
<mask> s.conf.ResolveClients = *dc.ResolveClients
<mask> }
<mask>
<mask> return s.setConfigRestartable(dc)
<mask> }
<mask>
<mask> // upstreamJSON is a request body for handleTestUpstreamDNS endpoint.
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove // If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address.
// If this is a match, we set a new response in d.Res and return.
</s> add // checkHostRules checks the host against filters. It is safe for concurrent
// use.
func (s *Server) checkHostRules(host string, qtype uint16, setts *filtering.Settings) (
r *filtering.Result,
err error,
) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
if s.dnsFilter == nil {
return nil, nil
}
var res filtering.Result
res, err = s.dnsFilter.CheckHostRules(host, qtype, setts)
if err != nil {
return nil, err
}
return &res, err
}
// If response contains CNAME, A or AAAA records, we apply filtering to each
// canonical host name or IP address. If this is a match, we set a new response
// in d.Res and return. </s> remove aghtest.Exchanger
</s> add ex aghtest.Exchanger
usePrivate bool </s> remove if ctx.protectionEnabled {
if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
ctx.result, err = s.filterDNSRequest(ctx)
</s> add if !ctx.protectionEnabled {
return resultCodeSuccess </s> remove s.RLock()
p := s.dnsProxy
s.RUnlock()
if p != nil { // an attempt to protect against race in case we're here after Close() was called
</s> add var p *proxy.Proxy
func() {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
p = s.dnsProxy
}()
if p != nil { </s> remove // ServeHTTP is a HTTP handler method we use to provide DNS-over-HTTPS
</s> add // ServeHTTP is a HTTP handler method we use to provide DNS-over-HTTPS. </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/http.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.conf.RefuseAny {
<mask> shouldLog = false
<mask> }
<mask>
<mask> s.RLock()
<mask> // Synchronize access to s.queryLog and s.stats so they won't be suddenly uninitialized while in use.
<mask> // This can happen after proxy server has been stopped, but its workers haven't yet exited.
<mask> if shouldLog && s.queryLog != nil {
<mask> p := querylog.AddParams{
<mask> Question: msg,
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.RLock()
// Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
// This could happen after proxy server has been stopped, but its workers are not yet exited.
//
// A better approach is for proxy.Stop() to wait until all its workers exit,
// but this would require the Upstream interface to have Close() function
// (to prevent from hanging while waiting for unresponsive DNS server to respond).
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove s.RLock()
// Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
// This could happen after proxy server has been stopped, but its workers are not yet exited.
if !s.conf.ProtectionEnabled || s.dnsFilter == nil {
s.RUnlock()
continue
}
res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, ctx.setts)
s.RUnlock()
</s> add res, err := s.checkHostRules(host, d.Req.Question[0].Qtype, ctx.setts) </s> remove var err error
</s> add </s> remove if ctx.protectionEnabled {
if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
ctx.result, err = s.filterDNSRequest(ctx)
</s> add if !ctx.protectionEnabled {
return resultCodeSuccess </s> remove // Close - close object
</s> add // Close gracefully closes the server. It is safe for concurrent use.
//
// TODO(e.burkov): A better approach would be making Stop method waiting for all
// its workers finished. But it would require the upstream.Upstream to have the
// Close method to prevent from hanging while waiting for unresponsive server to
// respond. </s> remove s.RLock()
p := s.dnsProxy
s.RUnlock()
if p != nil { // an attempt to protect against race in case we're here after Close() was called
</s> add var p *proxy.Proxy
func() {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
p = s.dnsProxy
}()
if p != nil {
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/stats.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> s.queryLog.Add(p)
<mask> }
<mask>
<mask> s.updateStats(ctx, elapsed, *ctx.result)
<mask> s.RUnlock()
<mask>
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res filtering.Result) {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients bool) {
s.RLock()
defer s.RUnlock()
</s> add func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients, resolvePTR bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
s.RLock()
j := accessListJSON{
AllowedClients: s.conf.AllowedClients,
DisallowedClients: s.conf.DisallowedClients,
BlockedHosts: s.conf.BlockedHosts,
</s> add func (s *Server) accessListJSON() (j accessListJSON) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
return accessListJSON{
AllowedClients: aghstrings.CloneSlice(s.conf.AllowedClients),
DisallowedClients: aghstrings.CloneSlice(s.conf.DisallowedClients),
BlockedHosts: aghstrings.CloneSlice(s.conf.BlockedHosts), </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove // IsRunning returns true if the DNS server is running
</s> add // IsRunning returns true if the DNS server is running.
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/stats.go
|
keep add keep keep keep keep keep
|
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> },
<mask> "fastest_addr": {
<mask> "upstream_dns": [
<mask> "8.8.8.8:53",
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleGetConfig.json
|
keep add keep keep keep keep keep keep
|
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> },
<mask> "parallel": {
<mask> "upstream_dns": [
<mask> "8.8.8.8:53",
<mask> "8.8.4.4:53"
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleGetConfig.json
|
keep add keep keep keep
|
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> }
<mask> } </s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleGetConfig.json
|
keep add keep keep keep keep
|
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> }
<mask> },
<mask> "bootstraps": {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
|
keep keep add keep keep keep keep
|
<mask> "cache_ttl_min": 0,
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> }
<mask> },
<mask> "blocking_mode_good": {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
|
keep keep add keep keep keep keep keep
|
<mask> "cache_ttl_min": 0,
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> }
<mask> },
<mask> "blocking_mode_bad": {
<mask> "req": {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
|
keep keep keep add keep keep keep keep keep keep
|
<mask> "cache_size": 0,
<mask> "cache_ttl_min": 0,
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> }
<mask> },
<mask> "ratelimit": {
<mask> "req": {
<mask> "ratelimit": 6
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
|
keep keep keep add keep keep keep keep keep keep
|
<mask> "cache_size": 0,
<mask> "cache_ttl_min": 0,
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> }
<mask> },
<mask> "edns_cs_enabled": {
<mask> "req": {
<mask> "edns_cs_enabled": true
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
|
keep keep keep add keep keep keep keep
|
<mask> "cache_size": 0,
<mask> "cache_ttl_min": 0,
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> }
<mask> },
<mask> "dnssec_enabled": {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
|
keep add keep keep keep keep keep keep
|
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> }
<mask> },
<mask> "cache_size": {
<mask> "req": {
<mask> "cache_size": 1024
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
|
keep add keep keep keep keep
|
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> }
<mask> },
<mask> "upstream_mode_parallel": {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
|
keep keep keep add keep keep keep keep
|
<mask> "cache_size": 0,
<mask> "cache_ttl_min": 0,
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> }
<mask> },
<mask> "upstream_mode_fastest_addr": {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
|
keep add keep keep keep keep keep
|
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> }
<mask> },
<mask> "upstream_dns_bad": {
<mask> "req": {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
|
keep keep add keep keep keep keep keep keep
|
<mask> "cache_ttl_min": 0,
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> }
<mask> },
<mask> "bootstraps_bad": {
<mask> "req": {
<mask> "bootstrap_dns": [
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
|
keep add keep keep keep keep keep keep
|
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> }
<mask> },
<mask> "cache_bad_ttl": {
<mask> "req": {
<mask> "cache_ttl_min": 1024,
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
|
keep add keep keep keep keep keep
|
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> }
<mask> },
<mask> "upstream_mode_bad": {
<mask> "req": {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
|
keep keep keep add keep keep keep keep keep
|
<mask> "cache_size": 0,
<mask> "cache_ttl_min": 0,
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> }
<mask> },
<mask> "local_ptr_upstreams_good": {
<mask> "req": {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
|
keep add keep keep keep keep keep
|
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": [
<mask> "123.123.123.123"
<mask> ]
<mask> }
<mask> },
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
|
keep keep add keep keep keep keep
|
<mask> "cache_ttl_min": 0,
<mask> "cache_ttl_max": 0,
<mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> }
<mask> }
<mask> }
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false, </s> add "use_private_ptr_resolvers": false,
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
|
keep keep add keep keep keep keep
|
<mask> type clientSource uint
<mask>
<mask> // Client sources. The order determines the priority.
<mask> const (
<mask> ClientSourceWHOIS clientSource = iota
<mask> ClientSourceRDNS
<mask> ClientSourceDHCP
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add // ResolvesPrivatePTR returns true if the RDNSExchanger is able to
// resolve PTR requests for locally-served addresses.
ResolvesPrivatePTR() (ok bool) </s> add use_private_ptr_resolvers, </s> add // usePrivate is used to store the state of current private RDNS
// resolving settings and to react to it's changes.
usePrivate uint32
</s> add use_private_ptr_resolvers, </s> add "sync/atomic" </s> add // UsePrivateRDNS defines if the PTR requests for unknown addresses from
// locally-served networks should be resolved via private PTR resolvers.
UsePrivateRDNS bool `yaml:"use_private_ptr_resolvers"`
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/home/clients.go
|
keep keep add keep keep keep keep keep keep
|
<mask> // ResolveClients enables and disables resolving clients with RDNS.
<mask> ResolveClients bool `yaml:"resolve_clients"`
<mask>
<mask> // LocalPTRResolvers is the slice of addresses to be used as upstreams
<mask> // for PTR queries for locally-served networks.
<mask> LocalPTRResolvers []string `yaml:"local_ptr_upstreams"`
<mask> }
<mask>
<mask> type tlsConfigSettings struct {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add // UsePrivateRDNS defines if the PTR requests for unknown addresses from
// locally-served networks should be resolved via private PTR resolvers.
UsePrivateRDNS bool
</s> add "use_private_ptr_resolvers_title": "Use private rDNS resolvers",
"use_private_ptr_resolvers_desc": "Perform reverse DNS lookups for locally-served addresses using these upstream servers. If disabled, AdGuard Home responds with NXDOMAIN to all such PTR requests except for clients known from DHCP, /etc/hosts, and so on.", </s> add // usePrivate is used to store the state of current private RDNS
// resolving settings and to react to it's changes.
usePrivate uint32
</s> remove "local_ptr_title": "Private DNS servers",
</s> add "local_ptr_title": "Private reverse DNS servers", </s> add // ResolvesPrivatePTR returns true if the RDNSExchanger is able to
// resolve PTR requests for locally-served addresses.
ResolvesPrivatePTR() (ok bool) </s> remove aghtest.Exchanger
</s> add ex aghtest.Exchanger
usePrivate bool
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/home/config.go
|
keep keep add keep keep keep keep
|
<mask> FiltersUpdateIntervalHours: 24,
<mask> LocalDomainName: "lan",
<mask> ResolveClients: true,
<mask> },
<mask> TLS: tlsConfigSettings{
<mask> PortHTTPS: 443,
<mask> PortDNSOverTLS: 853, // needs to be passed through to dnsproxy
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add // usePrivate is used to store the state of current private RDNS
// resolving settings and to react to it's changes.
usePrivate uint32
</s> remove dns := NewCustomServer(&proxy.Proxy{
</s> add srv := NewCustomServer(&proxy.Proxy{ </s> remove // Close - close object
</s> add // Close gracefully closes the server. It is safe for concurrent use.
//
// TODO(e.burkov): A better approach would be making Stop method waiting for all
// its workers finished. But it would require the upstream.Upstream to have the
// Close method to prevent from hanging while waiting for unresponsive server to
// respond. </s> remove s.RLock()
// Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
// This could happen after proxy server has been stopped, but its workers are not yet exited.
//
// A better approach is for proxy.Stop() to wait until all its workers exit,
// but this would require the Upstream interface to have Close() function
// (to prevent from hanging while waiting for unresponsive DNS server to respond).
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> add // UsePrivateRDNS defines if the PTR requests for unknown addresses from
// locally-served networks should be resolved via private PTR resolvers.
UsePrivateRDNS bool
</s> add // UsePrivateRDNS defines if the PTR requests for unknown addresses from
// locally-served networks should be resolved via private PTR resolvers.
UsePrivateRDNS bool `yaml:"use_private_ptr_resolvers"`
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/home/config.go
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask>
<mask> if s := Context.dnsServer; s != nil {
<mask> c := dnsforward.FilteringConfig{}
<mask> s.WriteDiskConfig(&c)
<mask> config.DNS.FilteringConfig = c
<mask>
<mask> config.DNS.LocalPTRResolvers, config.DNS.ResolveClients = s.RDNSSettings()
<mask> }
<mask>
<mask> if Context.dhcpServer != nil {
<mask> c := dhcpd.ServerConfig{}
<mask> Context.dhcpServer.WriteDiskConfig(&c)
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add s.conf.UsePrivateRDNS = true </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err </s> remove err := s.ipset.Close()
if err != nil {
</s> add if err := s.ipset.Close(); err != nil { </s> remove return resultCodeError
</s> add return resultCodeError
} </s> remove resp, err := e.Exchanger.Exchange(req)
</s> add resp, err := e.ex.Exchange(req) </s> add } else if res == nil {
continue
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/home/config.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> closeDNSServer()
<mask> return fmt.Errorf("dnsServer.Prepare: %w", err)
<mask> }
<mask>
<mask> Context.rdns = NewRDNS(Context.dnsServer, &Context.clients)
<mask> Context.whois = initWhois(&Context.clients)
<mask>
<mask> Context.filters.Init()
<mask> return nil
<mask> }
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove err := s.ipset.Close()
if err != nil {
</s> add if err := s.ipset.Close(); err != nil { </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove return &res, nil
</s> add return res, nil </s> add s.conf.UsePrivateRDNS = true </s> remove return resultCodeError
</s> add return resultCodeError
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/home/dns.go
|
keep keep add keep keep keep keep keep
|
<mask> newConf.GetCustomUpstreamByClient = Context.clients.FindUpstreams
<mask>
<mask> newConf.ResolveClients = dnsConf.ResolveClients
<mask> newConf.LocalPTRResolvers = dnsConf.LocalPTRResolvers
<mask>
<mask> return newConf, nil
<mask> }
<mask>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add s.conf.UsePrivateRDNS = true </s> remove Context.rdns = NewRDNS(Context.dnsServer, &Context.clients)
</s> add Context.rdns = NewRDNS(Context.dnsServer, &Context.clients, config.DNS.UsePrivateRDNS) </s> remove s.RUnlock()
</s> add </s> remove return resultCodeError
</s> add return resultCodeError
} </s> add if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
var err error
ctx.result, err = s.filterDNSRequest(ctx) </s> remove return &res, nil
</s> add return res, nil
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/home/dns.go
|
keep keep add keep keep keep keep keep
|
<mask> import (
<mask> "encoding/binary"
<mask> "net"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/golibs/cache"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> add "github.com/stretchr/testify/require" </s> add //
// TODO(e.burkov): Is ARP a higher priority source than DHCP? </s> add // ResolvesPrivatePTR returns true if the RDNSExchanger is able to
// resolve PTR requests for locally-served addresses.
ResolvesPrivatePTR() (ok bool) </s> remove // If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address.
// If this is a match, we set a new response in d.Res and return.
</s> add // checkHostRules checks the host against filters. It is safe for concurrent
// use.
func (s *Server) checkHostRules(host string, qtype uint16, setts *filtering.Settings) (
r *filtering.Result,
err error,
) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
if s.dnsFilter == nil {
return nil, nil
}
var res filtering.Result
res, err = s.dnsFilter.CheckHostRules(host, qtype, setts)
if err != nil {
return nil, err
}
return &res, err
}
// If response contains CNAME, A or AAAA records, we apply filtering to each
// canonical host name or IP address. If this is a match, we set a new response
// in d.Res and return. </s> add 'use_private_ptr_resolvers':
'type': 'boolean' </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
err = s.localResolvers.Resolve(ctx)
} else {
err = s.internalProxy.Resolve(ctx)
}
</s> add err = resolver.Resolve(ctx)
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/home/rdns.go
|
keep add keep keep keep keep
|
<mask> clients *clientsContainer
<mask>
<mask> // ipCh used to pass client's IP to rDNS workerLoop.
<mask> ipCh chan net.IP
<mask>
<mask> // ipCache caches the IP addresses to be resolved by rDNS. The resolved
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove "local_ptr_title": "Private DNS servers",
</s> add "local_ptr_title": "Private reverse DNS servers", </s> add // UsePrivateRDNS defines if the PTR requests for unknown addresses from
// locally-served networks should be resolved via private PTR resolvers.
UsePrivateRDNS bool `yaml:"use_private_ptr_resolvers"`
</s> add "use_private_ptr_resolvers_title": "Use private rDNS resolvers",
"use_private_ptr_resolvers_desc": "Perform reverse DNS lookups for locally-served addresses using these upstream servers. If disabled, AdGuard Home responds with NXDOMAIN to all such PTR requests except for clients known from DHCP, /etc/hosts, and so on.", </s> add // UsePrivateRDNS defines if the PTR requests for unknown addresses from
// locally-served networks should be resolved via private PTR resolvers.
UsePrivateRDNS bool
</s> remove func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients bool) {
s.RLock()
defer s.RUnlock()
</s> add func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients, resolvePTR bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove return aghstrings.CloneSlice(s.conf.LocalPTRResolvers), s.conf.ResolveClients
</s> add return aghstrings.CloneSlice(s.conf.LocalPTRResolvers),
s.conf.ResolveClients,
s.conf.UsePrivateRDNS
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/home/rdns.go
|
keep keep keep add keep keep keep keep keep
|
<mask> // NewRDNS creates and returns initialized RDNS.
<mask> func NewRDNS(
<mask> exchanger dnsforward.RDNSExchanger,
<mask> clients *clientsContainer,
<mask> ) (rDNS *RDNS) {
<mask> rDNS = &RDNS{
<mask> exchanger: exchanger,
<mask> clients: clients,
<mask> ipCache: cache.New(cache.Config{
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove ipCache: ipCache,
</s> add ipCache: ipCache,
exchanger: &rDNSExchanger{}, </s> remove Exchanger: aghtest.Exchanger{
</s> add ex: aghtest.Exchanger{ </s> remove // Begin adds the ip to the resolving queue if it is not cached or already
// resolved.
func (r *RDNS) Begin(ip net.IP) {
</s> add // ensurePrivateCache ensures that the state of the RDNS cache is consistent
// with the current private client RDNS resolving settings.
//
// TODO(e.burkov): Clearing cache each time this value changed is not a perfect
// approach since only unresolved locally-served addresses should be removed.
// Implement when improving the cache.
func (r *RDNS) ensurePrivateCache() {
var usePrivate uint32
if r.exchanger.ResolvesPrivatePTR() {
usePrivate = 1
}
if atomic.CompareAndSwapUint32(&r.usePrivate, 1-usePrivate, usePrivate) {
r.ipCache.Clear()
}
}
// isCached returns true if ip is already cached and not expired yet. It also
// caches it otherwise.
func (r *RDNS) isCached(ip net.IP) (ok bool) { </s> add // UsePrivateRDNS defines if the PTR requests for unknown addresses from
// locally-served networks should be resolved via private PTR resolvers.
UsePrivateRDNS bool `yaml:"use_private_ptr_resolvers"`
</s> add // usePrivate is used to store the state of current private RDNS
// resolving settings and to react to it's changes.
usePrivate uint32
</s> add "github.com/stretchr/testify/require"
|
https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d
|
internal/home/rdns.go
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.