docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep keep add keep keep keep keep keep keep
|
<mask> }
<mask> }
<mask>
<mask> // command-line arguments
<mask> type options struct {
<mask> verbose bool // is verbose logging enabled
<mask> configFilename string // path to the config file
<mask> workDir string // path to the working directory where we will store the filters data and the querylog
<mask> bindHost string // host address to bind HTTP server on
</s> + app: add '--pidfile FILE' command-line parameter </s> add pidFile string // File name to save PID to </s> add // Write PID to a file
func writePIDFile(fn string) bool {
data := fmt.Sprintf("%d", os.Getpid())
err := ioutil.WriteFile(fn, []byte(data), 0644)
if err != nil {
log.Error("Couldn't write PID to file %s: %v", fn, err)
return false
}
return true
}
</s> add var pidFileName string // PID file name. Empty if no PID file was created. </s> add cleanupAlways() </s> remove os.Exit(1)
</s> add </s> remove os.Exit(1)
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/7746a3e6a9f204e7b7ab498c2f484cf426fb1a18
|
app.go
|
keep keep keep add keep keep keep keep keep
|
<mask> workDir string // path to the working directory where we will store the filters data and the querylog
<mask> bindHost string // host address to bind HTTP server on
<mask> bindPort int // port to serve HTTP pages on
<mask> logFile string // Path to the log file. If empty, write to stdout. If "syslog", writes to syslog
<mask>
<mask> // service control action (see service.ControlAction array + "status" command)
<mask> serviceControlAction string
<mask>
<mask> // runningAsService flag is set to true when options are passed from the service runner
</s> + app: add '--pidfile FILE' command-line parameter </s> add // This function is called before application exits
func cleanupAlways() {
if len(pidFileName) != 0 {
os.Remove(pidFileName)
}
}
</s> add var pidFileName string // PID file name. Empty if no PID file was created. </s> add // Write PID to a file
func writePIDFile(fn string) bool {
data := fmt.Sprintf("%d", os.Getpid())
err := ioutil.WriteFile(fn, []byte(data), 0644)
if err != nil {
log.Error("Couldn't write PID to file %s: %v", fn, err)
return false
}
return true
}
</s> add {"pidfile", "", "File name to save PID to", func(value string) { o.pidFile = value }, nil}, </s> add cleanupAlways() </s> remove os.Exit(1)
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/7746a3e6a9f204e7b7ab498c2f484cf426fb1a18
|
app.go
|
keep keep keep add keep keep keep keep keep keep
|
<mask> }, nil},
<mask> {"logfile", "l", "path to the log file. If empty, writes to stdout, if 'syslog' -- system log", func(value string) {
<mask> o.logFile = value
<mask> }, nil},
<mask> {"verbose", "v", "enable verbose output", nil, func() { o.verbose = true }},
<mask> {"help", "", "print this help", nil, func() {
<mask> printHelp()
<mask> os.Exit(64)
<mask> }},
<mask> }
</s> + app: add '--pidfile FILE' command-line parameter </s> add if len(args.pidFile) != 0 && writePIDFile(args.pidFile) {
pidFileName = args.pidFile
}
</s> add pidFile string // File name to save PID to </s> add // Write PID to a file
func writePIDFile(fn string) bool {
data := fmt.Sprintf("%d", os.Getpid())
err := ioutil.WriteFile(fn, []byte(data), 0644)
if err != nil {
log.Error("Couldn't write PID to file %s: %v", fn, err)
return false
}
return true
}
</s> add // This function is called before application exits
func cleanupAlways() {
if len(pidFileName) != 0 {
os.Remove(pidFileName)
}
}
</s> remove os.Exit(1)
</s> add </s> add cleanupAlways()
|
https://github.com/AdguardTeam/AdGuardHome/commit/7746a3e6a9f204e7b7ab498c2f484cf426fb1a18
|
app.go
|
keep keep keep add keep keep keep keep
|
<mask> // Stop stops the program
<mask> func (p *program) Stop(s service.Service) error {
<mask> // Stop should not block. Return with a few seconds.
<mask> cleanup()
<mask> os.Exit(0)
<mask> return nil
<mask> }
<mask>
</s> + app: add '--pidfile FILE' command-line parameter </s> add // Write PID to a file
func writePIDFile(fn string) bool {
data := fmt.Sprintf("%d", os.Getpid())
err := ioutil.WriteFile(fn, []byte(data), 0644)
if err != nil {
log.Error("Couldn't write PID to file %s: %v", fn, err)
return false
}
return true
}
</s> add cleanupAlways() </s> add // This function is called before application exits
func cleanupAlways() {
if len(pidFileName) != 0 {
os.Remove(pidFileName)
}
}
</s> remove os.Exit(1)
</s> add </s> add cleanupAlways() </s> add var pidFileName string // PID file name. Empty if no PID file was created.
|
https://github.com/AdguardTeam/AdGuardHome/commit/7746a3e6a9f204e7b7ab498c2f484cf426fb1a18
|
service.go
|
keep keep keep add keep keep keep keep keep keep
|
<mask>
<mask> // WriteDiskConfig - write configuration
<mask> func (clients *clientsContainer) WriteDiskConfig(objects *[]clientObject) {
<mask> clients.lock.Lock()
<mask> for _, cli := range clients.list {
<mask> cy := clientObject{
<mask> Name: cli.Name,
<mask> UseGlobalSettings: !cli.UseOwnSettings,
<mask> FilteringEnabled: cli.FilteringEnabled,
<mask> ParentalEnabled: cli.ParentalEnabled,
</s> Prevent spurious diffs in config file by sorting Client objects before writing </s> remove clients.lock.Unlock()
</s> add // Maps aren't guaranteed to iterate in the same order each time, so the
// above loop can generate different orderings when writing to the
// config file: this produces lots of diffs in config files, so sort
// objects by name before writing.
sort.Slice(clientObjects, func(i, j int) bool {
return clientObjects[i].Name < clientObjects[j].Name
})
*objects = append(*objects, clientObjects...) </s> remove *objects = append(*objects, cy)
</s> add clientObjects = append(clientObjects, cy)
|
https://github.com/AdguardTeam/AdGuardHome/commit/774937728b13aba0a1c7e7b8acaea9edb362926a
|
internal/home/clients.go
|
keep keep replace keep replace keep
|
<mask> cy.Upstreams = stringutil.CloneSlice(cli.Upstreams)
<mask>
<mask> *objects = append(*objects, cy)
<mask> }
<mask> clients.lock.Unlock()
<mask> }
</s> Prevent spurious diffs in config file by sorting Client objects before writing </s> add defer clients.lock.Unlock()
clientObjects := []clientObject{}
|
https://github.com/AdguardTeam/AdGuardHome/commit/774937728b13aba0a1c7e7b8acaea9edb362926a
|
internal/home/clients.go
|
keep keep keep keep replace replace replace replace replace keep keep keep keep keep
|
<mask> // Duration: "1h1m", time.Duration: "1h1m0s"
<mask> //
<mask> func (d Duration) String() (str string) {
<mask> str = d.Duration.String()
<mask> secs := d.Seconds()
<mask> var secsInt int
<mask> if secsInt = int(secs); float64(secsInt) != secs || secsInt%60 != 0 {
<mask> return str
<mask> }
<mask>
<mask> const (
<mask> tailMin = len(`0s`)
<mask> tailMinSec = len(`0m0s`)
<mask> )
</s> Pull request: Fix duration
Merge in DNS/adguard-home from fix-duration to master
Squashed commit of the following:
commit b6d960076e6263718ec612bc7a998c48fb92079f
Author: Eugene Burkov <[email protected]>
Date: Fri Aug 27 15:24:37 2021 +0300
home: imp docs & fmt
commit b3d1e5dbbb9c9abe92b10a51cc1f8d7afee73e12
Author: Eugene Burkov <[email protected]>
Date: Fri Aug 27 15:16:20 2021 +0300
home: fix duration </s> remove return str[:len(str)-tailMinSec]
</s> add default:
return str[:len(str)-tailMinSec]
} </s> remove if (secsInt%3600)/60 != 0 {
</s> add switch rounded := d.Duration / time.Second; {
case
rounded == 0,
rounded*time.Second != d.Duration,
rounded%60 != 0:
// Return the uncutted value if it's either equal to zero or has
// fractions of a second or even whole seconds in it.
return str
case (rounded%secsInHour)/minsInHour != 0: </s> remove }
</s> add </s> add }, {
name: "0s",
val: 0, </s> add secsInHour = time.Hour / time.Second
minsInHour = time.Hour / time.Minute
|
https://github.com/AdguardTeam/AdGuardHome/commit/77821ec8168f73cb68684b9ec06b9613889dfb65
|
internal/home/duration.go
|
keep add keep keep keep keep keep
|
<mask> tailMin = len(`0s`)
<mask> tailMinSec = len(`0m0s`)
<mask> )
<mask>
<mask> switch rounded := d.Duration / time.Second; {
<mask> case
<mask> rounded == 0,
</s> Pull request: Fix duration
Merge in DNS/adguard-home from fix-duration to master
Squashed commit of the following:
commit b6d960076e6263718ec612bc7a998c48fb92079f
Author: Eugene Burkov <[email protected]>
Date: Fri Aug 27 15:24:37 2021 +0300
home: imp docs & fmt
commit b3d1e5dbbb9c9abe92b10a51cc1f8d7afee73e12
Author: Eugene Burkov <[email protected]>
Date: Fri Aug 27 15:16:20 2021 +0300
home: fix duration </s> remove if (secsInt%3600)/60 != 0 {
</s> add switch rounded := d.Duration / time.Second; {
case
rounded == 0,
rounded*time.Second != d.Duration,
rounded%60 != 0:
// Return the uncutted value if it's either equal to zero or has
// fractions of a second or even whole seconds in it.
return str
case (rounded%secsInHour)/minsInHour != 0: </s> remove secs := d.Seconds()
var secsInt int
if secsInt = int(secs); float64(secsInt) != secs || secsInt%60 != 0 {
return str
}
</s> add </s> add }, {
name: "0s",
val: 0, </s> remove }
</s> add </s> remove return str[:len(str)-tailMinSec]
</s> add default:
return str[:len(str)-tailMinSec]
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/77821ec8168f73cb68684b9ec06b9613889dfb65
|
internal/home/duration.go
|
keep keep replace keep replace keep keep keep
|
<mask> )
<mask>
<mask> if (secsInt%3600)/60 != 0 {
<mask> return str[:len(str)-tailMin]
<mask> }
<mask>
<mask> return str[:len(str)-tailMinSec]
<mask> }
</s> Pull request: Fix duration
Merge in DNS/adguard-home from fix-duration to master
Squashed commit of the following:
commit b6d960076e6263718ec612bc7a998c48fb92079f
Author: Eugene Burkov <[email protected]>
Date: Fri Aug 27 15:24:37 2021 +0300
home: imp docs & fmt
commit b3d1e5dbbb9c9abe92b10a51cc1f8d7afee73e12
Author: Eugene Burkov <[email protected]>
Date: Fri Aug 27 15:16:20 2021 +0300
home: fix duration </s> remove return str[:len(str)-tailMinSec]
</s> add default:
return str[:len(str)-tailMinSec]
} </s> remove secs := d.Seconds()
var secsInt int
if secsInt = int(secs); float64(secsInt) != secs || secsInt%60 != 0 {
return str
}
</s> add </s> add secsInHour = time.Hour / time.Second
minsInHour = time.Hour / time.Minute </s> add }, {
name: "0s",
val: 0,
|
https://github.com/AdguardTeam/AdGuardHome/commit/77821ec8168f73cb68684b9ec06b9613889dfb65
|
internal/home/duration.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> if (secsInt%3600)/60 != 0 {
<mask> return str[:len(str)-tailMin]
<mask> }
<mask>
<mask> return str[:len(str)-tailMinSec]
<mask> }
<mask>
<mask> // MarshalText implements the encoding.TextMarshaler interface for Duration.
<mask> func (d Duration) MarshalText() (text []byte, err error) {
<mask> return []byte(d.String()), nil
</s> Pull request: Fix duration
Merge in DNS/adguard-home from fix-duration to master
Squashed commit of the following:
commit b6d960076e6263718ec612bc7a998c48fb92079f
Author: Eugene Burkov <[email protected]>
Date: Fri Aug 27 15:24:37 2021 +0300
home: imp docs & fmt
commit b3d1e5dbbb9c9abe92b10a51cc1f8d7afee73e12
Author: Eugene Burkov <[email protected]>
Date: Fri Aug 27 15:16:20 2021 +0300
home: fix duration </s> remove }
</s> add </s> remove secs := d.Seconds()
var secsInt int
if secsInt = int(secs); float64(secsInt) != secs || secsInt%60 != 0 {
return str
}
</s> add </s> remove if (secsInt%3600)/60 != 0 {
</s> add switch rounded := d.Duration / time.Second; {
case
rounded == 0,
rounded*time.Second != d.Duration,
rounded%60 != 0:
// Return the uncutted value if it's either equal to zero or has
// fractions of a second or even whole seconds in it.
return str
case (rounded%secsInHour)/minsInHour != 0: </s> add }, {
name: "0s",
val: 0, </s> add secsInHour = time.Hour / time.Second
minsInHour = time.Hour / time.Minute
|
https://github.com/AdguardTeam/AdGuardHome/commit/77821ec8168f73cb68684b9ec06b9613889dfb65
|
internal/home/duration.go
|
keep keep add keep keep keep keep
|
<mask> }, {
<mask> name: "1m1.001s",
<mask> val: time.Minute + time.Second + time.Millisecond,
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
</s> Pull request: Fix duration
Merge in DNS/adguard-home from fix-duration to master
Squashed commit of the following:
commit b6d960076e6263718ec612bc7a998c48fb92079f
Author: Eugene Burkov <[email protected]>
Date: Fri Aug 27 15:24:37 2021 +0300
home: imp docs & fmt
commit b3d1e5dbbb9c9abe92b10a51cc1f8d7afee73e12
Author: Eugene Burkov <[email protected]>
Date: Fri Aug 27 15:16:20 2021 +0300
home: fix duration </s> add secsInHour = time.Hour / time.Second
minsInHour = time.Hour / time.Minute </s> remove secs := d.Seconds()
var secsInt int
if secsInt = int(secs); float64(secsInt) != secs || secsInt%60 != 0 {
return str
}
</s> add </s> remove return str[:len(str)-tailMinSec]
</s> add default:
return str[:len(str)-tailMinSec]
} </s> remove if (secsInt%3600)/60 != 0 {
</s> add switch rounded := d.Duration / time.Second; {
case
rounded == 0,
rounded*time.Second != d.Duration,
rounded%60 != 0:
// Return the uncutted value if it's either equal to zero or has
// fractions of a second or even whole seconds in it.
return str
case (rounded%secsInHour)/minsInHour != 0: </s> remove }
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/77821ec8168f73cb68684b9ec06b9613889dfb65
|
internal/home/duration_test.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> go 1.17
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.41.4
<mask> github.com/AdguardTeam/golibs v0.10.6
<mask> github.com/AdguardTeam/urlfilter v0.15.2
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.3
<mask> github.com/digineo/go-ipset/v2 v2.2.1
<mask> github.com/fsnotify/fsnotify v1.5.1
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove github.com/AdguardTeam/golibs v0.10.6 h1:6UG6LxWFnG7TfjNzeApw+T68Kqqov0fcDYk9RjhTdhc=
</s> add </s> add github.com/AdguardTeam/golibs v0.10.8 h1:diU9gP9qG1qeLbAkzIwfUerpHSqzR6zaBgzvRMR/m6Q=
github.com/AdguardTeam/golibs v0.10.8/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw= </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
</s> add </s> add want: assert.False, </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
</s> add var err error
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
go.mod
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> github.com/AdguardTeam/dnsproxy v0.41.4/go.mod h1:GCdEbTw683vBqksJIccPSYzBg2yIFbRiDnXltyIinug=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
<mask> github.com/AdguardTeam/golibs v0.10.6 h1:6UG6LxWFnG7TfjNzeApw+T68Kqqov0fcDYk9RjhTdhc=
<mask> github.com/AdguardTeam/golibs v0.10.6/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
<mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
<mask> github.com/AdguardTeam/urlfilter v0.15.2 h1:LZGgrm4l4Ys9eAqB+UUmZfiC6vHlDlYFhx0WXqo6LtQ=
<mask> github.com/AdguardTeam/urlfilter v0.15.2/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI=
<mask> github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> add github.com/AdguardTeam/golibs v0.10.8 h1:diU9gP9qG1qeLbAkzIwfUerpHSqzR6zaBgzvRMR/m6Q=
github.com/AdguardTeam/golibs v0.10.8/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw= </s> remove github.com/AdguardTeam/golibs v0.10.6
</s> add github.com/AdguardTeam/golibs v0.10.8 </s> remove want: true,
</s> add </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
</s> add var err error </s> add "github.com/AdguardTeam/golibs/netutil" </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if s.privateNets.Contains(ip) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
go.sum
|
keep keep add keep keep keep keep keep
|
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
<mask> github.com/AdguardTeam/golibs v0.10.6/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
<mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
<mask> github.com/AdguardTeam/urlfilter v0.15.2 h1:LZGgrm4l4Ys9eAqB+UUmZfiC6vHlDlYFhx0WXqo6LtQ=
<mask> github.com/AdguardTeam/urlfilter v0.15.2/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI=
<mask> github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
<mask> github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw=
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove github.com/AdguardTeam/golibs v0.10.6 h1:6UG6LxWFnG7TfjNzeApw+T68Kqqov0fcDYk9RjhTdhc=
</s> add </s> remove github.com/AdguardTeam/golibs v0.10.6
</s> add github.com/AdguardTeam/golibs v0.10.8 </s> remove want: true,
</s> add </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
</s> add var err error </s> add "github.com/AdguardTeam/golibs/netutil" </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if s.privateNets.Contains(ip) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
go.sum
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> if ip, _ = netutil.IPAndPortFromAddr(dctx.proxyCtx.Addr); ip == nil {
<mask> return rc
<mask> }
<mask>
<mask> dctx.isLocalClient = s.subnetDetector.IsLocallyServedNetwork(ip)
<mask>
<mask> return rc
<mask> }
<mask>
<mask> // hostToIP tries to get an IP leased by DHCP and returns the copy of address
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove // LocalNetChecker is used to check if the IP address belongs to a local
// network.
type LocalNetChecker interface {
// IsLocallyServedNetwork returns true if ip is contained in any of address
// registries defined by RFC 6303.
IsLocallyServedNetwork(ip net.IP) (ok bool)
}
// type check
var _ LocalNetChecker = (*aghnet.SubnetDetector)(nil)
</s> add </s> add if ip == nil {
continue
}
</s> remove func (req *dnsConfig) validate(snd *aghnet.SubnetDetector) (err error) {
</s> add func (req *dnsConfig) validate(privateNets netutil.SubnetSet) (err error) { </s> remove if !s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if !s.privateNets.Contains(ip) { </s> remove // a locally-served network. lnc must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, lnc LocalNetChecker) (err error) {
</s> add // a locally-served network. privateNets must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, privateNets netutil.SubnetSet) (err error) { </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if s.privateNets.Contains(ip) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dns.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> // Restrict an access to local addresses for external clients. We also
<mask> // assume that all the DHCP leases we give are locally-served or at least
<mask> // don't need to be inaccessible externally.
<mask> if !s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> log.Debug("dns: addr %s is not from locally-served network", ip)
<mask>
<mask> return resultCodeSuccess
<mask> }
<mask>
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove // a locally-served network. lnc must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, lnc LocalNetChecker) (err error) {
</s> add // a locally-served network. privateNets must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, privateNets netutil.SubnetSet) (err error) { </s> add // PrivateNets is the set of IP networks for which the private reverse DNS
// resolver should be used.
PrivateNets []string `yaml:"private_networks"`
</s> remove // LocalNetChecker is used to check if the IP address belongs to a local
// network.
type LocalNetChecker interface {
// IsLocallyServedNetwork returns true if ip is contained in any of address
// registries defined by RFC 6303.
IsLocallyServedNetwork(ip net.IP) (ok bool)
}
// type check
var _ LocalNetChecker = (*aghnet.SubnetDetector)(nil)
</s> add </s> remove dctx.isLocalClient = s.subnetDetector.IsLocallyServedNetwork(ip)
</s> add dctx.isLocalClient = s.privateNets.Contains(ip) </s> remove if !lnc.IsLocallyServedNetwork(subnet.IP) {
</s> add if !privateNets.Contains(subnet.IP) { </s> add if ip == nil {
continue
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dns.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> s.serverLock.RLock()
<mask> defer s.serverLock.RUnlock()
<mask>
<mask> if !s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> if s.conf.UsePrivateRDNS {
<mask> s.recDetector.add(*d.Req)
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove if !s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if !s.privateNets.Contains(ip) { </s> remove if !Context.subnetDetector.IsSpecialNetwork(ip) {
</s> add if !netutil.IsSpecialPurpose(ip) { </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if s.privateNets.Contains(ip) { </s> remove func (req *dnsConfig) validate(snd *aghnet.SubnetDetector) (err error) {
</s> add func (req *dnsConfig) validate(privateNets netutil.SubnetSet) (err error) { </s> remove err = ValidateUpstreamsPrivate(*req.LocalPTRUpstreams, snd)
</s> add err = ValidateUpstreamsPrivate(*req.LocalPTRUpstreams, privateNets) </s> remove err = req.validate(s.subnetDetector)
</s> add err = req.validate(s.privateNets)
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dns.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import (
<mask> "net"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/miekg/dns"
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
</s> add </s> add "github.com/AdguardTeam/golibs/netutil" </s> add "github.com/AdguardTeam/golibs/netutil" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
</s> add </s> add "github.com/AdguardTeam/golibs/netutil" </s> remove github.com/AdguardTeam/golibs v0.10.6
</s> add github.com/AdguardTeam/golibs v0.10.8
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dns_test.go
|
keep add keep keep keep keep
|
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> add "github.com/AdguardTeam/golibs/netutil" </s> add "github.com/AdguardTeam/golibs/netutil" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
</s> add </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dns_test.go
|
keep keep replace replace keep replace keep keep keep
|
<mask>
<mask> func TestServer_ProcessDetermineLocal(t *testing.T) {
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> s := &Server{
<mask> subnetDetector: snd,
<mask> }
<mask>
<mask> testCases := []struct {
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add ss := netutil.SubnetSetFunc(netutil.IsLocallyServed) </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
var s *Server
s, err = NewServer(DNSCreateParams{
DNSFilter: filtering.New(&filtering.Config{}, nil),
DHCPServer: &testDHCP{},
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DNSFilter: filtering.New(&filtering.Config{}, nil),
DHCPServer: &testDHCP{},
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove var err error
srv.subnetDetector, err = aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add srv.privateNets = netutil.SubnetSetFunc(netutil.IsLocallyServed) </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
var s *Server
s, err = NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove err = ValidateUpstreamsPrivate(set, snd)
</s> add err := ValidateUpstreamsPrivate(set, ss)
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dns_test.go
|
keep keep add keep keep keep keep
|
<mask> }
<mask>
<mask> testCases := []struct {
<mask> name string
<mask> cliIP net.IP
<mask> }{{
<mask> want: assert.True,
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove want bool
</s> add </s> add want: assert.True, </s> remove subnetDetector: snd,
</s> add privateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add ss := netutil.SubnetSetFunc(netutil.IsLocallyServed) </s> remove var err error
srv.subnetDetector, err = aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add srv.privateNets = netutil.SubnetSetFunc(netutil.IsLocallyServed) </s> add want: assert.False,
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dns_test.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> testCases := []struct {
<mask> name string
<mask> cliIP net.IP
<mask> want bool
<mask> }{{
<mask> name: "local",
<mask> cliIP: net.IP{192, 168, 0, 1},
<mask> want: true,
<mask> }, {
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> add want: assert.True, </s> remove want: true,
</s> add </s> add want: assert.False, </s> add want assert.BoolAssertionFunc </s> remove want: false,
</s> add }, {
want: assert.False,
name: "invalid",
cliIP: net.IP{1, 2, 3, 4, 5},
}, {
want: assert.False,
name: "nil",
cliIP: nil, </s> remove var err error
srv.subnetDetector, err = aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add srv.privateNets = netutil.SubnetSetFunc(netutil.IsLocallyServed)
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dns_test.go
|
keep keep keep add keep keep keep keep keep
|
<mask> want assert.BoolAssertionFunc
<mask> name string
<mask> cliIP net.IP
<mask> }{{
<mask> name: "local",
<mask> cliIP: net.IP{192, 168, 0, 1},
<mask> }, {
<mask> want: assert.False,
<mask> name: "external",
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove want bool
</s> add </s> add want: assert.False, </s> remove want: true,
</s> add </s> remove want: false,
</s> add }, {
want: assert.False,
name: "invalid",
cliIP: net.IP{1, 2, 3, 4, 5},
}, {
want: assert.False,
name: "nil",
cliIP: nil, </s> add want assert.BoolAssertionFunc </s> remove var err error
srv.subnetDetector, err = aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add srv.privateNets = netutil.SubnetSetFunc(netutil.IsLocallyServed)
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dns_test.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> want bool
<mask> }{{
<mask> name: "local",
<mask> cliIP: net.IP{192, 168, 0, 1},
<mask> want: true,
<mask> }, {
<mask> name: "external",
<mask> cliIP: net.IP{250, 249, 0, 1},
<mask> want: false,
<mask> }}
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> add want: assert.False, </s> add want: assert.True, </s> remove want bool
</s> add </s> remove want: false,
</s> add }, {
want: assert.False,
name: "invalid",
cliIP: net.IP{1, 2, 3, 4, 5},
}, {
want: assert.False,
name: "nil",
cliIP: nil, </s> add want assert.BoolAssertionFunc </s> remove var err error
srv.subnetDetector, err = aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add srv.privateNets = netutil.SubnetSetFunc(netutil.IsLocallyServed)
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dns_test.go
|
keep keep keep add keep keep keep keep keep
|
<mask> want: assert.True,
<mask> name: "local",
<mask> cliIP: net.IP{192, 168, 0, 1},
<mask> }, {
<mask> name: "external",
<mask> cliIP: net.IP{250, 249, 0, 1},
<mask> }, {
<mask> want: assert.False,
<mask> name: "invalid",
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove want: true,
</s> add </s> add want: assert.True, </s> remove want: false,
</s> add }, {
want: assert.False,
name: "invalid",
cliIP: net.IP{1, 2, 3, 4, 5},
}, {
want: assert.False,
name: "nil",
cliIP: nil, </s> remove want bool
</s> add </s> add want assert.BoolAssertionFunc </s> remove var err error
srv.subnetDetector, err = aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add srv.privateNets = netutil.SubnetSetFunc(netutil.IsLocallyServed)
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dns_test.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> want: true,
<mask> }, {
<mask> name: "external",
<mask> cliIP: net.IP{250, 249, 0, 1},
<mask> want: false,
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> proxyCtx := &proxy.DNSContext{
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove want: true,
</s> add </s> add want: assert.False, </s> remove want bool
</s> add </s> add want: assert.True, </s> remove err = ValidateUpstreamsPrivate(set, snd)
</s> add err := ValidateUpstreamsPrivate(set, ss) </s> remove if !Context.subnetDetector.IsSpecialNetwork(ip) {
</s> add if !netutil.IsSpecialPurpose(ip) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dns_test.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> proxyCtx: proxyCtx,
<mask> }
<mask> s.processDetermineLocal(dctx)
<mask>
<mask> assert.Equal(t, tc.want, dctx.isLocalClient)
<mask> })
<mask> }
<mask> }
<mask>
<mask> func TestServer_ProcessInternalHosts_localRestriction(t *testing.T) {
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add ss := netutil.SubnetSetFunc(netutil.IsLocallyServed) </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add </s> remove err = ValidateUpstreamsPrivate(set, snd)
</s> add err := ValidateUpstreamsPrivate(set, ss) </s> remove subnetDetector: snd,
</s> add privateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
var s *Server
s, err = NewServer(DNSCreateParams{
DNSFilter: filtering.New(&filtering.Config{}, nil),
DHCPServer: &testDHCP{},
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DNSFilter: filtering.New(&filtering.Config{}, nil),
DHCPServer: &testDHCP{},
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove if !Context.subnetDetector.IsSpecialNetwork(ip) {
</s> add if !netutil.IsSpecialPurpose(ip) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dns_test.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // must be a valid domain name plus dots on each side.
<mask> localDomainSuffix string
<mask>
<mask> ipset ipsetCtx
<mask> subnetDetector *aghnet.SubnetDetector
<mask> localResolvers *proxy.Proxy
<mask> sysResolvers aghnet.SystemResolvers
<mask> recDetector *recursionDetector
<mask>
<mask> // anonymizer masks the client's IP addresses if needed.
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove // a locally-served network. lnc must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, lnc LocalNetChecker) (err error) {
</s> add // a locally-served network. privateNets must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, privateNets netutil.SubnetSet) (err error) { </s> add // PrivateNets is the set of IP networks for which the private reverse DNS
// resolver should be used.
PrivateNets []string `yaml:"private_networks"`
</s> remove DNSFilter *filtering.DNSFilter
Stats stats.Stats
QueryLog querylog.QueryLog
DHCPServer dhcpd.ServerInterface
SubnetDetector *aghnet.SubnetDetector
Anonymizer *aghnet.IPMut
LocalDomain string
</s> add DNSFilter *filtering.DNSFilter
Stats stats.Stats
QueryLog querylog.QueryLog
DHCPServer dhcpd.ServerInterface
PrivateNets netutil.SubnetSet
Anonymizer *aghnet.IPMut
LocalDomain string </s> remove subnetDetector *aghnet.SubnetDetector
</s> add </s> remove // LocalNetChecker is used to check if the IP address belongs to a local
// network.
type LocalNetChecker interface {
// IsLocallyServedNetwork returns true if ip is contained in any of address
// registries defined by RFC 6303.
IsLocallyServedNetwork(ip net.IP) (ok bool)
}
// type check
var _ LocalNetChecker = (*aghnet.SubnetDetector)(nil)
</s> add </s> remove if !s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if !s.privateNets.Contains(ip) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dnsforward.go
|
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> const defaultLocalDomainSuffix = ".lan."
<mask>
<mask> // DNSCreateParams are parameters to create a new server.
<mask> type DNSCreateParams struct {
<mask> DNSFilter *filtering.DNSFilter
<mask> Stats stats.Stats
<mask> QueryLog querylog.QueryLog
<mask> DHCPServer dhcpd.ServerInterface
<mask> SubnetDetector *aghnet.SubnetDetector
<mask> Anonymizer *aghnet.IPMut
<mask> LocalDomain string
<mask> }
<mask>
<mask> // domainNameToSuffix converts a domain name into a local domain suffix.
<mask> func domainNameToSuffix(tld string) (suffix string) {
<mask> l := len(tld) + 2
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove subnetDetector *aghnet.SubnetDetector
</s> add privateNets netutil.SubnetSet </s> remove // a locally-served network. lnc must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, lnc LocalNetChecker) (err error) {
</s> add // a locally-served network. privateNets must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, privateNets netutil.SubnetSet) (err error) { </s> remove // LocalNetChecker is used to check if the IP address belongs to a local
// network.
type LocalNetChecker interface {
// IsLocallyServedNetwork returns true if ip is contained in any of address
// registries defined by RFC 6303.
IsLocallyServedNetwork(ip net.IP) (ok bool)
}
// type check
var _ LocalNetChecker = (*aghnet.SubnetDetector)(nil)
</s> add </s> remove if !lnc.IsLocallyServedNetwork(subnet.IP) {
</s> add if !privateNets.Contains(subnet.IP) { </s> remove if !s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if !s.privateNets.Contains(ip) { </s> add if ip == nil {
continue
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dnsforward.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> s = &Server{
<mask> dnsFilter: p.DNSFilter,
<mask> stats: p.Stats,
<mask> queryLog: p.QueryLog,
<mask> subnetDetector: p.SubnetDetector,
<mask> localDomainSuffix: localDomainSuffix,
<mask> recDetector: newRecursionDetector(recursionTTL, cachedRecurrentReqNum),
<mask> clientIDCache: cache.New(cache.Config{
<mask> EnableLRU: true,
<mask> MaxCount: defaultClientIDCacheCount,
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add </s> remove subnetDetector: snd,
</s> add privateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove want bool
</s> add </s> remove want: true,
</s> add </s> remove want: false,
</s> add }, {
want: assert.False,
name: "invalid",
cliIP: net.IP{1, 2, 3, 4, 5},
}, {
want: assert.False,
name: "nil",
cliIP: nil, </s> remove DHCPServer: &testDHCP{},
DNSFilter: flt,
SubnetDetector: snd,
</s> add DHCPServer: &testDHCP{},
DNSFilter: flt,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed),
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dnsforward.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> StartTime: time.Now(),
<mask> }
<mask>
<mask> resolver := s.internalProxy
<mask> if s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> if !s.conf.UsePrivateRDNS {
<mask> return "", nil
<mask> }
<mask>
<mask> resolver = s.localResolvers
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove if !Context.subnetDetector.IsSpecialNetwork(ip) {
</s> add if !netutil.IsSpecialPurpose(ip) { </s> remove dctx.isLocalClient = s.subnetDetector.IsLocallyServedNetwork(ip)
</s> add dctx.isLocalClient = s.privateNets.Contains(ip) </s> remove err = ValidateUpstreamsPrivate(*req.LocalPTRUpstreams, snd)
</s> add err = ValidateUpstreamsPrivate(*req.LocalPTRUpstreams, privateNets) </s> remove func (req *dnsConfig) validate(snd *aghnet.SubnetDetector) (err error) {
</s> add func (req *dnsConfig) validate(privateNets netutil.SubnetSet) (err error) { </s> remove err = req.validate(s.subnetDetector)
</s> add err = req.validate(s.privateNets) </s> remove if !s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if !s.privateNets.Contains(ip) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dnsforward.go
|
keep keep add keep keep keep keep keep
|
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/testutil"
<mask> "github.com/AdguardTeam/golibs/timeutil"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> add "github.com/AdguardTeam/golibs/netutil" </s> add "github.com/AdguardTeam/golibs/netutil" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
</s> add </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dnsforward_test.go
|
keep keep replace replace replace replace keep replace replace replace keep keep keep
|
<mask> f.SetEnabled(true)
<mask>
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
<mask> s, err = NewServer(DNSCreateParams{
<mask> DHCPServer: &testDHCP{},
<mask> DNSFilter: f,
<mask> SubnetDetector: snd,
<mask> })
<mask> require.NoError(t, err)
<mask>
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
</s> add </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
var s *Server
s, err = NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove DHCPServer: &testDHCP{},
DNSFilter: f,
SubnetDetector: snd,
</s> add DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove var s *Server
s, err = NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
var s *Server
s, err = NewServer(DNSCreateParams{
DNSFilter: filtering.New(&filtering.Config{}, nil),
DHCPServer: &testDHCP{},
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DNSFilter: filtering.New(&filtering.Config{}, nil),
DHCPServer: &testDHCP{},
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed),
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dnsforward_test.go
|
keep keep keep replace replace replace replace keep replace replace replace replace replace keep keep keep keep
|
<mask> Data: []byte(rules),
<mask> }}
<mask>
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
<mask> f := filtering.New(&filtering.Config{}, filters)
<mask> var s *Server
<mask> s, err = NewServer(DNSCreateParams{
<mask> DHCPServer: &testDHCP{},
<mask> DNSFilter: f,
<mask> SubnetDetector: snd,
<mask> })
<mask> require.NoError(t, err)
<mask>
<mask> conf := &ServerConfig{
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
</s> add </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
</s> add var err error </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
var s *Server
s, err = NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
var s *Server
s, err = NewServer(DNSCreateParams{
DNSFilter: filtering.New(&filtering.Config{}, nil),
DHCPServer: &testDHCP{},
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DNSFilter: filtering.New(&filtering.Config{}, nil),
DHCPServer: &testDHCP{},
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove DHCPServer: &testDHCP{},
DNSFilter: f,
SubnetDetector: snd,
</s> add DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed),
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dnsforward_test.go
|
keep keep keep keep replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> }
<mask> f := filtering.New(c, nil)
<mask> f.SetEnabled(true)
<mask>
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
<mask> var s *Server
<mask> s, err = NewServer(DNSCreateParams{
<mask> DHCPServer: &testDHCP{},
<mask> DNSFilter: f,
<mask> SubnetDetector: snd,
<mask> })
<mask> require.NoError(t, err)
<mask>
<mask> assert.NoError(t, s.Prepare(&ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove var s *Server
s, err = NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
</s> add var err error </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
</s> add </s> remove var snd *aghnet.SubnetDetector
snd, err = aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
</s> add </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
</s> add </s> remove DHCPServer: &testDHCP{},
DNSFilter: f,
SubnetDetector: snd,
</s> add DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed),
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dnsforward_test.go
|
keep keep keep keep replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask>
<mask> func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {}
<mask>
<mask> func TestPTRResponseFromDHCPLeases(t *testing.T) {
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
<mask> var s *Server
<mask> s, err = NewServer(DNSCreateParams{
<mask> DNSFilter: filtering.New(&filtering.Config{}, nil),
<mask> DHCPServer: &testDHCP{},
<mask> SubnetDetector: snd,
<mask> })
<mask> require.NoError(t, err)
<mask>
<mask> s.conf.UDPListenAddrs = []*net.UDPAddr{{}}
<mask> s.conf.TCPListenAddrs = []*net.TCPAddr{{}}
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove DHCPServer: &testDHCP{},
DNSFilter: flt,
SubnetDetector: snd,
</s> add DHCPServer: &testDHCP{},
DNSFilter: flt,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove var s *Server
s, err = NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
var s *Server
s, err = NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
</s> add </s> remove var snd *aghnet.SubnetDetector
snd, err = aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
</s> add </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dnsforward_test.go
|
keep keep replace replace replace replace replace keep keep replace replace replace keep keep keep
|
<mask> flt.SetEnabled(true)
<mask>
<mask> var snd *aghnet.SubnetDetector
<mask> snd, err = aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
<mask> var s *Server
<mask> s, err = NewServer(DNSCreateParams{
<mask> DHCPServer: &testDHCP{},
<mask> DNSFilter: flt,
<mask> SubnetDetector: snd,
<mask> })
<mask> require.NoError(t, err)
<mask>
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
var s *Server
s, err = NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove var s *Server
s, err = NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
var s *Server
s, err = NewServer(DNSCreateParams{
DNSFilter: filtering.New(&filtering.Config{}, nil),
DHCPServer: &testDHCP{},
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DNSFilter: filtering.New(&filtering.Config{}, nil),
DHCPServer: &testDHCP{},
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
</s> add var err error </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dnsforward_test.go
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> })
<mask> srv.conf.ResolveClients = true
<mask> srv.conf.UsePrivateRDNS = true
<mask>
<mask> var err error
<mask> srv.subnetDetector, err = aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask>
<mask> localIP := net.IP{192, 168, 1, 1}
<mask> testCases := []struct {
<mask> name string
<mask> want string
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove want bool
</s> add </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add ss := netutil.SubnetSetFunc(netutil.IsLocallyServed) </s> add want assert.BoolAssertionFunc </s> remove subnetDetector: snd,
</s> add privateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> add want: assert.True, </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
</s> add var err error
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/dnsforward_test.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import (
<mask> "net"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/netutil"
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
</s> add </s> add "github.com/AdguardTeam/golibs/netutil" </s> add "github.com/AdguardTeam/golibs/netutil" </s> add "github.com/AdguardTeam/golibs/netutil" </s> remove github.com/AdguardTeam/golibs v0.10.6
</s> add github.com/AdguardTeam/golibs v0.10.8
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/filter_test.go
|
keep replace replace replace replace keep replace replace replace keep keep keep
|
<mask>
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
<mask> s, err := NewServer(DNSCreateParams{
<mask> DHCPServer: &testDHCP{},
<mask> DNSFilter: f,
<mask> SubnetDetector: snd,
<mask> })
<mask> require.NoError(t, err)
<mask>
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove DHCPServer: &testDHCP{},
DNSFilter: f,
SubnetDetector: snd,
</s> add DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
var s *Server
s, err = NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
</s> add var err error </s> remove var s *Server
s, err = NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
var s *Server
s, err = NewServer(DNSCreateParams{
DNSFilter: filtering.New(&filtering.Config{}, nil),
DHCPServer: &testDHCP{},
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DNSFilter: filtering.New(&filtering.Config{}, nil),
DHCPServer: &testDHCP{},
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed),
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/filter_test.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/netutil"
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> add "github.com/AdguardTeam/golibs/netutil" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
</s> add </s> add "github.com/AdguardTeam/golibs/netutil" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
</s> add </s> add "github.com/AdguardTeam/golibs/netutil" </s> remove Context.subnetDetector, err = aghnet.NewSubnetDetector()
fatalOnError(err)
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/http.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return nil
<mask> }
<mask>
<mask> // validate returns an error if any field of req is invalid.
<mask> func (req *dnsConfig) validate(snd *aghnet.SubnetDetector) (err error) {
<mask> if req.Upstreams != nil {
<mask> err = ValidateUpstreams(*req.Upstreams)
<mask> if err != nil {
<mask> return fmt.Errorf("validating upstream servers: %w", err)
<mask> }
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove err = ValidateUpstreamsPrivate(*req.LocalPTRUpstreams, snd)
</s> add err = ValidateUpstreamsPrivate(*req.LocalPTRUpstreams, privateNets) </s> remove // a locally-served network. lnc must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, lnc LocalNetChecker) (err error) {
</s> add // a locally-served network. privateNets must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, privateNets netutil.SubnetSet) (err error) { </s> remove err = req.validate(s.subnetDetector)
</s> add err = req.validate(s.privateNets) </s> remove // LocalNetChecker is used to check if the IP address belongs to a local
// network.
type LocalNetChecker interface {
// IsLocallyServedNetwork returns true if ip is contained in any of address
// registries defined by RFC 6303.
IsLocallyServedNetwork(ip net.IP) (ok bool)
}
// type check
var _ LocalNetChecker = (*aghnet.SubnetDetector)(nil)
</s> add </s> remove dctx.isLocalClient = s.subnetDetector.IsLocallyServedNetwork(ip)
</s> add dctx.isLocalClient = s.privateNets.Contains(ip) </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if s.privateNets.Contains(ip) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/http.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> }
<mask>
<mask> if req.LocalPTRUpstreams != nil {
<mask> err = ValidateUpstreamsPrivate(*req.LocalPTRUpstreams, snd)
<mask> if err != nil {
<mask> return fmt.Errorf("validating private upstream servers: %w", err)
<mask> }
<mask> }
<mask>
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove func (req *dnsConfig) validate(snd *aghnet.SubnetDetector) (err error) {
</s> add func (req *dnsConfig) validate(privateNets netutil.SubnetSet) (err error) { </s> remove err = req.validate(s.subnetDetector)
</s> add err = req.validate(s.privateNets) </s> remove // a locally-served network. lnc must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, lnc LocalNetChecker) (err error) {
</s> add // a locally-served network. privateNets must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, privateNets netutil.SubnetSet) (err error) { </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if s.privateNets.Contains(ip) { </s> remove if !Context.subnetDetector.IsSpecialNetwork(ip) {
</s> add if !netutil.IsSpecialPurpose(ip) { </s> remove DNSFilter: Context.dnsFilter,
Stats: Context.stats,
QueryLog: Context.queryLog,
SubnetDetector: Context.subnetDetector,
Anonymizer: anonymizer,
LocalDomain: config.DHCP.LocalDomainName,
</s> add DNSFilter: Context.dnsFilter,
Stats: Context.stats,
QueryLog: Context.queryLog,
PrivateNets: privateNets,
Anonymizer: anonymizer,
LocalDomain: config.DHCP.LocalDomainName,
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/http.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> return
<mask> }
<mask>
<mask> err = req.validate(s.subnetDetector)
<mask> if err != nil {
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
<mask>
<mask> return
<mask> }
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove err = ValidateUpstreamsPrivate(*req.LocalPTRUpstreams, snd)
</s> add err = ValidateUpstreamsPrivate(*req.LocalPTRUpstreams, privateNets) </s> remove func (req *dnsConfig) validate(snd *aghnet.SubnetDetector) (err error) {
</s> add func (req *dnsConfig) validate(privateNets netutil.SubnetSet) (err error) { </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if s.privateNets.Contains(ip) { </s> remove if !Context.subnetDetector.IsSpecialNetwork(ip) {
</s> add if !netutil.IsSpecialPurpose(ip) { </s> remove dctx.isLocalClient = s.subnetDetector.IsLocallyServedNetwork(ip)
</s> add dctx.isLocalClient = s.privateNets.Contains(ip) </s> remove if !s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if !s.privateNets.Contains(ip) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/http.go
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> func IsCommentOrEmpty(s string) (ok bool) {
<mask> return len(s) == 0 || s[0] == '#'
<mask> }
<mask>
<mask> // LocalNetChecker is used to check if the IP address belongs to a local
<mask> // network.
<mask> type LocalNetChecker interface {
<mask> // IsLocallyServedNetwork returns true if ip is contained in any of address
<mask> // registries defined by RFC 6303.
<mask> IsLocallyServedNetwork(ip net.IP) (ok bool)
<mask> }
<mask>
<mask> // type check
<mask> var _ LocalNetChecker = (*aghnet.SubnetDetector)(nil)
<mask>
<mask> // newUpstreamConfig validates upstreams and returns an appropriate upstream
<mask> // configuration or nil if it can't be built.
<mask> //
<mask> // TODO(e.burkov): Perhaps proxy.ParseUpstreamsConfig should validate upstreams
<mask> // slice already so that this function may be considered useless.
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove // a locally-served network. lnc must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, lnc LocalNetChecker) (err error) {
</s> add // a locally-served network. privateNets must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, privateNets netutil.SubnetSet) (err error) { </s> remove dctx.isLocalClient = s.subnetDetector.IsLocallyServedNetwork(ip)
</s> add dctx.isLocalClient = s.privateNets.Contains(ip) </s> add // PrivateNets is the set of IP networks for which the private reverse DNS
// resolver should be used.
PrivateNets []string `yaml:"private_networks"`
</s> remove if !s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if !s.privateNets.Contains(ip) { </s> remove func (req *dnsConfig) validate(snd *aghnet.SubnetDetector) (err error) {
</s> add func (req *dnsConfig) validate(privateNets netutil.SubnetSet) (err error) { </s> add if ip == nil {
continue
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/http.go
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> // ValidateUpstreamsPrivate validates each upstream and returns an error if any
<mask> // upstream is invalid or if there are no default upstreams specified. It also
<mask> // checks each domain of domain-specific upstreams for being ARPA pointing to
<mask> // a locally-served network. lnc must not be nil.
<mask> func ValidateUpstreamsPrivate(upstreams []string, lnc LocalNetChecker) (err error) {
<mask> conf, err := newUpstreamConfig(upstreams)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove func (req *dnsConfig) validate(snd *aghnet.SubnetDetector) (err error) {
</s> add func (req *dnsConfig) validate(privateNets netutil.SubnetSet) (err error) { </s> remove // LocalNetChecker is used to check if the IP address belongs to a local
// network.
type LocalNetChecker interface {
// IsLocallyServedNetwork returns true if ip is contained in any of address
// registries defined by RFC 6303.
IsLocallyServedNetwork(ip net.IP) (ok bool)
}
// type check
var _ LocalNetChecker = (*aghnet.SubnetDetector)(nil)
</s> add </s> remove if !s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if !s.privateNets.Contains(ip) { </s> add // PrivateNets is the set of IP networks for which the private reverse DNS
// resolver should be used.
PrivateNets []string `yaml:"private_networks"`
</s> remove subnetDetector *aghnet.SubnetDetector
</s> add privateNets netutil.SubnetSet </s> remove dctx.isLocalClient = s.subnetDetector.IsLocallyServedNetwork(ip)
</s> add dctx.isLocalClient = s.privateNets.Contains(ip)
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/http.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> continue
<mask> }
<mask>
<mask> if !lnc.IsLocallyServedNetwork(subnet.IP) {
<mask> errs = append(
<mask> errs,
<mask> fmt.Errorf("arpa domain %q should point to a locally-served network", domain),
<mask> )
<mask> }
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove if !s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if !s.privateNets.Contains(ip) { </s> remove // a locally-served network. lnc must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, lnc LocalNetChecker) (err error) {
</s> add // a locally-served network. privateNets must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, privateNets netutil.SubnetSet) (err error) { </s> add if ip == nil {
continue
}
</s> remove DNSFilter *filtering.DNSFilter
Stats stats.Stats
QueryLog querylog.QueryLog
DHCPServer dhcpd.ServerInterface
SubnetDetector *aghnet.SubnetDetector
Anonymizer *aghnet.IPMut
LocalDomain string
</s> add DNSFilter *filtering.DNSFilter
Stats stats.Stats
QueryLog querylog.QueryLog
DHCPServer dhcpd.ServerInterface
PrivateNets netutil.SubnetSet
Anonymizer *aghnet.IPMut
LocalDomain string </s> add // PrivateNets is the set of IP networks for which the private reverse DNS
// resolver should be used.
PrivateNets []string `yaml:"private_networks"`
</s> remove // LocalNetChecker is used to check if the IP address belongs to a local
// network.
type LocalNetChecker interface {
// IsLocallyServedNetwork returns true if ip is contained in any of address
// registries defined by RFC 6303.
IsLocallyServedNetwork(ip net.IP) (ok bool)
}
// type check
var _ LocalNetChecker = (*aghnet.SubnetDetector)(nil)
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/http.go
|
keep keep add keep keep keep keep keep
|
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/golibs/testutil"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> add "github.com/AdguardTeam/golibs/netutil" </s> add "github.com/AdguardTeam/golibs/netutil" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
</s> add </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/http_test.go
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> }
<mask> }
<mask>
<mask> func TestValidateUpstreamsPrivate(t *testing.T) {
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask>
<mask> testCases := []struct {
<mask> name string
<mask> wantErr string
<mask> u string
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove subnetDetector: snd,
</s> add privateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove var err error
srv.subnetDetector, err = aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add srv.privateNets = netutil.SubnetSetFunc(netutil.IsLocallyServed) </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add </s> add want assert.BoolAssertionFunc </s> remove want bool
</s> add </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
var s *Server
s, err = NewServer(DNSCreateParams{
DNSFilter: filtering.New(&filtering.Config{}, nil),
DHCPServer: &testDHCP{},
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DNSFilter: filtering.New(&filtering.Config{}, nil),
DHCPServer: &testDHCP{},
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed),
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/http_test.go
|
keep keep keep keep replace keep keep keep keep
|
<mask> for _, tc := range testCases {
<mask> set := []string{"192.168.0.1", tc.u}
<mask>
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> err = ValidateUpstreamsPrivate(set, snd)
<mask> testutil.AssertErrorMsg(t, tc.wantErr, err)
<mask> })
<mask> }
<mask> }
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove want: false,
</s> add }, {
want: assert.False,
name: "invalid",
cliIP: net.IP{1, 2, 3, 4, 5},
}, {
want: assert.False,
name: "nil",
cliIP: nil, </s> remove if !Context.subnetDetector.IsSpecialNetwork(ip) {
</s> add if !netutil.IsSpecialPurpose(ip) { </s> add if ip == nil {
continue
}
</s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add ss := netutil.SubnetSetFunc(netutil.IsLocallyServed) </s> remove subnetDetector: snd,
</s> add privateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed),
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/dnsforward/http_test.go
|
keep add keep keep keep keep keep
|
<mask> ResolveClients bool `yaml:"resolve_clients"`
<mask>
<mask> // UsePrivateRDNS defines if the PTR requests for unknown addresses from
<mask> // locally-served networks should be resolved via private PTR resolvers.
<mask> UsePrivateRDNS bool `yaml:"use_private_ptr_resolvers"`
<mask>
<mask> // LocalPTRResolvers is the slice of addresses to be used as upstreams
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove if !s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if !s.privateNets.Contains(ip) { </s> remove // LocalNetChecker is used to check if the IP address belongs to a local
// network.
type LocalNetChecker interface {
// IsLocallyServedNetwork returns true if ip is contained in any of address
// registries defined by RFC 6303.
IsLocallyServedNetwork(ip net.IP) (ok bool)
}
// type check
var _ LocalNetChecker = (*aghnet.SubnetDetector)(nil)
</s> add </s> remove // a locally-served network. lnc must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, lnc LocalNetChecker) (err error) {
</s> add // a locally-served network. privateNets must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, privateNets netutil.SubnetSet) (err error) { </s> remove subnetDetector *aghnet.SubnetDetector
</s> add privateNets netutil.SubnetSet </s> add if ip == nil {
continue
}
</s> remove dctx.isLocalClient = s.subnetDetector.IsLocallyServedNetwork(ip)
</s> add dctx.isLocalClient = s.privateNets.Contains(ip)
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/home/config.go
|
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep
|
<mask> filterConf.HTTPRegister = httpRegister
<mask> Context.dnsFilter = filtering.New(&filterConf, nil)
<mask>
<mask> p := dnsforward.DNSCreateParams{
<mask> DNSFilter: Context.dnsFilter,
<mask> Stats: Context.stats,
<mask> QueryLog: Context.queryLog,
<mask> SubnetDetector: Context.subnetDetector,
<mask> Anonymizer: anonymizer,
<mask> LocalDomain: config.DHCP.LocalDomainName,
<mask> }
<mask> if Context.dhcpServer != nil {
<mask> p.DHCPServer = Context.dhcpServer
<mask> }
<mask>
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove err = ValidateUpstreamsPrivate(*req.LocalPTRUpstreams, snd)
</s> add err = ValidateUpstreamsPrivate(*req.LocalPTRUpstreams, privateNets) </s> remove func (req *dnsConfig) validate(snd *aghnet.SubnetDetector) (err error) {
</s> add func (req *dnsConfig) validate(privateNets netutil.SubnetSet) (err error) { </s> remove err = req.validate(s.subnetDetector)
</s> add err = req.validate(s.privateNets) </s> remove Context.subnetDetector, err = aghnet.NewSubnetDetector()
fatalOnError(err)
</s> add </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
var s *Server
s, err = NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove var snd *aghnet.SubnetDetector
snd, err = aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/home/dns.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> if config.DNS.ResolveClients && !ip.IsLoopback() {
<mask> Context.rdns.Begin(ip)
<mask> }
<mask> if !Context.subnetDetector.IsSpecialNetwork(ip) {
<mask> Context.whois.Begin(ip)
<mask> }
<mask> }
<mask>
<mask> func ipsToTCPAddrs(ips []net.IP, port int) (tcpAddrs []*net.TCPAddr) {
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove if !Context.subnetDetector.IsSpecialNetwork(ip) {
</s> add if !netutil.IsSpecialPurpose(ip) { </s> add if ip == nil {
continue
}
</s> remove func (req *dnsConfig) validate(snd *aghnet.SubnetDetector) (err error) {
</s> add func (req *dnsConfig) validate(privateNets netutil.SubnetSet) (err error) { </s> remove if !s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if !s.privateNets.Contains(ip) { </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if s.privateNets.Contains(ip) { </s> remove if !lnc.IsLocallyServedNetwork(subnet.IP) {
</s> add if !privateNets.Contains(subnet.IP) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/home/dns.go
|
keep keep add keep keep keep keep keep keep
|
<mask>
<mask> const topClientsNumber = 100 // the number of clients to get
<mask> for _, ip := range Context.stats.GetTopClientsIP(topClientsNumber) {
<mask> if config.DNS.ResolveClients && !ip.IsLoopback() {
<mask> Context.rdns.Begin(ip)
<mask> }
<mask> if !netutil.IsSpecialPurpose(ip) {
<mask> Context.whois.Begin(ip)
<mask> }
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove if !Context.subnetDetector.IsSpecialNetwork(ip) {
</s> add if !netutil.IsSpecialPurpose(ip) { </s> remove if !Context.subnetDetector.IsSpecialNetwork(ip) {
</s> add if !netutil.IsSpecialPurpose(ip) { </s> remove dctx.isLocalClient = s.subnetDetector.IsLocallyServedNetwork(ip)
</s> add dctx.isLocalClient = s.privateNets.Contains(ip) </s> remove err = ValidateUpstreamsPrivate(set, snd)
</s> add err := ValidateUpstreamsPrivate(set, ss) </s> remove if !s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if !s.privateNets.Contains(ip) { </s> add // PrivateNets is the set of IP networks for which the private reverse DNS
// resolver should be used.
PrivateNets []string `yaml:"private_networks"`
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/home/dns.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> for _, ip := range Context.stats.GetTopClientsIP(topClientsNumber) {
<mask> if config.DNS.ResolveClients && !ip.IsLoopback() {
<mask> Context.rdns.Begin(ip)
<mask> }
<mask> if !Context.subnetDetector.IsSpecialNetwork(ip) {
<mask> Context.whois.Begin(ip)
<mask> }
<mask> }
<mask>
<mask> return nil
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> add if ip == nil {
continue
}
</s> remove if !Context.subnetDetector.IsSpecialNetwork(ip) {
</s> add if !netutil.IsSpecialPurpose(ip) { </s> remove err = ValidateUpstreamsPrivate(set, snd)
</s> add err := ValidateUpstreamsPrivate(set, ss) </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if s.privateNets.Contains(ip) { </s> remove err = ValidateUpstreamsPrivate(*req.LocalPTRUpstreams, snd)
</s> add err = ValidateUpstreamsPrivate(*req.LocalPTRUpstreams, privateNets) </s> remove func (req *dnsConfig) validate(snd *aghnet.SubnetDetector) (err error) {
</s> add func (req *dnsConfig) validate(privateNets netutil.SubnetSet) (err error) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/home/dns.go
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> hostsWatcher aghos.FSWatcher
<mask>
<mask> updater *updater.Updater
<mask>
<mask> subnetDetector *aghnet.SubnetDetector
<mask>
<mask> // mux is our custom http.ServeMux.
<mask> mux *http.ServeMux
<mask>
<mask> // Runtime properties
<mask> // --
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove subnetDetector *aghnet.SubnetDetector
</s> add privateNets netutil.SubnetSet </s> add // PrivateNets is the set of IP networks for which the private reverse DNS
// resolver should be used.
PrivateNets []string `yaml:"private_networks"`
</s> remove // LocalNetChecker is used to check if the IP address belongs to a local
// network.
type LocalNetChecker interface {
// IsLocallyServedNetwork returns true if ip is contained in any of address
// registries defined by RFC 6303.
IsLocallyServedNetwork(ip net.IP) (ok bool)
}
// type check
var _ LocalNetChecker = (*aghnet.SubnetDetector)(nil)
</s> add </s> remove if !s.subnetDetector.IsLocallyServedNetwork(ip) {
</s> add if !s.privateNets.Contains(ip) { </s> remove // a locally-served network. lnc must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, lnc LocalNetChecker) (err error) {
</s> add // a locally-served network. privateNets must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, privateNets netutil.SubnetSet) (err error) { </s> remove DNSFilter *filtering.DNSFilter
Stats stats.Stats
QueryLog querylog.QueryLog
DHCPServer dhcpd.ServerInterface
SubnetDetector *aghnet.SubnetDetector
Anonymizer *aghnet.IPMut
LocalDomain string
</s> add DNSFilter *filtering.DNSFilter
Stats stats.Stats
QueryLog querylog.QueryLog
DHCPServer dhcpd.ServerInterface
PrivateNets netutil.SubnetSet
Anonymizer *aghnet.IPMut
LocalDomain string
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/home/home.go
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask>
<mask> Context.web, err = initWeb(args, clientBuildFS)
<mask> fatalOnError(err)
<mask>
<mask> Context.subnetDetector, err = aghnet.NewSubnetDetector()
<mask> fatalOnError(err)
<mask>
<mask> if !Context.firstRun {
<mask> err = initDNSServer()
<mask> fatalOnError(err)
<mask>
<mask> Context.tls.Start()
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade75b9dc32ee6d93e3aa35cf79dbaa28b2
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 17 19:56:02 2022 +0300
all: upd golibs, use subnet set </s> remove err = ValidateUpstreamsPrivate(*req.LocalPTRUpstreams, snd)
</s> add err = ValidateUpstreamsPrivate(*req.LocalPTRUpstreams, privateNets) </s> remove err = req.validate(s.subnetDetector)
</s> add err = req.validate(s.privateNets) </s> remove var err error
srv.subnetDetector, err = aghnet.NewSubnetDetector()
require.NoError(t, err)
</s> add srv.privateNets = netutil.SubnetSetFunc(netutil.IsLocallyServed) </s> remove DNSFilter: Context.dnsFilter,
Stats: Context.stats,
QueryLog: Context.queryLog,
SubnetDetector: Context.subnetDetector,
Anonymizer: anonymizer,
LocalDomain: config.DHCP.LocalDomainName,
</s> add DNSFilter: Context.dnsFilter,
Stats: Context.stats,
QueryLog: Context.queryLog,
PrivateNets: privateNets,
Anonymizer: anonymizer,
LocalDomain: config.DHCP.LocalDomainName, </s> remove snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
require.NotNil(t, snd)
var s *Server
s, err = NewServer(DNSCreateParams{
DNSFilter: filtering.New(&filtering.Config{}, nil),
DHCPServer: &testDHCP{},
SubnetDetector: snd,
</s> add s, err := NewServer(DNSCreateParams{
DNSFilter: filtering.New(&filtering.Config{}, nil),
DHCPServer: &testDHCP{},
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> remove func (req *dnsConfig) validate(snd *aghnet.SubnetDetector) (err error) {
</s> add func (req *dnsConfig) validate(privateNets netutil.SubnetSet) (err error) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc
|
internal/home/home.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> }
<mask>
<mask> // request was not filtered so let it be processed further
<mask> s.recDetector.add(*req)
<mask> if ctx.err = s.dnsProxy.Resolve(d); ctx.err != nil {
<mask> return resultCodeError
<mask> }
<mask>
<mask> ctx.responseFromUpstream = true
</s> Pull request: 3185 fix recursion vol.2
Merge in DNS/adguard-home from fix-recursion to master
Closes #3185.
Squashed commit of the following:
commit c78650b762163f39b2eb4b10f76f1845913134b2
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 13:12:46 2021 +0300
all: fix changelog
commit e43017a4b6d245f14e1a3bdf735a9c9f03501156
Author: Eugene Burkov <[email protected]>
Date: Sun May 30 22:39:05 2021 +0300
dnsforward: reduce recursion ttl
commit 79208a82bdad8280c439669413aef8dc7df0a85c
Author: Eugene Burkov <[email protected]>
Date: Sun May 30 22:29:27 2021 +0300
dnsforward: only check recursion for private rdns
commit 1b8075b086f33e58e273dfcf4168a6ba0473ebae
Author: Eugene Burkov <[email protected]>
Date: Sun May 30 22:18:11 2021 +0300
dnsforward: rm recursion detecting from upstream </s> remove s.recDetector.add(*req)
</s> add var resolver *proxy.Proxy = s.internalProxy
if s.subnetDetector.IsLocallyServedNetwork(ip) {
if !s.conf.UsePrivateRDNS {
return "", nil
}
resolver = s.localResolvers
s.recDetector.add(*req)
}
</s> remove var resolver *proxy.Proxy = s.localResolvers
if !s.subnetDetector.IsLocallyServedNetwork(ip) {
resolver = s.internalProxy
} else if !s.conf.UsePrivateRDNS {
return "", nil
}
</s> add </s> remove // check checks if the passed req was already sent by s.
</s> add // check checks if the passed req was already sent by the server. </s> remove recursionTTL = 5 * time.Second
</s> add recursionTTL = 1 * time.Second
|
https://github.com/AdguardTeam/AdGuardHome/commit/78d47d88842b51c6a7838e96a2e3d6b18c765e77
|
internal/dnsforward/dns.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask>
<mask> const (
<mask> // recursionTTL is the time recursive request is cached for.
<mask> recursionTTL = 5 * time.Second
<mask> // cachedRecurrentReqNum is the maximum number of cached recurrent
<mask> // requests.
<mask> cachedRecurrentReqNum = 1000
<mask> )
<mask>
</s> Pull request: 3185 fix recursion vol.2
Merge in DNS/adguard-home from fix-recursion to master
Closes #3185.
Squashed commit of the following:
commit c78650b762163f39b2eb4b10f76f1845913134b2
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 13:12:46 2021 +0300
all: fix changelog
commit e43017a4b6d245f14e1a3bdf735a9c9f03501156
Author: Eugene Burkov <[email protected]>
Date: Sun May 30 22:39:05 2021 +0300
dnsforward: reduce recursion ttl
commit 79208a82bdad8280c439669413aef8dc7df0a85c
Author: Eugene Burkov <[email protected]>
Date: Sun May 30 22:29:27 2021 +0300
dnsforward: only check recursion for private rdns
commit 1b8075b086f33e58e273dfcf4168a6ba0473ebae
Author: Eugene Burkov <[email protected]>
Date: Sun May 30 22:18:11 2021 +0300
dnsforward: rm recursion detecting from upstream </s> remove // check checks if the passed req was already sent by s.
</s> add // check checks if the passed req was already sent by the server. </s> remove s.recDetector.add(*req)
</s> add </s> remove s.recDetector.add(*req)
</s> add var resolver *proxy.Proxy = s.internalProxy
if s.subnetDetector.IsLocallyServedNetwork(ip) {
if !s.conf.UsePrivateRDNS {
return "", nil
}
resolver = s.localResolvers
s.recDetector.add(*req)
}
</s> remove var resolver *proxy.Proxy = s.localResolvers
if !s.subnetDetector.IsLocallyServedNetwork(ip) {
resolver = s.internalProxy
} else if !s.conf.UsePrivateRDNS {
return "", nil
}
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/78d47d88842b51c6a7838e96a2e3d6b18c765e77
|
internal/dnsforward/dnsforward.go
|
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> if !s.conf.ResolveClients {
<mask> return "", nil
<mask> }
<mask>
<mask> var resolver *proxy.Proxy = s.localResolvers
<mask> if !s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> resolver = s.internalProxy
<mask> } else if !s.conf.UsePrivateRDNS {
<mask> return "", nil
<mask> }
<mask>
<mask> arpa := dns.Fqdn(aghnet.ReverseAddr(ip))
<mask> req := &dns.Msg{
<mask> MsgHdr: dns.MsgHdr{
<mask> Id: dns.Id(),
<mask> RecursionDesired: true,
</s> Pull request: 3185 fix recursion vol.2
Merge in DNS/adguard-home from fix-recursion to master
Closes #3185.
Squashed commit of the following:
commit c78650b762163f39b2eb4b10f76f1845913134b2
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 13:12:46 2021 +0300
all: fix changelog
commit e43017a4b6d245f14e1a3bdf735a9c9f03501156
Author: Eugene Burkov <[email protected]>
Date: Sun May 30 22:39:05 2021 +0300
dnsforward: reduce recursion ttl
commit 79208a82bdad8280c439669413aef8dc7df0a85c
Author: Eugene Burkov <[email protected]>
Date: Sun May 30 22:29:27 2021 +0300
dnsforward: only check recursion for private rdns
commit 1b8075b086f33e58e273dfcf4168a6ba0473ebae
Author: Eugene Burkov <[email protected]>
Date: Sun May 30 22:18:11 2021 +0300
dnsforward: rm recursion detecting from upstream </s> remove s.recDetector.add(*req)
</s> add var resolver *proxy.Proxy = s.internalProxy
if s.subnetDetector.IsLocallyServedNetwork(ip) {
if !s.conf.UsePrivateRDNS {
return "", nil
}
resolver = s.localResolvers
s.recDetector.add(*req)
}
</s> remove s.recDetector.add(*req)
</s> add </s> remove // check checks if the passed req was already sent by s.
</s> add // check checks if the passed req was already sent by the server. </s> remove recursionTTL = 5 * time.Second
</s> add recursionTTL = 1 * time.Second
|
https://github.com/AdguardTeam/AdGuardHome/commit/78d47d88842b51c6a7838e96a2e3d6b18c765e77
|
internal/dnsforward/dnsforward.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> Req: req,
<mask> StartTime: time.Now(),
<mask> }
<mask>
<mask> s.recDetector.add(*req)
<mask> if err = resolver.Resolve(ctx); err != nil {
<mask> return "", err
<mask> }
<mask>
<mask> resp := ctx.Res
</s> Pull request: 3185 fix recursion vol.2
Merge in DNS/adguard-home from fix-recursion to master
Closes #3185.
Squashed commit of the following:
commit c78650b762163f39b2eb4b10f76f1845913134b2
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 13:12:46 2021 +0300
all: fix changelog
commit e43017a4b6d245f14e1a3bdf735a9c9f03501156
Author: Eugene Burkov <[email protected]>
Date: Sun May 30 22:39:05 2021 +0300
dnsforward: reduce recursion ttl
commit 79208a82bdad8280c439669413aef8dc7df0a85c
Author: Eugene Burkov <[email protected]>
Date: Sun May 30 22:29:27 2021 +0300
dnsforward: only check recursion for private rdns
commit 1b8075b086f33e58e273dfcf4168a6ba0473ebae
Author: Eugene Burkov <[email protected]>
Date: Sun May 30 22:18:11 2021 +0300
dnsforward: rm recursion detecting from upstream </s> remove var resolver *proxy.Proxy = s.localResolvers
if !s.subnetDetector.IsLocallyServedNetwork(ip) {
resolver = s.internalProxy
} else if !s.conf.UsePrivateRDNS {
return "", nil
}
</s> add </s> remove s.recDetector.add(*req)
</s> add </s> remove // check checks if the passed req was already sent by s.
</s> add // check checks if the passed req was already sent by the server. </s> remove recursionTTL = 5 * time.Second
</s> add recursionTTL = 1 * time.Second
|
https://github.com/AdguardTeam/AdGuardHome/commit/78d47d88842b51c6a7838e96a2e3d6b18c765e77
|
internal/dnsforward/dnsforward.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> recentRequests cache.Cache
<mask> ttl time.Duration
<mask> }
<mask>
<mask> // check checks if the passed req was already sent by s.
<mask> func (rd *recursionDetector) check(msg dns.Msg) (ok bool) {
<mask> if len(msg.Question) == 0 {
<mask> return false
<mask> }
<mask>
</s> Pull request: 3185 fix recursion vol.2
Merge in DNS/adguard-home from fix-recursion to master
Closes #3185.
Squashed commit of the following:
commit c78650b762163f39b2eb4b10f76f1845913134b2
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 13:12:46 2021 +0300
all: fix changelog
commit e43017a4b6d245f14e1a3bdf735a9c9f03501156
Author: Eugene Burkov <[email protected]>
Date: Sun May 30 22:39:05 2021 +0300
dnsforward: reduce recursion ttl
commit 79208a82bdad8280c439669413aef8dc7df0a85c
Author: Eugene Burkov <[email protected]>
Date: Sun May 30 22:29:27 2021 +0300
dnsforward: only check recursion for private rdns
commit 1b8075b086f33e58e273dfcf4168a6ba0473ebae
Author: Eugene Burkov <[email protected]>
Date: Sun May 30 22:18:11 2021 +0300
dnsforward: rm recursion detecting from upstream </s> remove var resolver *proxy.Proxy = s.localResolvers
if !s.subnetDetector.IsLocallyServedNetwork(ip) {
resolver = s.internalProxy
} else if !s.conf.UsePrivateRDNS {
return "", nil
}
</s> add </s> remove s.recDetector.add(*req)
</s> add </s> remove s.recDetector.add(*req)
</s> add var resolver *proxy.Proxy = s.internalProxy
if s.subnetDetector.IsLocallyServedNetwork(ip) {
if !s.conf.UsePrivateRDNS {
return "", nil
}
resolver = s.localResolvers
s.recDetector.add(*req)
}
</s> remove recursionTTL = 5 * time.Second
</s> add recursionTTL = 1 * time.Second
|
https://github.com/AdguardTeam/AdGuardHome/commit/78d47d88842b51c6a7838e96a2e3d6b18c765e77
|
internal/dnsforward/recursiondetector.go
|
keep keep add keep keep keep keep keep
|
<mask> EnableDNSSEC bool `yaml:"enable_dnssec"` // Set DNSSEC flag in outcoming DNS request
<mask> EnableEDNSClientSubnet bool `yaml:"edns_client_subnet"` // Enable EDNS Client Subnet option
<mask> MaxGoroutines uint32 `yaml:"max_goroutines"` // Max. number of parallel goroutines for processing incoming requests
<mask> }
<mask>
<mask> // TLSConfig is the TLS configuration for HTTPS, DNS-over-HTTPS, and DNS-over-TLS
<mask> type TLSConfig struct {
<mask> TLSListenAddr *net.TCPAddr `yaml:"-" json:"-"`
</s> + DNS: add "ipset" configuration setting
Close #1191
Squashed commit of the following:
commit ba14b53f9e3d98ad8127aa3af1def0da4269e8c4
Merge: 362f4c44 6b614295
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 14:03:19 2020 +0300
Merge remote-tracking branch 'origin/master' into 1191-ipset
commit 362f4c44915cb8946db2e80f9a3f5afd74fe5de1
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 12:50:56 2020 +0300
minor
commit 28e12459166fe3d13fb0dbe59ac11b7d86adb9b4
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 12:43:25 2020 +0300
minor
commit bdbd7324501f6111bea1e91eda7d730c7ea57b11
Author: Simon Zolin <[email protected]>
Date: Tue Sep 1 18:40:04 2020 +0300
move code, ipset-v6
commit 77f4d943e74b70b5bc5aea279875ab1e2fab2192
Author: Simon Zolin <[email protected]>
Date: Tue Sep 1 15:53:27 2020 +0300
comment
commit 16401325bbefeba08e447257b12a8424b78c9475
Author: Simon Zolin <[email protected]>
Date: Mon Aug 31 17:43:23 2020 +0300
minor
commit c8410e9a519b87911bc50f504e8b4aaf8dce6e02
Author: Simon Zolin <[email protected]>
Date: Mon Aug 31 15:30:52 2020 +0300
+ DNS: add "ipset" configuration setting </s> remove // 2. Set default values in the case if nothing is configured
</s> add // Set default values in the case if nothing is configured </s> remove // 3. Prepare DNS servers settings
</s> add // Initialize IPSET configuration
// --
s.ipset.init(s.conf.IPSETList)
// Prepare DNS servers settings </s> remove // 3. Create DNS proxy configuration
</s> add // Create DNS proxy configuration </s> remove // 4. Prepare a DNS proxy instance that we use for internal DNS queries
</s> add // Prepare a DNS proxy instance that we use for internal DNS queries </s> remove // 1. Initialize the server configuration
</s> add // Initialize the server configuration </s> remove // 5. Initialize DNS access module
</s> add // Initialize DNS access module
|
https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988
|
dnsforward/config.go
|
keep keep keep add keep keep keep keep keep keep
|
<mask> queryLog querylog.QueryLog // Query log instance
<mask> stats stats.Stats
<mask> access *accessCtx
<mask>
<mask> tableHostToIP map[string]net.IP // "hostname -> IP" table for internal addresses (DHCP)
<mask> tableHostToIPLock sync.Mutex
<mask>
<mask> tablePTR map[string]string // "IP -> hostname" table for reverse lookup
<mask> tablePTRLock sync.Mutex
<mask>
</s> + DNS: add "ipset" configuration setting
Close #1191
Squashed commit of the following:
commit ba14b53f9e3d98ad8127aa3af1def0da4269e8c4
Merge: 362f4c44 6b614295
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 14:03:19 2020 +0300
Merge remote-tracking branch 'origin/master' into 1191-ipset
commit 362f4c44915cb8946db2e80f9a3f5afd74fe5de1
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 12:50:56 2020 +0300
minor
commit 28e12459166fe3d13fb0dbe59ac11b7d86adb9b4
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 12:43:25 2020 +0300
minor
commit bdbd7324501f6111bea1e91eda7d730c7ea57b11
Author: Simon Zolin <[email protected]>
Date: Tue Sep 1 18:40:04 2020 +0300
move code, ipset-v6
commit 77f4d943e74b70b5bc5aea279875ab1e2fab2192
Author: Simon Zolin <[email protected]>
Date: Tue Sep 1 15:53:27 2020 +0300
comment
commit 16401325bbefeba08e447257b12a8424b78c9475
Author: Simon Zolin <[email protected]>
Date: Mon Aug 31 17:43:23 2020 +0300
minor
commit c8410e9a519b87911bc50f504e8b4aaf8dce6e02
Author: Simon Zolin <[email protected]>
Date: Mon Aug 31 15:30:52 2020 +0300
+ DNS: add "ipset" configuration setting </s> remove // 4. Prepare a DNS proxy instance that we use for internal DNS queries
</s> add // Prepare a DNS proxy instance that we use for internal DNS queries </s> remove // 5. Initialize DNS access module
</s> add // Initialize DNS access module </s> add // IPSET configuration - add IP addresses of the specified domain names to an ipset list
// Syntax:
// "DOMAIN[,DOMAIN].../IPSET_NAME"
IPSETList []string `yaml:"ipset"` </s> remove // 7. Create the main DNS proxy instance
</s> add // Create the main DNS proxy instance </s> remove // 3. Prepare DNS servers settings
</s> add // Initialize IPSET configuration
// --
s.ipset.init(s.conf.IPSETList)
// Prepare DNS servers settings </s> remove // 2. Set default values in the case if nothing is configured
</s> add // Set default values in the case if nothing is configured
|
https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988
|
dnsforward/dnsforward.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask>
<mask> // Prepare the object
<mask> func (s *Server) Prepare(config *ServerConfig) error {
<mask> // 1. Initialize the server configuration
<mask> // --
<mask> if config != nil {
<mask> s.conf = *config
<mask> if s.conf.BlockingMode == "custom_ip" {
<mask> s.conf.BlockingIPAddrv4 = net.ParseIP(s.conf.BlockingIPv4)
</s> + DNS: add "ipset" configuration setting
Close #1191
Squashed commit of the following:
commit ba14b53f9e3d98ad8127aa3af1def0da4269e8c4
Merge: 362f4c44 6b614295
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 14:03:19 2020 +0300
Merge remote-tracking branch 'origin/master' into 1191-ipset
commit 362f4c44915cb8946db2e80f9a3f5afd74fe5de1
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 12:50:56 2020 +0300
minor
commit 28e12459166fe3d13fb0dbe59ac11b7d86adb9b4
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 12:43:25 2020 +0300
minor
commit bdbd7324501f6111bea1e91eda7d730c7ea57b11
Author: Simon Zolin <[email protected]>
Date: Tue Sep 1 18:40:04 2020 +0300
move code, ipset-v6
commit 77f4d943e74b70b5bc5aea279875ab1e2fab2192
Author: Simon Zolin <[email protected]>
Date: Tue Sep 1 15:53:27 2020 +0300
comment
commit 16401325bbefeba08e447257b12a8424b78c9475
Author: Simon Zolin <[email protected]>
Date: Mon Aug 31 17:43:23 2020 +0300
minor
commit c8410e9a519b87911bc50f504e8b4aaf8dce6e02
Author: Simon Zolin <[email protected]>
Date: Mon Aug 31 15:30:52 2020 +0300
+ DNS: add "ipset" configuration setting </s> remove // 3. Create DNS proxy configuration
</s> add // Create DNS proxy configuration </s> remove // 6. Register web handlers if necessary
</s> add // Register web handlers if necessary </s> remove // 3. Prepare DNS servers settings
</s> add // Initialize IPSET configuration
// --
s.ipset.init(s.conf.IPSETList)
// Prepare DNS servers settings </s> remove // 5. Initialize DNS access module
</s> add // Initialize DNS access module </s> remove // 4. Prepare a DNS proxy instance that we use for internal DNS queries
</s> add // Prepare a DNS proxy instance that we use for internal DNS queries </s> remove // 2. Set default values in the case if nothing is configured
</s> add // Set default values in the case if nothing is configured
|
https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988
|
dnsforward/dnsforward.go
|
keep keep keep replace keep keep keep replace keep keep keep keep
|
<mask> }
<mask> }
<mask>
<mask> // 2. Set default values in the case if nothing is configured
<mask> // --
<mask> s.initDefaultSettings()
<mask>
<mask> // 3. Prepare DNS servers settings
<mask> // --
<mask> err := s.prepareUpstreamSettings()
<mask> if err != nil {
<mask> return err
</s> + DNS: add "ipset" configuration setting
Close #1191
Squashed commit of the following:
commit ba14b53f9e3d98ad8127aa3af1def0da4269e8c4
Merge: 362f4c44 6b614295
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 14:03:19 2020 +0300
Merge remote-tracking branch 'origin/master' into 1191-ipset
commit 362f4c44915cb8946db2e80f9a3f5afd74fe5de1
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 12:50:56 2020 +0300
minor
commit 28e12459166fe3d13fb0dbe59ac11b7d86adb9b4
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 12:43:25 2020 +0300
minor
commit bdbd7324501f6111bea1e91eda7d730c7ea57b11
Author: Simon Zolin <[email protected]>
Date: Tue Sep 1 18:40:04 2020 +0300
move code, ipset-v6
commit 77f4d943e74b70b5bc5aea279875ab1e2fab2192
Author: Simon Zolin <[email protected]>
Date: Tue Sep 1 15:53:27 2020 +0300
comment
commit 16401325bbefeba08e447257b12a8424b78c9475
Author: Simon Zolin <[email protected]>
Date: Mon Aug 31 17:43:23 2020 +0300
minor
commit c8410e9a519b87911bc50f504e8b4aaf8dce6e02
Author: Simon Zolin <[email protected]>
Date: Mon Aug 31 15:30:52 2020 +0300
+ DNS: add "ipset" configuration setting </s> remove // 3. Create DNS proxy configuration
</s> add // Create DNS proxy configuration </s> remove // 6. Register web handlers if necessary
</s> add // Register web handlers if necessary </s> remove // 4. Prepare a DNS proxy instance that we use for internal DNS queries
</s> add // Prepare a DNS proxy instance that we use for internal DNS queries </s> remove // 5. Initialize DNS access module
</s> add // Initialize DNS access module </s> remove // 1. Initialize the server configuration
</s> add // Initialize the server configuration
|
https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988
|
dnsforward/dnsforward.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> // 3. Create DNS proxy configuration
<mask> // --
<mask> var proxyConfig proxy.Config
<mask> proxyConfig, err = s.createProxyConfig()
<mask> if err != nil {
<mask> return err
</s> + DNS: add "ipset" configuration setting
Close #1191
Squashed commit of the following:
commit ba14b53f9e3d98ad8127aa3af1def0da4269e8c4
Merge: 362f4c44 6b614295
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 14:03:19 2020 +0300
Merge remote-tracking branch 'origin/master' into 1191-ipset
commit 362f4c44915cb8946db2e80f9a3f5afd74fe5de1
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 12:50:56 2020 +0300
minor
commit 28e12459166fe3d13fb0dbe59ac11b7d86adb9b4
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 12:43:25 2020 +0300
minor
commit bdbd7324501f6111bea1e91eda7d730c7ea57b11
Author: Simon Zolin <[email protected]>
Date: Tue Sep 1 18:40:04 2020 +0300
move code, ipset-v6
commit 77f4d943e74b70b5bc5aea279875ab1e2fab2192
Author: Simon Zolin <[email protected]>
Date: Tue Sep 1 15:53:27 2020 +0300
comment
commit 16401325bbefeba08e447257b12a8424b78c9475
Author: Simon Zolin <[email protected]>
Date: Mon Aug 31 17:43:23 2020 +0300
minor
commit c8410e9a519b87911bc50f504e8b4aaf8dce6e02
Author: Simon Zolin <[email protected]>
Date: Mon Aug 31 15:30:52 2020 +0300
+ DNS: add "ipset" configuration setting </s> remove // 6. Register web handlers if necessary
</s> add // Register web handlers if necessary </s> remove // 3. Prepare DNS servers settings
</s> add // Initialize IPSET configuration
// --
s.ipset.init(s.conf.IPSETList)
// Prepare DNS servers settings </s> remove // 5. Initialize DNS access module
</s> add // Initialize DNS access module </s> remove // 4. Prepare a DNS proxy instance that we use for internal DNS queries
</s> add // Prepare a DNS proxy instance that we use for internal DNS queries </s> remove // 7. Create the main DNS proxy instance
</s> add // Create the main DNS proxy instance </s> remove // 1. Initialize the server configuration
</s> add // Initialize the server configuration
|
https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988
|
dnsforward/dnsforward.go
|
keep keep keep keep replace keep keep keep replace keep keep keep
|
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> // 4. Prepare a DNS proxy instance that we use for internal DNS queries
<mask> // --
<mask> s.prepareIntlProxy()
<mask>
<mask> // 5. Initialize DNS access module
<mask> // --
<mask> s.access = &accessCtx{}
<mask> err = s.access.Init(s.conf.AllowedClients, s.conf.DisallowedClients, s.conf.BlockedHosts)
</s> + DNS: add "ipset" configuration setting
Close #1191
Squashed commit of the following:
commit ba14b53f9e3d98ad8127aa3af1def0da4269e8c4
Merge: 362f4c44 6b614295
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 14:03:19 2020 +0300
Merge remote-tracking branch 'origin/master' into 1191-ipset
commit 362f4c44915cb8946db2e80f9a3f5afd74fe5de1
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 12:50:56 2020 +0300
minor
commit 28e12459166fe3d13fb0dbe59ac11b7d86adb9b4
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 12:43:25 2020 +0300
minor
commit bdbd7324501f6111bea1e91eda7d730c7ea57b11
Author: Simon Zolin <[email protected]>
Date: Tue Sep 1 18:40:04 2020 +0300
move code, ipset-v6
commit 77f4d943e74b70b5bc5aea279875ab1e2fab2192
Author: Simon Zolin <[email protected]>
Date: Tue Sep 1 15:53:27 2020 +0300
comment
commit 16401325bbefeba08e447257b12a8424b78c9475
Author: Simon Zolin <[email protected]>
Date: Mon Aug 31 17:43:23 2020 +0300
minor
commit c8410e9a519b87911bc50f504e8b4aaf8dce6e02
Author: Simon Zolin <[email protected]>
Date: Mon Aug 31 15:30:52 2020 +0300
+ DNS: add "ipset" configuration setting </s> remove // 3. Create DNS proxy configuration
</s> add // Create DNS proxy configuration </s> remove // 3. Prepare DNS servers settings
</s> add // Initialize IPSET configuration
// --
s.ipset.init(s.conf.IPSETList)
// Prepare DNS servers settings </s> remove // 7. Create the main DNS proxy instance
</s> add // Create the main DNS proxy instance </s> remove // 6. Register web handlers if necessary
</s> add // Register web handlers if necessary </s> remove // 1. Initialize the server configuration
</s> add // Initialize the server configuration
|
https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988
|
dnsforward/dnsforward.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> // 6. Register web handlers if necessary
<mask> // --
<mask> if !webRegistered && s.conf.HTTPRegister != nil {
<mask> webRegistered = true
<mask> s.registerHandlers()
<mask> }
</s> + DNS: add "ipset" configuration setting
Close #1191
Squashed commit of the following:
commit ba14b53f9e3d98ad8127aa3af1def0da4269e8c4
Merge: 362f4c44 6b614295
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 14:03:19 2020 +0300
Merge remote-tracking branch 'origin/master' into 1191-ipset
commit 362f4c44915cb8946db2e80f9a3f5afd74fe5de1
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 12:50:56 2020 +0300
minor
commit 28e12459166fe3d13fb0dbe59ac11b7d86adb9b4
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 12:43:25 2020 +0300
minor
commit bdbd7324501f6111bea1e91eda7d730c7ea57b11
Author: Simon Zolin <[email protected]>
Date: Tue Sep 1 18:40:04 2020 +0300
move code, ipset-v6
commit 77f4d943e74b70b5bc5aea279875ab1e2fab2192
Author: Simon Zolin <[email protected]>
Date: Tue Sep 1 15:53:27 2020 +0300
comment
commit 16401325bbefeba08e447257b12a8424b78c9475
Author: Simon Zolin <[email protected]>
Date: Mon Aug 31 17:43:23 2020 +0300
minor
commit c8410e9a519b87911bc50f504e8b4aaf8dce6e02
Author: Simon Zolin <[email protected]>
Date: Mon Aug 31 15:30:52 2020 +0300
+ DNS: add "ipset" configuration setting </s> remove // 7. Create the main DNS proxy instance
</s> add // Create the main DNS proxy instance </s> remove // 3. Create DNS proxy configuration
</s> add // Create DNS proxy configuration </s> remove // 1. Initialize the server configuration
</s> add // Initialize the server configuration </s> remove // 3. Prepare DNS servers settings
</s> add // Initialize IPSET configuration
// --
s.ipset.init(s.conf.IPSETList)
// Prepare DNS servers settings </s> remove // 4. Prepare a DNS proxy instance that we use for internal DNS queries
</s> add // Prepare a DNS proxy instance that we use for internal DNS queries </s> remove // 5. Initialize DNS access module
</s> add // Initialize DNS access module
|
https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988
|
dnsforward/dnsforward.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> webRegistered = true
<mask> s.registerHandlers()
<mask> }
<mask>
<mask> // 7. Create the main DNS proxy instance
<mask> // --
<mask> s.dnsProxy = &proxy.Proxy{Config: proxyConfig}
<mask> return nil
<mask> }
<mask>
</s> + DNS: add "ipset" configuration setting
Close #1191
Squashed commit of the following:
commit ba14b53f9e3d98ad8127aa3af1def0da4269e8c4
Merge: 362f4c44 6b614295
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 14:03:19 2020 +0300
Merge remote-tracking branch 'origin/master' into 1191-ipset
commit 362f4c44915cb8946db2e80f9a3f5afd74fe5de1
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 12:50:56 2020 +0300
minor
commit 28e12459166fe3d13fb0dbe59ac11b7d86adb9b4
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 12:43:25 2020 +0300
minor
commit bdbd7324501f6111bea1e91eda7d730c7ea57b11
Author: Simon Zolin <[email protected]>
Date: Tue Sep 1 18:40:04 2020 +0300
move code, ipset-v6
commit 77f4d943e74b70b5bc5aea279875ab1e2fab2192
Author: Simon Zolin <[email protected]>
Date: Tue Sep 1 15:53:27 2020 +0300
comment
commit 16401325bbefeba08e447257b12a8424b78c9475
Author: Simon Zolin <[email protected]>
Date: Mon Aug 31 17:43:23 2020 +0300
minor
commit c8410e9a519b87911bc50f504e8b4aaf8dce6e02
Author: Simon Zolin <[email protected]>
Date: Mon Aug 31 15:30:52 2020 +0300
+ DNS: add "ipset" configuration setting </s> remove // 6. Register web handlers if necessary
</s> add // Register web handlers if necessary </s> remove // 3. Create DNS proxy configuration
</s> add // Create DNS proxy configuration </s> remove // 4. Prepare a DNS proxy instance that we use for internal DNS queries
</s> add // Prepare a DNS proxy instance that we use for internal DNS queries </s> remove // 5. Initialize DNS access module
</s> add // Initialize DNS access module </s> remove // 2. Set default values in the case if nothing is configured
</s> add // Set default values in the case if nothing is configured </s> remove // 3. Prepare DNS servers settings
</s> add // Initialize IPSET configuration
// --
s.ipset.init(s.conf.IPSETList)
// Prepare DNS servers settings
|
https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988
|
dnsforward/dnsforward.go
|
keep keep add keep keep keep keep keep keep
|
<mask> processUpstream,
<mask> processDNSSECAfterResponse,
<mask> processFilteringAfterResponse,
<mask> processQueryLogsAndStats,
<mask> }
<mask> for _, process := range mods {
<mask> r := process(ctx)
<mask> switch r {
<mask> case resultDone:
</s> + DNS: add "ipset" configuration setting
Close #1191
Squashed commit of the following:
commit ba14b53f9e3d98ad8127aa3af1def0da4269e8c4
Merge: 362f4c44 6b614295
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 14:03:19 2020 +0300
Merge remote-tracking branch 'origin/master' into 1191-ipset
commit 362f4c44915cb8946db2e80f9a3f5afd74fe5de1
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 12:50:56 2020 +0300
minor
commit 28e12459166fe3d13fb0dbe59ac11b7d86adb9b4
Author: Simon Zolin <[email protected]>
Date: Wed Sep 2 12:43:25 2020 +0300
minor
commit bdbd7324501f6111bea1e91eda7d730c7ea57b11
Author: Simon Zolin <[email protected]>
Date: Tue Sep 1 18:40:04 2020 +0300
move code, ipset-v6
commit 77f4d943e74b70b5bc5aea279875ab1e2fab2192
Author: Simon Zolin <[email protected]>
Date: Tue Sep 1 15:53:27 2020 +0300
comment
commit 16401325bbefeba08e447257b12a8424b78c9475
Author: Simon Zolin <[email protected]>
Date: Mon Aug 31 17:43:23 2020 +0300
minor
commit c8410e9a519b87911bc50f504e8b4aaf8dce6e02
Author: Simon Zolin <[email protected]>
Date: Mon Aug 31 15:30:52 2020 +0300
+ DNS: add "ipset" configuration setting </s> remove // 3. Prepare DNS servers settings
</s> add // Initialize IPSET configuration
// --
s.ipset.init(s.conf.IPSETList)
// Prepare DNS servers settings </s> remove // 2. Set default values in the case if nothing is configured
</s> add // Set default values in the case if nothing is configured </s> remove // 6. Register web handlers if necessary
</s> add // Register web handlers if necessary </s> remove // 1. Initialize the server configuration
</s> add // Initialize the server configuration </s> remove // 3. Create DNS proxy configuration
</s> add // Create DNS proxy configuration </s> remove // 4. Prepare a DNS proxy instance that we use for internal DNS queries
</s> add // Prepare a DNS proxy instance that we use for internal DNS queries
|
https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988
|
dnsforward/handle_dns.go
|
keep keep keep add keep keep keep keep keep keep
|
<mask> }
<mask> if err != nil {
<mask> if isConnClosed(err) {
<mask> log.Printf("ReadFrom() returned because we're reading from a closed connection, exiting loop")
<mask> break
<mask> }
<mask> log.Printf("Got error when reading from udp listen: %s", err)
<mask> }
<mask> }
<mask> }
</s> dnsforward library -- consistently nullify and close listening socket when we're done with it. </s> add s.udpListen = nil </s> add s.udpListen = nil </s> add s.udpListen = nil </s> remove s.udpListen = nil
</s> add </s> add s.udpListen = nil
|
https://github.com/AdguardTeam/AdGuardHome/commit/7944f23d9521963a954df2767321411169ae170b
|
dnsforward/dnsforward.go
|
keep keep keep add keep keep keep keep keep keep
|
<mask> addr = defaultValues.UDPListenAddr
<mask> }
<mask> s.udpListen, err = net.ListenUDP("udp", addr)
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't listen to UDP socket")
<mask> }
<mask> log.Println(s.udpListen.LocalAddr(), s.UDPListenAddr)
<mask> }
<mask>
<mask> if s.dnsFilter == nil {
</s> dnsforward library -- consistently nullify and close listening socket when we're done with it. </s> add s.udpListen = nil </s> add s.udpListen = nil </s> add s.udpListen = nil </s> remove s.udpListen = nil
</s> add </s> add var err error
s.Lock()
if s.udpListen != nil {
err = s.udpListen.Close()
s.udpListen = nil
}
s.Unlock()
if err != nil {
log.Printf("Failed to close udp connection while exiting loop: %s", err)
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/7944f23d9521963a954df2767321411169ae170b
|
dnsforward/dnsforward.go
|
keep add keep keep keep keep
|
<mask> if s.udpListen != nil {
<mask> err := s.udpListen.Close()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't close UDP listening socket")
<mask> }
<mask> }
</s> dnsforward library -- consistently nullify and close listening socket when we're done with it. </s> remove s.udpListen = nil
</s> add </s> add s.udpListen = nil </s> add s.udpListen = nil </s> add s.udpListen = nil </s> add var err error
s.Lock()
if s.udpListen != nil {
err = s.udpListen.Close()
s.udpListen = nil
}
s.Unlock()
if err != nil {
log.Printf("Failed to close udp connection while exiting loop: %s", err)
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/7944f23d9521963a954df2767321411169ae170b
|
dnsforward/dnsforward.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> err := s.udpListen.Close()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't close UDP listening socket")
<mask> }
<mask> s.udpListen = nil
<mask> }
<mask> return nil
<mask> }
<mask>
<mask> //
</s> dnsforward library -- consistently nullify and close listening socket when we're done with it. </s> add s.udpListen = nil </s> add s.udpListen = nil </s> add s.udpListen = nil </s> add s.udpListen = nil </s> add var err error
s.Lock()
if s.udpListen != nil {
err = s.udpListen.Close()
s.udpListen = nil
}
s.Unlock()
if err != nil {
log.Printf("Failed to close udp connection while exiting loop: %s", err)
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/7944f23d9521963a954df2767321411169ae170b
|
dnsforward/dnsforward.go
|
keep add keep keep keep keep keep
|
<mask> if s.udpListen != nil {
<mask> err = s.udpListen.Close()
<mask> }
<mask> s.Unlock()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't close UDP listening socket")
<mask> }
</s> dnsforward library -- consistently nullify and close listening socket when we're done with it. </s> add s.udpListen = nil </s> add s.udpListen = nil </s> remove s.udpListen = nil
</s> add </s> add s.udpListen = nil </s> add var err error
s.Lock()
if s.udpListen != nil {
err = s.udpListen.Close()
s.udpListen = nil
}
s.Unlock()
if err != nil {
log.Printf("Failed to close udp connection while exiting loop: %s", err)
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/7944f23d9521963a954df2767321411169ae170b
|
dnsforward/dnsforward.go
|
keep add keep keep keep keep keep keep
|
<mask> if s.udpListen != nil {
<mask> err = s.udpListen.Close()
<mask> }
<mask> s.Unlock()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't close UDP listening socket")
<mask> }
<mask> newListen, err = net.ListenUDP("udp", newAddr)
</s> dnsforward library -- consistently nullify and close listening socket when we're done with it. </s> add s.udpListen = nil </s> add s.udpListen = nil </s> add s.udpListen = nil </s> remove s.udpListen = nil
</s> add </s> add var err error
s.Lock()
if s.udpListen != nil {
err = s.udpListen.Close()
s.udpListen = nil
}
s.Unlock()
if err != nil {
log.Printf("Failed to close udp connection while exiting loop: %s", err)
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/7944f23d9521963a954df2767321411169ae170b
|
dnsforward/dnsforward.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> package main
<mask>
<mask> import (
<mask> "bytes"
<mask> "context"
<mask> "encoding/json"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "net"
<mask> "net/http"
</s> * control: move /install handlers to a separate file </s> remove func registerInstallHandlers() {
http.HandleFunc("/control/install/get_addresses", preInstall(ensureGET(handleInstallGetAddresses)))
http.HandleFunc("/control/install/check_config", preInstall(ensurePOST(handleInstallCheckConfig)))
http.HandleFunc("/control/install/configure", preInstall(ensurePOST(handleInstallConfigure)))
}
</s> add </s> remove type firstRunData struct {
WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"`
Interfaces map[string]interface{} `json:"interfaces"`
}
// Get initial installation settings
func handleInstallGetAddresses(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
data := firstRunData{}
data.WebPort = 80
data.DNSPort = 53
ifaces, err := getValidNetInterfacesForWeb()
if err != nil {
httpError(w, http.StatusInternalServerError, "Couldn't get interfaces: %s", err)
return
}
data.Interfaces = make(map[string]interface{})
for _, iface := range ifaces {
data.Interfaces[iface.Name] = iface
}
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Unable to marshal default addresses to json: %s", err)
return
}
}
type checkConfigReqEnt struct {
Port int `json:"port"`
IP string `json:"ip"`
Autofix bool `json:"autofix"`
}
type checkConfigReq struct {
Web checkConfigReqEnt `json:"web"`
DNS checkConfigReqEnt `json:"dns"`
}
type checkConfigRespEnt struct {
Status string `json:"status"`
CanAutofix bool `json:"can_autofix"`
}
type checkConfigResp struct {
Web checkConfigRespEnt `json:"web"`
DNS checkConfigRespEnt `json:"dns"`
}
// Check if ports are available, respond with results
func handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
reqData := checkConfigReq{}
respData := checkConfigResp{}
err := json.NewDecoder(r.Body).Decode(&reqData)
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to parse 'check_config' JSON data: %s", err)
return
}
if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort {
err = checkPortAvailable(reqData.Web.IP, reqData.Web.Port)
if err != nil {
respData.Web.Status = fmt.Sprintf("%v", err)
}
}
if reqData.DNS.Port != 0 {
err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
if errorIsAddrInUse(err) {
canAutofix := checkDNSStubListener()
if canAutofix && reqData.DNS.Autofix {
err = disableDNSStubListener()
if err != nil {
log.Error("Couldn't disable DNSStubListener: %s", err)
}
err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
canAutofix = false
}
respData.DNS.CanAutofix = canAutofix
}
if err == nil {
err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
}
if err != nil {
respData.DNS.Status = fmt.Sprintf("%v", err)
}
}
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(respData)
if err != nil {
httpError(w, http.StatusInternalServerError, "Unable to marshal JSON: %s", err)
return
}
}
// Check if DNSStubListener is active
func checkDNSStubListener() bool {
cmd := exec.Command("systemctl", "is-enabled", "systemd-resolved")
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
_, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
log.Error("command %s has failed: %v code:%d",
cmd.Path, err, cmd.ProcessState.ExitCode())
return false
}
cmd = exec.Command("grep", "-E", "#?DNSStubListener=yes", "/etc/systemd/resolved.conf")
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
_, err = cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
log.Error("command %s has failed: %v code:%d",
cmd.Path, err, cmd.ProcessState.ExitCode())
return false
}
return true
}
// Deactivate DNSStubListener
func disableDNSStubListener() error {
cmd := exec.Command("sed", "-r", "-i.orig", "s/#?DNSStubListener=yes/DNSStubListener=no/g", "/etc/systemd/resolved.conf")
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
_, err := cmd.Output()
if err != nil {
return err
}
if cmd.ProcessState.ExitCode() != 0 {
return fmt.Errorf("process %s exited with an error: %d",
cmd.Path, cmd.ProcessState.ExitCode())
}
cmd = exec.Command("systemctl", "reload-or-restart", "systemd-resolved")
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
_, err = cmd.Output()
if err != nil {
return err
}
if cmd.ProcessState.ExitCode() != 0 {
return fmt.Errorf("process %s exited with an error: %d",
cmd.Path, cmd.ProcessState.ExitCode())
}
return nil
}
type applyConfigReqEnt struct {
IP string `json:"ip"`
Port int `json:"port"`
}
type applyConfigReq struct {
Web applyConfigReqEnt `json:"web"`
DNS applyConfigReqEnt `json:"dns"`
Username string `json:"username"`
Password string `json:"password"`
}
// Copy installation parameters between two configuration objects
func copyInstallSettings(dst *configuration, src *configuration) {
dst.BindHost = src.BindHost
dst.BindPort = src.BindPort
dst.DNS.BindHost = src.DNS.BindHost
dst.DNS.Port = src.DNS.Port
dst.AuthName = src.AuthName
dst.AuthPass = src.AuthPass
}
// Apply new configuration, start DNS server, restart Web server
func handleInstallConfigure(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
newSettings := applyConfigReq{}
err := json.NewDecoder(r.Body).Decode(&newSettings)
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to parse 'configure' JSON: %s", err)
return
}
if newSettings.Web.Port == 0 || newSettings.DNS.Port == 0 {
httpError(w, http.StatusBadRequest, "port value can't be 0")
return
}
restartHTTP := true
if config.BindHost == newSettings.Web.IP && config.BindPort == newSettings.Web.Port {
// no need to rebind
restartHTTP = false
}
// validate that hosts and ports are bindable
if restartHTTP {
err = checkPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
if err != nil {
httpError(w, http.StatusBadRequest, "Impossible to listen on IP:port %s due to %s",
net.JoinHostPort(newSettings.Web.IP, strconv.Itoa(newSettings.Web.Port)), err)
return
}
}
err = checkPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
if err != nil {
httpError(w, http.StatusBadRequest, "%s", err)
return
}
err = checkPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
if err != nil {
httpError(w, http.StatusBadRequest, "%s", err)
return
}
var curConfig configuration
copyInstallSettings(&curConfig, &config)
config.firstRun = false
config.BindHost = newSettings.Web.IP
config.BindPort = newSettings.Web.Port
config.DNS.BindHost = newSettings.DNS.IP
config.DNS.Port = newSettings.DNS.Port
config.AuthName = newSettings.Username
config.AuthPass = newSettings.Password
err = startDNSServer()
if err != nil {
config.firstRun = true
copyInstallSettings(&config, &curConfig)
httpError(w, http.StatusInternalServerError, "Couldn't start DNS server: %s", err)
return
}
err = config.write()
if err != nil {
config.firstRun = true
copyInstallSettings(&config, &curConfig)
httpError(w, http.StatusInternalServerError, "Couldn't write config: %s", err)
return
}
// this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
// until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
if restartHTTP {
go func() {
httpServer.Shutdown(context.TODO())
}()
}
returnOK(w)
}
</s> add </s> remove "os/exec"
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/79b0fac01a544e35207420fed78e1c2a63d428d8
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "io/ioutil"
<mask> "net"
<mask> "net/http"
<mask> "os"
<mask> "os/exec"
<mask> "sort"
<mask> "strconv"
<mask> "strings"
<mask> "sync"
<mask> "time"
</s> * control: move /install handlers to a separate file </s> remove func registerInstallHandlers() {
http.HandleFunc("/control/install/get_addresses", preInstall(ensureGET(handleInstallGetAddresses)))
http.HandleFunc("/control/install/check_config", preInstall(ensurePOST(handleInstallCheckConfig)))
http.HandleFunc("/control/install/configure", preInstall(ensurePOST(handleInstallConfigure)))
}
</s> add </s> remove type firstRunData struct {
WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"`
Interfaces map[string]interface{} `json:"interfaces"`
}
// Get initial installation settings
func handleInstallGetAddresses(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
data := firstRunData{}
data.WebPort = 80
data.DNSPort = 53
ifaces, err := getValidNetInterfacesForWeb()
if err != nil {
httpError(w, http.StatusInternalServerError, "Couldn't get interfaces: %s", err)
return
}
data.Interfaces = make(map[string]interface{})
for _, iface := range ifaces {
data.Interfaces[iface.Name] = iface
}
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Unable to marshal default addresses to json: %s", err)
return
}
}
type checkConfigReqEnt struct {
Port int `json:"port"`
IP string `json:"ip"`
Autofix bool `json:"autofix"`
}
type checkConfigReq struct {
Web checkConfigReqEnt `json:"web"`
DNS checkConfigReqEnt `json:"dns"`
}
type checkConfigRespEnt struct {
Status string `json:"status"`
CanAutofix bool `json:"can_autofix"`
}
type checkConfigResp struct {
Web checkConfigRespEnt `json:"web"`
DNS checkConfigRespEnt `json:"dns"`
}
// Check if ports are available, respond with results
func handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
reqData := checkConfigReq{}
respData := checkConfigResp{}
err := json.NewDecoder(r.Body).Decode(&reqData)
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to parse 'check_config' JSON data: %s", err)
return
}
if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort {
err = checkPortAvailable(reqData.Web.IP, reqData.Web.Port)
if err != nil {
respData.Web.Status = fmt.Sprintf("%v", err)
}
}
if reqData.DNS.Port != 0 {
err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
if errorIsAddrInUse(err) {
canAutofix := checkDNSStubListener()
if canAutofix && reqData.DNS.Autofix {
err = disableDNSStubListener()
if err != nil {
log.Error("Couldn't disable DNSStubListener: %s", err)
}
err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
canAutofix = false
}
respData.DNS.CanAutofix = canAutofix
}
if err == nil {
err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
}
if err != nil {
respData.DNS.Status = fmt.Sprintf("%v", err)
}
}
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(respData)
if err != nil {
httpError(w, http.StatusInternalServerError, "Unable to marshal JSON: %s", err)
return
}
}
// Check if DNSStubListener is active
func checkDNSStubListener() bool {
cmd := exec.Command("systemctl", "is-enabled", "systemd-resolved")
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
_, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
log.Error("command %s has failed: %v code:%d",
cmd.Path, err, cmd.ProcessState.ExitCode())
return false
}
cmd = exec.Command("grep", "-E", "#?DNSStubListener=yes", "/etc/systemd/resolved.conf")
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
_, err = cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
log.Error("command %s has failed: %v code:%d",
cmd.Path, err, cmd.ProcessState.ExitCode())
return false
}
return true
}
// Deactivate DNSStubListener
func disableDNSStubListener() error {
cmd := exec.Command("sed", "-r", "-i.orig", "s/#?DNSStubListener=yes/DNSStubListener=no/g", "/etc/systemd/resolved.conf")
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
_, err := cmd.Output()
if err != nil {
return err
}
if cmd.ProcessState.ExitCode() != 0 {
return fmt.Errorf("process %s exited with an error: %d",
cmd.Path, cmd.ProcessState.ExitCode())
}
cmd = exec.Command("systemctl", "reload-or-restart", "systemd-resolved")
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
_, err = cmd.Output()
if err != nil {
return err
}
if cmd.ProcessState.ExitCode() != 0 {
return fmt.Errorf("process %s exited with an error: %d",
cmd.Path, cmd.ProcessState.ExitCode())
}
return nil
}
type applyConfigReqEnt struct {
IP string `json:"ip"`
Port int `json:"port"`
}
type applyConfigReq struct {
Web applyConfigReqEnt `json:"web"`
DNS applyConfigReqEnt `json:"dns"`
Username string `json:"username"`
Password string `json:"password"`
}
// Copy installation parameters between two configuration objects
func copyInstallSettings(dst *configuration, src *configuration) {
dst.BindHost = src.BindHost
dst.BindPort = src.BindPort
dst.DNS.BindHost = src.DNS.BindHost
dst.DNS.Port = src.DNS.Port
dst.AuthName = src.AuthName
dst.AuthPass = src.AuthPass
}
// Apply new configuration, start DNS server, restart Web server
func handleInstallConfigure(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
newSettings := applyConfigReq{}
err := json.NewDecoder(r.Body).Decode(&newSettings)
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to parse 'configure' JSON: %s", err)
return
}
if newSettings.Web.Port == 0 || newSettings.DNS.Port == 0 {
httpError(w, http.StatusBadRequest, "port value can't be 0")
return
}
restartHTTP := true
if config.BindHost == newSettings.Web.IP && config.BindPort == newSettings.Web.Port {
// no need to rebind
restartHTTP = false
}
// validate that hosts and ports are bindable
if restartHTTP {
err = checkPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
if err != nil {
httpError(w, http.StatusBadRequest, "Impossible to listen on IP:port %s due to %s",
net.JoinHostPort(newSettings.Web.IP, strconv.Itoa(newSettings.Web.Port)), err)
return
}
}
err = checkPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
if err != nil {
httpError(w, http.StatusBadRequest, "%s", err)
return
}
err = checkPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
if err != nil {
httpError(w, http.StatusBadRequest, "%s", err)
return
}
var curConfig configuration
copyInstallSettings(&curConfig, &config)
config.firstRun = false
config.BindHost = newSettings.Web.IP
config.BindPort = newSettings.Web.Port
config.DNS.BindHost = newSettings.DNS.IP
config.DNS.Port = newSettings.DNS.Port
config.AuthName = newSettings.Username
config.AuthPass = newSettings.Password
err = startDNSServer()
if err != nil {
config.firstRun = true
copyInstallSettings(&config, &curConfig)
httpError(w, http.StatusInternalServerError, "Couldn't start DNS server: %s", err)
return
}
err = config.write()
if err != nil {
config.firstRun = true
copyInstallSettings(&config, &curConfig)
httpError(w, http.StatusInternalServerError, "Couldn't write config: %s", err)
return
}
// this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
// until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
if restartHTTP {
go func() {
httpServer.Shutdown(context.TODO())
}()
}
returnOK(w)
}
</s> add </s> remove "context"
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/79b0fac01a544e35207420fed78e1c2a63d428d8
|
control.go
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> return
<mask> }
<mask> }
<mask>
<mask> type firstRunData struct {
<mask> WebPort int `json:"web_port"`
<mask> DNSPort int `json:"dns_port"`
<mask> Interfaces map[string]interface{} `json:"interfaces"`
<mask> }
<mask>
<mask> // Get initial installation settings
<mask> func handleInstallGetAddresses(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
<mask> data := firstRunData{}
<mask> data.WebPort = 80
<mask> data.DNSPort = 53
<mask>
<mask> ifaces, err := getValidNetInterfacesForWeb()
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "Couldn't get interfaces: %s", err)
<mask> return
<mask> }
<mask>
<mask> data.Interfaces = make(map[string]interface{})
<mask> for _, iface := range ifaces {
<mask> data.Interfaces[iface.Name] = iface
<mask> }
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> err = json.NewEncoder(w).Encode(data)
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "Unable to marshal default addresses to json: %s", err)
<mask> return
<mask> }
<mask> }
<mask>
<mask> type checkConfigReqEnt struct {
<mask> Port int `json:"port"`
<mask> IP string `json:"ip"`
<mask> Autofix bool `json:"autofix"`
<mask> }
<mask> type checkConfigReq struct {
<mask> Web checkConfigReqEnt `json:"web"`
<mask> DNS checkConfigReqEnt `json:"dns"`
<mask> }
<mask>
<mask> type checkConfigRespEnt struct {
<mask> Status string `json:"status"`
<mask> CanAutofix bool `json:"can_autofix"`
<mask> }
<mask> type checkConfigResp struct {
<mask> Web checkConfigRespEnt `json:"web"`
<mask> DNS checkConfigRespEnt `json:"dns"`
<mask> }
<mask>
<mask> // Check if ports are available, respond with results
<mask> func handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
<mask> reqData := checkConfigReq{}
<mask> respData := checkConfigResp{}
<mask> err := json.NewDecoder(r.Body).Decode(&reqData)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Failed to parse 'check_config' JSON data: %s", err)
<mask> return
<mask> }
<mask>
<mask> if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort {
<mask> err = checkPortAvailable(reqData.Web.IP, reqData.Web.Port)
<mask> if err != nil {
<mask> respData.Web.Status = fmt.Sprintf("%v", err)
<mask> }
<mask> }
<mask>
<mask> if reqData.DNS.Port != 0 {
<mask> err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
<mask>
<mask> if errorIsAddrInUse(err) {
<mask> canAutofix := checkDNSStubListener()
<mask> if canAutofix && reqData.DNS.Autofix {
<mask>
<mask> err = disableDNSStubListener()
<mask> if err != nil {
<mask> log.Error("Couldn't disable DNSStubListener: %s", err)
<mask> }
<mask>
<mask> err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
<mask> canAutofix = false
<mask> }
<mask>
<mask> respData.DNS.CanAutofix = canAutofix
<mask> }
<mask>
<mask> if err == nil {
<mask> err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
<mask> }
<mask>
<mask> if err != nil {
<mask> respData.DNS.Status = fmt.Sprintf("%v", err)
<mask> }
<mask> }
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> err = json.NewEncoder(w).Encode(respData)
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "Unable to marshal JSON: %s", err)
<mask> return
<mask> }
<mask> }
<mask>
<mask> // Check if DNSStubListener is active
<mask> func checkDNSStubListener() bool {
<mask> cmd := exec.Command("systemctl", "is-enabled", "systemd-resolved")
<mask> log.Tracef("executing %s %v", cmd.Path, cmd.Args)
<mask> _, err := cmd.Output()
<mask> if err != nil || cmd.ProcessState.ExitCode() != 0 {
<mask> log.Error("command %s has failed: %v code:%d",
<mask> cmd.Path, err, cmd.ProcessState.ExitCode())
<mask> return false
<mask> }
<mask>
<mask> cmd = exec.Command("grep", "-E", "#?DNSStubListener=yes", "/etc/systemd/resolved.conf")
<mask> log.Tracef("executing %s %v", cmd.Path, cmd.Args)
<mask> _, err = cmd.Output()
<mask> if err != nil || cmd.ProcessState.ExitCode() != 0 {
<mask> log.Error("command %s has failed: %v code:%d",
<mask> cmd.Path, err, cmd.ProcessState.ExitCode())
<mask> return false
<mask> }
<mask>
<mask> return true
<mask> }
<mask>
<mask> // Deactivate DNSStubListener
<mask> func disableDNSStubListener() error {
<mask> cmd := exec.Command("sed", "-r", "-i.orig", "s/#?DNSStubListener=yes/DNSStubListener=no/g", "/etc/systemd/resolved.conf")
<mask> log.Tracef("executing %s %v", cmd.Path, cmd.Args)
<mask> _, err := cmd.Output()
<mask> if err != nil {
<mask> return err
<mask> }
<mask> if cmd.ProcessState.ExitCode() != 0 {
<mask> return fmt.Errorf("process %s exited with an error: %d",
<mask> cmd.Path, cmd.ProcessState.ExitCode())
<mask> }
<mask>
<mask> cmd = exec.Command("systemctl", "reload-or-restart", "systemd-resolved")
<mask> log.Tracef("executing %s %v", cmd.Path, cmd.Args)
<mask> _, err = cmd.Output()
<mask> if err != nil {
<mask> return err
<mask> }
<mask> if cmd.ProcessState.ExitCode() != 0 {
<mask> return fmt.Errorf("process %s exited with an error: %d",
<mask> cmd.Path, cmd.ProcessState.ExitCode())
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
<mask> type applyConfigReqEnt struct {
<mask> IP string `json:"ip"`
<mask> Port int `json:"port"`
<mask> }
<mask> type applyConfigReq struct {
<mask> Web applyConfigReqEnt `json:"web"`
<mask> DNS applyConfigReqEnt `json:"dns"`
<mask> Username string `json:"username"`
<mask> Password string `json:"password"`
<mask> }
<mask>
<mask> // Copy installation parameters between two configuration objects
<mask> func copyInstallSettings(dst *configuration, src *configuration) {
<mask> dst.BindHost = src.BindHost
<mask> dst.BindPort = src.BindPort
<mask> dst.DNS.BindHost = src.DNS.BindHost
<mask> dst.DNS.Port = src.DNS.Port
<mask> dst.AuthName = src.AuthName
<mask> dst.AuthPass = src.AuthPass
<mask> }
<mask>
<mask> // Apply new configuration, start DNS server, restart Web server
<mask> func handleInstallConfigure(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
<mask> newSettings := applyConfigReq{}
<mask> err := json.NewDecoder(r.Body).Decode(&newSettings)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Failed to parse 'configure' JSON: %s", err)
<mask> return
<mask> }
<mask>
<mask> if newSettings.Web.Port == 0 || newSettings.DNS.Port == 0 {
<mask> httpError(w, http.StatusBadRequest, "port value can't be 0")
<mask> return
<mask> }
<mask>
<mask> restartHTTP := true
<mask> if config.BindHost == newSettings.Web.IP && config.BindPort == newSettings.Web.Port {
<mask> // no need to rebind
<mask> restartHTTP = false
<mask> }
<mask>
<mask> // validate that hosts and ports are bindable
<mask> if restartHTTP {
<mask> err = checkPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Impossible to listen on IP:port %s due to %s",
<mask> net.JoinHostPort(newSettings.Web.IP, strconv.Itoa(newSettings.Web.Port)), err)
<mask> return
<mask> }
<mask> }
<mask>
<mask> err = checkPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "%s", err)
<mask> return
<mask> }
<mask>
<mask> err = checkPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "%s", err)
<mask> return
<mask> }
<mask>
<mask> var curConfig configuration
<mask> copyInstallSettings(&curConfig, &config)
<mask>
<mask> config.firstRun = false
<mask> config.BindHost = newSettings.Web.IP
<mask> config.BindPort = newSettings.Web.Port
<mask> config.DNS.BindHost = newSettings.DNS.IP
<mask> config.DNS.Port = newSettings.DNS.Port
<mask> config.AuthName = newSettings.Username
<mask> config.AuthPass = newSettings.Password
<mask>
<mask> err = startDNSServer()
<mask> if err != nil {
<mask> config.firstRun = true
<mask> copyInstallSettings(&config, &curConfig)
<mask> httpError(w, http.StatusInternalServerError, "Couldn't start DNS server: %s", err)
<mask> return
<mask> }
<mask>
<mask> err = config.write()
<mask> if err != nil {
<mask> config.firstRun = true
<mask> copyInstallSettings(&config, &curConfig)
<mask> httpError(w, http.StatusInternalServerError, "Couldn't write config: %s", err)
<mask> return
<mask> }
<mask>
<mask> // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
<mask> // until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
<mask> if restartHTTP {
<mask> go func() {
<mask> httpServer.Shutdown(context.TODO())
<mask> }()
<mask> }
<mask>
<mask> returnOK(w)
<mask> }
<mask>
<mask> // --------------
<mask> // DNS-over-HTTPS
<mask> // --------------
<mask> func handleDOH(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
</s> * control: move /install handlers to a separate file </s> remove func registerInstallHandlers() {
http.HandleFunc("/control/install/get_addresses", preInstall(ensureGET(handleInstallGetAddresses)))
http.HandleFunc("/control/install/check_config", preInstall(ensurePOST(handleInstallCheckConfig)))
http.HandleFunc("/control/install/configure", preInstall(ensurePOST(handleInstallConfigure)))
}
</s> add </s> remove "os/exec"
</s> add </s> remove "context"
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/79b0fac01a544e35207420fed78e1c2a63d428d8
|
control.go
|
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep
|
<mask>
<mask> // ------------------------
<mask> // registration of handlers
<mask> // ------------------------
<mask> func registerInstallHandlers() {
<mask> http.HandleFunc("/control/install/get_addresses", preInstall(ensureGET(handleInstallGetAddresses)))
<mask> http.HandleFunc("/control/install/check_config", preInstall(ensurePOST(handleInstallCheckConfig)))
<mask> http.HandleFunc("/control/install/configure", preInstall(ensurePOST(handleInstallConfigure)))
<mask> }
<mask>
<mask> func registerControlHandlers() {
<mask> http.HandleFunc("/control/status", postInstall(optionalAuth(ensureGET(handleStatus))))
<mask> http.HandleFunc("/control/enable_protection", postInstall(optionalAuth(ensurePOST(handleProtectionEnable))))
<mask> http.HandleFunc("/control/disable_protection", postInstall(optionalAuth(ensurePOST(handleProtectionDisable))))
<mask> http.Handle("/control/querylog", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(ensureGETHandler(handleQueryLog)))))
</s> * control: move /install handlers to a separate file </s> remove type firstRunData struct {
WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"`
Interfaces map[string]interface{} `json:"interfaces"`
}
// Get initial installation settings
func handleInstallGetAddresses(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
data := firstRunData{}
data.WebPort = 80
data.DNSPort = 53
ifaces, err := getValidNetInterfacesForWeb()
if err != nil {
httpError(w, http.StatusInternalServerError, "Couldn't get interfaces: %s", err)
return
}
data.Interfaces = make(map[string]interface{})
for _, iface := range ifaces {
data.Interfaces[iface.Name] = iface
}
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Unable to marshal default addresses to json: %s", err)
return
}
}
type checkConfigReqEnt struct {
Port int `json:"port"`
IP string `json:"ip"`
Autofix bool `json:"autofix"`
}
type checkConfigReq struct {
Web checkConfigReqEnt `json:"web"`
DNS checkConfigReqEnt `json:"dns"`
}
type checkConfigRespEnt struct {
Status string `json:"status"`
CanAutofix bool `json:"can_autofix"`
}
type checkConfigResp struct {
Web checkConfigRespEnt `json:"web"`
DNS checkConfigRespEnt `json:"dns"`
}
// Check if ports are available, respond with results
func handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
reqData := checkConfigReq{}
respData := checkConfigResp{}
err := json.NewDecoder(r.Body).Decode(&reqData)
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to parse 'check_config' JSON data: %s", err)
return
}
if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort {
err = checkPortAvailable(reqData.Web.IP, reqData.Web.Port)
if err != nil {
respData.Web.Status = fmt.Sprintf("%v", err)
}
}
if reqData.DNS.Port != 0 {
err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
if errorIsAddrInUse(err) {
canAutofix := checkDNSStubListener()
if canAutofix && reqData.DNS.Autofix {
err = disableDNSStubListener()
if err != nil {
log.Error("Couldn't disable DNSStubListener: %s", err)
}
err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
canAutofix = false
}
respData.DNS.CanAutofix = canAutofix
}
if err == nil {
err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
}
if err != nil {
respData.DNS.Status = fmt.Sprintf("%v", err)
}
}
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(respData)
if err != nil {
httpError(w, http.StatusInternalServerError, "Unable to marshal JSON: %s", err)
return
}
}
// Check if DNSStubListener is active
func checkDNSStubListener() bool {
cmd := exec.Command("systemctl", "is-enabled", "systemd-resolved")
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
_, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
log.Error("command %s has failed: %v code:%d",
cmd.Path, err, cmd.ProcessState.ExitCode())
return false
}
cmd = exec.Command("grep", "-E", "#?DNSStubListener=yes", "/etc/systemd/resolved.conf")
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
_, err = cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
log.Error("command %s has failed: %v code:%d",
cmd.Path, err, cmd.ProcessState.ExitCode())
return false
}
return true
}
// Deactivate DNSStubListener
func disableDNSStubListener() error {
cmd := exec.Command("sed", "-r", "-i.orig", "s/#?DNSStubListener=yes/DNSStubListener=no/g", "/etc/systemd/resolved.conf")
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
_, err := cmd.Output()
if err != nil {
return err
}
if cmd.ProcessState.ExitCode() != 0 {
return fmt.Errorf("process %s exited with an error: %d",
cmd.Path, cmd.ProcessState.ExitCode())
}
cmd = exec.Command("systemctl", "reload-or-restart", "systemd-resolved")
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
_, err = cmd.Output()
if err != nil {
return err
}
if cmd.ProcessState.ExitCode() != 0 {
return fmt.Errorf("process %s exited with an error: %d",
cmd.Path, cmd.ProcessState.ExitCode())
}
return nil
}
type applyConfigReqEnt struct {
IP string `json:"ip"`
Port int `json:"port"`
}
type applyConfigReq struct {
Web applyConfigReqEnt `json:"web"`
DNS applyConfigReqEnt `json:"dns"`
Username string `json:"username"`
Password string `json:"password"`
}
// Copy installation parameters between two configuration objects
func copyInstallSettings(dst *configuration, src *configuration) {
dst.BindHost = src.BindHost
dst.BindPort = src.BindPort
dst.DNS.BindHost = src.DNS.BindHost
dst.DNS.Port = src.DNS.Port
dst.AuthName = src.AuthName
dst.AuthPass = src.AuthPass
}
// Apply new configuration, start DNS server, restart Web server
func handleInstallConfigure(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
newSettings := applyConfigReq{}
err := json.NewDecoder(r.Body).Decode(&newSettings)
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to parse 'configure' JSON: %s", err)
return
}
if newSettings.Web.Port == 0 || newSettings.DNS.Port == 0 {
httpError(w, http.StatusBadRequest, "port value can't be 0")
return
}
restartHTTP := true
if config.BindHost == newSettings.Web.IP && config.BindPort == newSettings.Web.Port {
// no need to rebind
restartHTTP = false
}
// validate that hosts and ports are bindable
if restartHTTP {
err = checkPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
if err != nil {
httpError(w, http.StatusBadRequest, "Impossible to listen on IP:port %s due to %s",
net.JoinHostPort(newSettings.Web.IP, strconv.Itoa(newSettings.Web.Port)), err)
return
}
}
err = checkPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
if err != nil {
httpError(w, http.StatusBadRequest, "%s", err)
return
}
err = checkPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
if err != nil {
httpError(w, http.StatusBadRequest, "%s", err)
return
}
var curConfig configuration
copyInstallSettings(&curConfig, &config)
config.firstRun = false
config.BindHost = newSettings.Web.IP
config.BindPort = newSettings.Web.Port
config.DNS.BindHost = newSettings.DNS.IP
config.DNS.Port = newSettings.DNS.Port
config.AuthName = newSettings.Username
config.AuthPass = newSettings.Password
err = startDNSServer()
if err != nil {
config.firstRun = true
copyInstallSettings(&config, &curConfig)
httpError(w, http.StatusInternalServerError, "Couldn't start DNS server: %s", err)
return
}
err = config.write()
if err != nil {
config.firstRun = true
copyInstallSettings(&config, &curConfig)
httpError(w, http.StatusInternalServerError, "Couldn't write config: %s", err)
return
}
// this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
// until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
if restartHTTP {
go func() {
httpServer.Shutdown(context.TODO())
}()
}
returnOK(w)
}
</s> add </s> remove "os/exec"
</s> add </s> remove "context"
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/79b0fac01a544e35207420fed78e1c2a63d428d8
|
control.go
|
keep add keep keep keep keep keep keep
|
<mask> </div>
<mask> </div>
<mask> <div className="col-12">
<mask> <div className="form__group form__group--settings">
<mask> <Field
<mask> name="disable_ipv6"
<mask> type="checkbox"
<mask> component={renderSelectField}
</s> + client: handle DNSSEC setting </s> add dnssec_enabled: false, </s> add dnssec_enabled, </s> add dnssec_enabled,
|
https://github.com/AdguardTeam/AdGuardHome/commit/79bfa6a72b6cda8c0f5211a3a6df0293c4b6c7d1
|
client/src/components/Settings/Dns/Config/Form.js
|
keep add keep keep keep keep
|
<mask> blocking_ipv6,
<mask> edns_cs_enabled,
<mask> disable_ipv6,
<mask> processingSetConfig,
<mask> } = dnsConfig;
<mask>
</s> + client: handle DNSSEC setting </s> add dnssec_enabled: false, </s> add dnssec_enabled, </s> add <div className="col-12">
<div className="form__group form__group--settings">
<Field
name="dnssec_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('dnssec_enable')}
disabled={processing}
subtitle={t('dnssec_enable_desc')}
/>
</div>
</div>
|
https://github.com/AdguardTeam/AdGuardHome/commit/79bfa6a72b6cda8c0f5211a3a6df0293c4b6c7d1
|
client/src/components/Settings/Dns/Config/index.js
|
keep keep add keep keep keep keep keep keep
|
<mask> blocking_ipv6,
<mask> edns_cs_enabled,
<mask> disable_ipv6,
<mask> }}
<mask> onSubmit={handleFormSubmit}
<mask> processing={processingSetConfig}
<mask> />
<mask> </div>
<mask> </Card>
</s> + client: handle DNSSEC setting </s> add dnssec_enabled: false, </s> add dnssec_enabled, </s> add <div className="col-12">
<div className="form__group form__group--settings">
<Field
name="dnssec_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('dnssec_enable')}
disabled={processing}
subtitle={t('dnssec_enable_desc')}
/>
</div>
</div>
|
https://github.com/AdguardTeam/AdGuardHome/commit/79bfa6a72b6cda8c0f5211a3a6df0293c4b6c7d1
|
client/src/components/Settings/Dns/Config/index.js
|
keep keep keep add keep keep keep keep
|
<mask> blocking_ipv4: DEFAULT_BLOCKING_IPV4,
<mask> blocking_ipv6: DEFAULT_BLOCKING_IPV6,
<mask> edns_cs_enabled: false,
<mask> disable_ipv6: false,
<mask> },
<mask> );
<mask>
<mask> export default dnsConfig;
</s> + client: handle DNSSEC setting </s> add dnssec_enabled, </s> add dnssec_enabled, </s> add <div className="col-12">
<div className="form__group form__group--settings">
<Field
name="dnssec_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('dnssec_enable')}
disabled={processing}
subtitle={t('dnssec_enable_desc')}
/>
</div>
</div>
|
https://github.com/AdguardTeam/AdGuardHome/commit/79bfa6a72b6cda8c0f5211a3a6df0293c4b6c7d1
|
client/src/reducers/dnsConfig.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "local_ptr_title": "Private reverse 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> "use_private_ptr_resolvers_title": "Use private rDNS resolvers",
<mask> "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.",
<mask> "check_dhcp_servers": "Check for DHCP servers",
<mask> "save_config": "Save configuration",
<mask> "enabled_dhcp": "DHCP server enabled",
</s> Pull request: client: fix, upd i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit d4357830bec6f1c4882d9b65d2926a9074d67d45
Author: Ainar Garipov <[email protected]>
Date: Wed May 26 18:45:22 2021 +0300
client: fix more
commit 04e57baf7fd692923f7ec04f708c4011aef009c0
Author: Ainar Garipov <[email protected]>
Date: Wed May 26 18:29:39 2021 +0300
client: fix, upd i18n </s> remove "show_whitelisted_responses": "Whitelisted",
</s> add "show_whitelisted_responses": "Allowed", </s> remove "filter_category_security_desc": "Lists that specialize on blocking malware, phishing, or scam domains",
</s> add "filter_category_security_desc": "Lists designed specifically to block malicious, phishing, and scam domains", </s> remove "host_whitelisted": "The host is whitelisted",
</s> add "host_whitelisted": "The host is allowed",
|
https://github.com/AdguardTeam/AdGuardHome/commit/7a48e92e4d3404feefd5702a485461b39aecd0a4
|
client/src/__locales/en.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "form_enter_host": "Enter a host name",
<mask> "filtered_custom_rules": "Filtered by Custom filtering rules",
<mask> "choose_from_list": "Choose from the list",
<mask> "add_custom_list": "Add a custom list",
<mask> "host_whitelisted": "The host is whitelisted",
<mask> "check_ip": "IP addresses: {{ip}}",
<mask> "check_cname": "CNAME: {{cname}}",
<mask> "check_reason": "Reason: {{reason}}",
<mask> "check_service": "Service name: {{service}}",
<mask> "service_name": "Service name",
</s> Pull request: client: fix, upd i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit d4357830bec6f1c4882d9b65d2926a9074d67d45
Author: Ainar Garipov <[email protected]>
Date: Wed May 26 18:45:22 2021 +0300
client: fix more
commit 04e57baf7fd692923f7ec04f708c4011aef009c0
Author: Ainar Garipov <[email protected]>
Date: Wed May 26 18:29:39 2021 +0300
client: fix, upd i18n </s> remove "show_whitelisted_responses": "Whitelisted",
</s> add "show_whitelisted_responses": "Allowed", </s> remove "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).",
</s> add "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 servers for clients with public IP addresses).", </s> remove "filter_category_security_desc": "Lists that specialize on blocking malware, phishing, or scam domains",
</s> add "filter_category_security_desc": "Lists designed specifically to block malicious, phishing, and scam domains",
|
https://github.com/AdguardTeam/AdGuardHome/commit/7a48e92e4d3404feefd5702a485461b39aecd0a4
|
client/src/__locales/en.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "dnssec_enable_desc": "Set DNSSEC flag in the outcoming DNS queries and check the result (DNSSEC-enabled resolver is required)",
<mask> "validated_with_dnssec": "Validated with DNSSEC",
<mask> "all_queries": "All queries",
<mask> "show_blocked_responses": "Blocked",
<mask> "show_whitelisted_responses": "Whitelisted",
<mask> "show_processed_responses": "Processed",
<mask> "blocked_safebrowsing": "Blocked by Safebrowsing",
<mask> "blocked_adult_websites": "Blocked Adult Websites",
<mask> "blocked_threats": "Blocked Threats",
<mask> "allowed": "Allowed",
</s> Pull request: client: fix, upd i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit d4357830bec6f1c4882d9b65d2926a9074d67d45
Author: Ainar Garipov <[email protected]>
Date: Wed May 26 18:45:22 2021 +0300
client: fix more
commit 04e57baf7fd692923f7ec04f708c4011aef009c0
Author: Ainar Garipov <[email protected]>
Date: Wed May 26 18:29:39 2021 +0300
client: fix, upd i18n </s> remove "filter_category_security_desc": "Lists that specialize on blocking malware, phishing, or scam domains",
</s> add "filter_category_security_desc": "Lists designed specifically to block malicious, phishing, and scam domains", </s> remove "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).",
</s> add "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 servers for clients with public IP addresses).", </s> remove "host_whitelisted": "The host is whitelisted",
</s> add "host_whitelisted": "The host is allowed",
|
https://github.com/AdguardTeam/AdGuardHome/commit/7a48e92e4d3404feefd5702a485461b39aecd0a4
|
client/src/__locales/en.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "filter_category_security": "Security",
<mask> "filter_category_regional": "Regional",
<mask> "filter_category_other": "Other",
<mask> "filter_category_general_desc": "Lists that block tracking and advertising on most of the devices",
<mask> "filter_category_security_desc": "Lists that specialize on blocking malware, phishing, or scam domains",
<mask> "filter_category_regional_desc": "Lists that focus on regional ads and tracking servers",
<mask> "filter_category_other_desc": "Other blocklists",
<mask> "setup_config_to_enable_dhcp_server": "Setup configuration to enable DHCP server",
<mask> "original_response": "Original response",
<mask> "click_to_view_queries": "Click to view queries",
</s> Pull request: client: fix, upd i18n
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit d4357830bec6f1c4882d9b65d2926a9074d67d45
Author: Ainar Garipov <[email protected]>
Date: Wed May 26 18:45:22 2021 +0300
client: fix more
commit 04e57baf7fd692923f7ec04f708c4011aef009c0
Author: Ainar Garipov <[email protected]>
Date: Wed May 26 18:29:39 2021 +0300
client: fix, upd i18n </s> remove "show_whitelisted_responses": "Whitelisted",
</s> add "show_whitelisted_responses": "Allowed", </s> remove "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).",
</s> add "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 servers for clients with public IP addresses).", </s> remove "host_whitelisted": "The host is whitelisted",
</s> add "host_whitelisted": "The host is allowed",
|
https://github.com/AdguardTeam/AdGuardHome/commit/7a48e92e4d3404feefd5702a485461b39aecd0a4
|
client/src/__locales/en.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> s.leasesLock.Lock()
<mask> defer s.leasesLock.Unlock()
<mask>
<mask> if s.findReservedHWaddr(l.IP) != nil {
<mask> return fmt.Errorf("IP is already used")
<mask> }
<mask> s.leases = append(s.leases, &l)
<mask> s.reserveIP(l.IP, l.HWAddr)
<mask> s.dbStore()
<mask> return nil
</s> * dhcp: when adding a static lease, it can replace a dynamic lease </s> remove var newLeases []*Lease
for _, lease := range s.leases {
if bytes.Equal(lease.IP.To4(), l.IP) {
if !bytes.Equal(lease.HWAddr, l.HWAddr) ||
lease.Hostname != l.Hostname {
return fmt.Errorf("Lease not found")
}
continue
}
newLeases = append(newLeases, lease)
</s> add err := s.rmLease(l)
if err != nil {
return err </s> remove s.leases = newLeases
s.unreserveIP(l.IP)
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/7acbeb89569cd0260a0e21eae3a2439b419c2e24
|
dhcpd/dhcpd.go
|
keep replace replace replace replace replace replace replace replace replace replace keep replace replace keep keep
|
<mask>
<mask> var newLeases []*Lease
<mask> for _, lease := range s.leases {
<mask> if bytes.Equal(lease.IP.To4(), l.IP) {
<mask> if !bytes.Equal(lease.HWAddr, l.HWAddr) ||
<mask> lease.Hostname != l.Hostname {
<mask> return fmt.Errorf("Lease not found")
<mask> }
<mask> continue
<mask> }
<mask> newLeases = append(newLeases, lease)
<mask> }
<mask> s.leases = newLeases
<mask> s.unreserveIP(l.IP)
<mask> s.dbStore()
<mask> return nil
</s> * dhcp: when adding a static lease, it can replace a dynamic lease </s> remove return fmt.Errorf("IP is already used")
</s> add err := s.rmDynamicLeaseWithIP(l.IP)
if err != nil {
return err
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/7acbeb89569cd0260a0e21eae3a2439b419c2e24
|
dhcpd/dhcpd.go
|
keep keep add keep keep keep keep keep
|
<mask> // origReqDNSSEC shows if the DNSSEC flag in the original request from
<mask> // the client is set.
<mask> origReqDNSSEC bool
<mask> }
<mask>
<mask> // resultCode is the result of a request processing function.
<mask> type resultCode int
<mask>
</s> Pull request: 2889 internal hosts restriction
Merge in DNS/adguard-home from 2889-imp-autohosts to master
Closes #2889.
Squashed commit of the following:
commit 1d3b649364f991c092851c02d99827769cce8b70
Merge: abc6e1c8 1a214eaa
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:59:51 2021 +0300
Merge branch 'master' into 2889-imp-autohosts
commit abc6e1c8830e41a774c6d239ddd7b722b29df93e
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:34:56 2021 +0300
dnsforward: imp code
commit 4b2b9140d3e2526a935216ba42faba9b86b9ef3f
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:31:34 2021 +0300
dnsforward: respond with nxdomain
commit 814667417a1b02c152a034852858b96412874f85
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 6 19:16:14 2021 +0300
dnsforward: restrict the access to intl hosts for ext clients </s> add // processDetermineLocal determines if the client's IP address is from
// locally-served network and saves the result into the context.
func (s *Server) processDetermineLocal(dctx *dnsContext) (rc resultCode) {
rc = resultCodeSuccess
var ip net.IP
if ip = IPFromAddr(dctx.proxyCtx.Addr); ip == nil {
return rc
}
dctx.isLocalClient = s.subnetDetector.IsLocallyServedNetwork(ip)
return rc
}
</s> remove return resultCodeSuccess
</s> add // TODO(e.burkov): Inspect special cases when user want to apply
// some rules handled by other processors to the hosts with TLD.
d.Res = s.genNXDomain(req)
return resultCodeFinish </s> remove // processRestrictLocal responds with empty answers to PTR requests for IP
// addresses in locally-served network from external clients.
</s> add // processRestrictLocal responds with NXDOMAIN to PTR requests for IP addresses
// in locally-served network from external clients. </s> remove // TODO(e.burkov): Restrict the access for external clients.
</s> add d := dctx.proxyCtx
if !dctx.isLocalClient {
log.Debug("dns: %q requests for internal host", d.Addr)
d.Res = s.genNXDomain(req)
// Do not even put into query log.
return resultCodeFinish
} </s> remove clientIP := IPFromAddr(d.Addr)
if !s.subnetDetector.IsLocallyServedNetwork(clientIP) {
log.Debug("dns: %q requests for internal ip", clientIP)
d.Res = s.makeResponse(req)
</s> add if !ctx.isLocalClient {
log.Debug("dns: %q requests for internal ip", d.Addr)
d.Res = s.genNXDomain(req) </s> add isLocalCli bool
|
https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a
|
internal/dnsforward/dns.go
|
keep keep add keep keep keep keep
|
<mask> // appropriate handler.
<mask> mods := []modProcessFunc{
<mask> processInitial,
<mask> s.processInternalHosts,
<mask> s.processRestrictLocal,
<mask> s.processInternalIPAddrs,
<mask> processClientID,
</s> Pull request: 2889 internal hosts restriction
Merge in DNS/adguard-home from 2889-imp-autohosts to master
Closes #2889.
Squashed commit of the following:
commit 1d3b649364f991c092851c02d99827769cce8b70
Merge: abc6e1c8 1a214eaa
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:59:51 2021 +0300
Merge branch 'master' into 2889-imp-autohosts
commit abc6e1c8830e41a774c6d239ddd7b722b29df93e
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:34:56 2021 +0300
dnsforward: imp code
commit 4b2b9140d3e2526a935216ba42faba9b86b9ef3f
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:31:34 2021 +0300
dnsforward: respond with nxdomain
commit 814667417a1b02c152a034852858b96412874f85
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 6 19:16:14 2021 +0300
dnsforward: restrict the access to intl hosts for ext clients </s> add // isLocalClient shows if client's IP address is from locally-served
// network.
isLocalClient bool </s> remove // processRestrictLocal responds with empty answers to PTR requests for IP
// addresses in locally-served network from external clients.
</s> add // processRestrictLocal responds with NXDOMAIN to PTR requests for IP addresses
// in locally-served network from external clients. </s> remove pctx := dctx.proxyCtx
</s> add require.NoError(t, dctx.err)
</s> add // processDetermineLocal determines if the client's IP address is from
// locally-served network and saves the result into the context.
func (s *Server) processDetermineLocal(dctx *dnsContext) (rc resultCode) {
rc = resultCodeSuccess
var ip net.IP
if ip = IPFromAddr(dctx.proxyCtx.Addr); ip == nil {
return rc
}
dctx.isLocalClient = s.subnetDetector.IsLocallyServedNetwork(ip)
return rc
}
</s> remove clientIP := IPFromAddr(d.Addr)
if !s.subnetDetector.IsLocallyServedNetwork(clientIP) {
log.Debug("dns: %q requests for internal ip", clientIP)
d.Res = s.makeResponse(req)
</s> add if !ctx.isLocalClient {
log.Debug("dns: %q requests for internal ip", d.Addr)
d.Res = s.genNXDomain(req) </s> remove return resultCodeSuccess
</s> add // TODO(e.burkov): Inspect special cases when user want to apply
// some rules handled by other processors to the hosts with TLD.
d.Res = s.genNXDomain(req)
return resultCodeFinish
|
https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a
|
internal/dnsforward/dns.go
|
keep add keep keep keep keep keep
|
<mask> }
<mask>
<mask> // hostToIP tries to get an IP leased by DHCP and returns the copy of address
<mask> // since the data inside the internal table may be changed while request
<mask> // processing. It's safe for concurrent use.
<mask> func (s *Server) hostToIP(host string) (ip net.IP, ok bool) {
<mask> s.tableHostToIPLock.Lock()
</s> Pull request: 2889 internal hosts restriction
Merge in DNS/adguard-home from 2889-imp-autohosts to master
Closes #2889.
Squashed commit of the following:
commit 1d3b649364f991c092851c02d99827769cce8b70
Merge: abc6e1c8 1a214eaa
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:59:51 2021 +0300
Merge branch 'master' into 2889-imp-autohosts
commit abc6e1c8830e41a774c6d239ddd7b722b29df93e
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:34:56 2021 +0300
dnsforward: imp code
commit 4b2b9140d3e2526a935216ba42faba9b86b9ef3f
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:31:34 2021 +0300
dnsforward: respond with nxdomain
commit 814667417a1b02c152a034852858b96412874f85
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 6 19:16:14 2021 +0300
dnsforward: restrict the access to intl hosts for ext clients </s> add // isLocalClient shows if client's IP address is from locally-served
// network.
isLocalClient bool </s> remove clientIP := IPFromAddr(d.Addr)
if !s.subnetDetector.IsLocallyServedNetwork(clientIP) {
log.Debug("dns: %q requests for internal ip", clientIP)
d.Res = s.makeResponse(req)
</s> add if !ctx.isLocalClient {
log.Debug("dns: %q requests for internal ip", d.Addr)
d.Res = s.genNXDomain(req) </s> remove return resultCodeSuccess
</s> add // TODO(e.burkov): Inspect special cases when user want to apply
// some rules handled by other processors to the hosts with TLD.
d.Res = s.genNXDomain(req)
return resultCodeFinish </s> remove // processRestrictLocal responds with empty answers to PTR requests for IP
// addresses in locally-served network from external clients.
</s> add // processRestrictLocal responds with NXDOMAIN to PTR requests for IP addresses
// in locally-served network from external clients. </s> remove // TODO(e.burkov): Restrict the access for external clients.
</s> add d := dctx.proxyCtx
if !dctx.isLocalClient {
log.Debug("dns: %q requests for internal host", d.Addr)
d.Res = s.genNXDomain(req)
// Do not even put into query log.
return resultCodeFinish
} </s> remove pctx := dctx.proxyCtx
</s> add require.NoError(t, dctx.err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a
|
internal/dnsforward/dns.go
|
keep keep replace keep keep keep replace keep
|
<mask> }
<mask>
<mask> // TODO(e.burkov): Restrict the access for external clients.
<mask>
<mask> ip, ok := s.hostToIP(host)
<mask> if !ok {
<mask> return resultCodeSuccess
<mask> }
</s> Pull request: 2889 internal hosts restriction
Merge in DNS/adguard-home from 2889-imp-autohosts to master
Closes #2889.
Squashed commit of the following:
commit 1d3b649364f991c092851c02d99827769cce8b70
Merge: abc6e1c8 1a214eaa
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:59:51 2021 +0300
Merge branch 'master' into 2889-imp-autohosts
commit abc6e1c8830e41a774c6d239ddd7b722b29df93e
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:34:56 2021 +0300
dnsforward: imp code
commit 4b2b9140d3e2526a935216ba42faba9b86b9ef3f
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:31:34 2021 +0300
dnsforward: respond with nxdomain
commit 814667417a1b02c152a034852858b96412874f85
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 6 19:16:14 2021 +0300
dnsforward: restrict the access to intl hosts for ext clients </s> remove clientIP := IPFromAddr(d.Addr)
if !s.subnetDetector.IsLocallyServedNetwork(clientIP) {
log.Debug("dns: %q requests for internal ip", clientIP)
d.Res = s.makeResponse(req)
</s> add if !ctx.isLocalClient {
log.Debug("dns: %q requests for internal ip", d.Addr)
d.Res = s.genNXDomain(req) </s> remove // processRestrictLocal responds with empty answers to PTR requests for IP
// addresses in locally-served network from external clients.
</s> add // processRestrictLocal responds with NXDOMAIN to PTR requests for IP addresses
// in locally-served network from external clients. </s> add // processDetermineLocal determines if the client's IP address is from
// locally-served network and saves the result into the context.
func (s *Server) processDetermineLocal(dctx *dnsContext) (rc resultCode) {
rc = resultCodeSuccess
var ip net.IP
if ip = IPFromAddr(dctx.proxyCtx.Addr); ip == nil {
return rc
}
dctx.isLocalClient = s.subnetDetector.IsLocallyServedNetwork(ip)
return rc
}
</s> add // isLocalClient shows if client's IP address is from locally-served
// network.
isLocalClient bool </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, dctx.err)
} else {
require.Error(t, dctx.err)
assert.Equal(t, tc.wantErrMsg, dctx.err.Error())
</s> add return
|
https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a
|
internal/dnsforward/dns.go
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> // processRestrictLocal responds with empty answers to PTR requests for IP
<mask> // addresses in locally-served network from external clients.
<mask> func (s *Server) processRestrictLocal(ctx *dnsContext) (rc resultCode) {
<mask> d := ctx.proxyCtx
<mask> req := d.Req
<mask> q := req.Question[0]
<mask> if q.Qtype != dns.TypePTR {
</s> Pull request: 2889 internal hosts restriction
Merge in DNS/adguard-home from 2889-imp-autohosts to master
Closes #2889.
Squashed commit of the following:
commit 1d3b649364f991c092851c02d99827769cce8b70
Merge: abc6e1c8 1a214eaa
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:59:51 2021 +0300
Merge branch 'master' into 2889-imp-autohosts
commit abc6e1c8830e41a774c6d239ddd7b722b29df93e
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:34:56 2021 +0300
dnsforward: imp code
commit 4b2b9140d3e2526a935216ba42faba9b86b9ef3f
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:31:34 2021 +0300
dnsforward: respond with nxdomain
commit 814667417a1b02c152a034852858b96412874f85
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 6 19:16:14 2021 +0300
dnsforward: restrict the access to intl hosts for ext clients </s> add // processDetermineLocal determines if the client's IP address is from
// locally-served network and saves the result into the context.
func (s *Server) processDetermineLocal(dctx *dnsContext) (rc resultCode) {
rc = resultCodeSuccess
var ip net.IP
if ip = IPFromAddr(dctx.proxyCtx.Addr); ip == nil {
return rc
}
dctx.isLocalClient = s.subnetDetector.IsLocallyServedNetwork(ip)
return rc
}
</s> remove // TODO(e.burkov): Restrict the access for external clients.
</s> add d := dctx.proxyCtx
if !dctx.isLocalClient {
log.Debug("dns: %q requests for internal host", d.Addr)
d.Res = s.genNXDomain(req)
// Do not even put into query log.
return resultCodeFinish
} </s> remove clientIP := IPFromAddr(d.Addr)
if !s.subnetDetector.IsLocallyServedNetwork(clientIP) {
log.Debug("dns: %q requests for internal ip", clientIP)
d.Res = s.makeResponse(req)
</s> add if !ctx.isLocalClient {
log.Debug("dns: %q requests for internal ip", d.Addr)
d.Res = s.genNXDomain(req) </s> remove return resultCodeSuccess
</s> add // TODO(e.burkov): Inspect special cases when user want to apply
// some rules handled by other processors to the hosts with TLD.
d.Res = s.genNXDomain(req)
return resultCodeFinish </s> add // isLocalClient shows if client's IP address is from locally-served
// network.
isLocalClient bool </s> remove func TestServer_ProcessInternalHosts(t *testing.T) {
</s> add func TestServer_ProcessDetermineLocal(t *testing.T) {
snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
s := &Server{
subnetDetector: snd,
}
testCases := []struct {
name string
cliIP net.IP
want bool
}{{
name: "local",
cliIP: net.IP{192, 168, 0, 1},
want: true,
}, {
name: "external",
cliIP: net.IP{250, 249, 0, 1},
want: false,
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
proxyCtx := &proxy.DNSContext{
Addr: &net.TCPAddr{
IP: tc.cliIP,
},
}
dctx := &dnsContext{
proxyCtx: proxyCtx,
}
s.processDetermineLocal(dctx)
assert.Equal(t, tc.want, dctx.isLocalClient)
})
}
}
func TestServer_ProcessInternalHosts_localRestriction(t *testing.T) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a
|
internal/dnsforward/dns.go
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> // Restrict an access to local addresses for external clients. We also
<mask> // assume that all the DHCP leases we give are locally-served or at
<mask> // least don't need to be unaccessable externally.
<mask> if s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> clientIP := IPFromAddr(d.Addr)
<mask> if !s.subnetDetector.IsLocallyServedNetwork(clientIP) {
<mask> log.Debug("dns: %q requests for internal ip", clientIP)
<mask> d.Res = s.makeResponse(req)
<mask>
<mask> // Do not even put into query log.
<mask> return resultCodeFinish
<mask> }
<mask> }
</s> Pull request: 2889 internal hosts restriction
Merge in DNS/adguard-home from 2889-imp-autohosts to master
Closes #2889.
Squashed commit of the following:
commit 1d3b649364f991c092851c02d99827769cce8b70
Merge: abc6e1c8 1a214eaa
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:59:51 2021 +0300
Merge branch 'master' into 2889-imp-autohosts
commit abc6e1c8830e41a774c6d239ddd7b722b29df93e
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:34:56 2021 +0300
dnsforward: imp code
commit 4b2b9140d3e2526a935216ba42faba9b86b9ef3f
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:31:34 2021 +0300
dnsforward: respond with nxdomain
commit 814667417a1b02c152a034852858b96412874f85
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 6 19:16:14 2021 +0300
dnsforward: restrict the access to intl hosts for ext clients </s> remove // TODO(e.burkov): Restrict the access for external clients.
</s> add d := dctx.proxyCtx
if !dctx.isLocalClient {
log.Debug("dns: %q requests for internal host", d.Addr)
d.Res = s.genNXDomain(req)
// Do not even put into query log.
return resultCodeFinish
} </s> remove return resultCodeSuccess
</s> add // TODO(e.burkov): Inspect special cases when user want to apply
// some rules handled by other processors to the hosts with TLD.
d.Res = s.genNXDomain(req)
return resultCodeFinish </s> remove // processRestrictLocal responds with empty answers to PTR requests for IP
// addresses in locally-served network from external clients.
</s> add // processRestrictLocal responds with NXDOMAIN to PTR requests for IP addresses
// in locally-served network from external clients. </s> add // processDetermineLocal determines if the client's IP address is from
// locally-served network and saves the result into the context.
func (s *Server) processDetermineLocal(dctx *dnsContext) (rc resultCode) {
rc = resultCodeSuccess
var ip net.IP
if ip = IPFromAddr(dctx.proxyCtx.Addr); ip == nil {
return rc
}
dctx.isLocalClient = s.subnetDetector.IsLocallyServedNetwork(ip)
return rc
}
</s> add // isLocalClient shows if client's IP address is from locally-served
// network.
isLocalClient bool </s> remove pctx := dctx.proxyCtx
</s> add require.NoError(t, dctx.err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a
|
internal/dnsforward/dns.go
|
keep keep keep add keep keep keep keep keep keep
|
<mask> import (
<mask> "net"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
</s> Pull request: 2889 internal hosts restriction
Merge in DNS/adguard-home from 2889-imp-autohosts to master
Closes #2889.
Squashed commit of the following:
commit 1d3b649364f991c092851c02d99827769cce8b70
Merge: abc6e1c8 1a214eaa
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:59:51 2021 +0300
Merge branch 'master' into 2889-imp-autohosts
commit abc6e1c8830e41a774c6d239ddd7b722b29df93e
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:34:56 2021 +0300
dnsforward: imp code
commit 4b2b9140d3e2526a935216ba42faba9b86b9ef3f
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:31:34 2021 +0300
dnsforward: respond with nxdomain
commit 814667417a1b02c152a034852858b96412874f85
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 6 19:16:14 2021 +0300
dnsforward: restrict the access to intl hosts for ext clients </s> remove func TestServer_ProcessInternalHosts(t *testing.T) {
</s> add func TestServer_ProcessDetermineLocal(t *testing.T) {
snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
s := &Server{
subnetDetector: snd,
}
testCases := []struct {
name string
cliIP net.IP
want bool
}{{
name: "local",
cliIP: net.IP{192, 168, 0, 1},
want: true,
}, {
name: "external",
cliIP: net.IP{250, 249, 0, 1},
want: false,
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
proxyCtx := &proxy.DNSContext{
Addr: &net.TCPAddr{
IP: tc.cliIP,
},
}
dctx := &dnsContext{
proxyCtx: proxyCtx,
}
s.processDetermineLocal(dctx)
assert.Equal(t, tc.want, dctx.isLocalClient)
})
}
}
func TestServer_ProcessInternalHosts_localRestriction(t *testing.T) { </s> remove qtyp: dns.TypeAAAA,
wantRes: resultCodeSuccess,
</s> add wantRes: resultCodeFinish,
isLocalCli: false,
}, {
name: "external_client_unknown_host",
host: "wronghost.lan",
wantIP: nil,
wantRes: resultCodeFinish,
isLocalCli: false,
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s := &Server{
autohostSuffix: defaultAutohostSuffix,
tableHostToIP: map[string]net.IP{
"example": knownIP,
},
}
req := &dns.Msg{
MsgHdr: dns.MsgHdr{
Id: dns.Id(),
},
Question: []dns.Question{{
Name: dns.Fqdn(tc.host),
Qtype: dns.TypeA,
Qclass: dns.ClassINET,
}},
}
dctx := &dnsContext{
proxyCtx: &proxy.DNSContext{
Req: req,
},
isLocalClient: tc.isLocalCli,
}
res := s.processInternalHosts(dctx)
require.Equal(t, tc.wantRes, res)
pctx := dctx.proxyCtx
if tc.wantRes == resultCodeFinish {
require.NotNil(t, pctx.Res)
assert.Equal(t, dns.RcodeNameError, pctx.Res.Rcode)
assert.Len(t, pctx.Res.Answer, 0)
return
}
if tc.wantIP == nil {
assert.Nil(t, pctx.Res)
} else {
require.NotNil(t, pctx.Res)
ans := pctx.Res.Answer
require.Len(t, ans, 1)
assert.Equal(t, tc.wantIP, ans[0].(*dns.A).A)
}
})
}
}
func TestServer_ProcessInternalHosts(t *testing.T) {
const (
examplecom = "example.com"
examplelan = "example.lan"
)
knownIP := net.IP{1, 2, 3, 4}
testCases := []struct {
name string
host string
suffix string
wantIP net.IP
wantRes resultCode
qtyp uint16
}{{
name: "success_external",
host: examplecom,
suffix: defaultAutohostSuffix,
wantIP: nil,
wantRes: resultCodeSuccess,
qtyp: dns.TypeA,
}, {
name: "success_external_non_a",
host: examplecom,
suffix: defaultAutohostSuffix,
wantIP: nil,
wantRes: resultCodeSuccess,
qtyp: dns.TypeCNAME,
}, {
name: "success_internal",
host: examplelan,
suffix: defaultAutohostSuffix,
wantIP: knownIP,
wantRes: resultCodeSuccess,
qtyp: dns.TypeA,
}, {
name: "success_internal_unknown",
host: "example-new.lan",
suffix: defaultAutohostSuffix,
wantIP: nil,
wantRes: resultCodeFinish,
qtyp: dns.TypeA,
}, {
name: "success_internal_aaaa",
host: examplelan,
suffix: defaultAutohostSuffix,
wantIP: nil,
wantRes: resultCodeSuccess,
qtyp: dns.TypeAAAA,
}, {
name: "success_custom_suffix",
host: "example.custom",
suffix: ".custom.",
wantIP: knownIP,
wantRes: resultCodeSuccess,
qtyp: dns.TypeA, </s> remove pctx := dctx.proxyCtx
</s> add require.NoError(t, dctx.err)
</s> add isLocalCli bool </s> add s.processDetermineLocal, </s> add // processDetermineLocal determines if the client's IP address is from
// locally-served network and saves the result into the context.
func (s *Server) processDetermineLocal(dctx *dnsContext) (rc resultCode) {
rc = resultCodeSuccess
var ip net.IP
if ip = IPFromAddr(dctx.proxyCtx.Addr); ip == nil {
return rc
}
dctx.isLocalClient = s.subnetDetector.IsLocallyServedNetwork(ip)
return rc
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a
|
internal/dnsforward/dns_test.go
|
keep replace keep keep keep keep replace replace keep
|
<mask>
<mask> func TestServer_ProcessInternalHosts(t *testing.T) {
<mask> knownIP := net.IP{1, 2, 3, 4}
<mask> testCases := []struct {
<mask> name string
<mask> host string
<mask> suffix string
<mask> wantErrMsg string
<mask> wantIP net.IP
</s> Pull request: 2889 internal hosts restriction
Merge in DNS/adguard-home from 2889-imp-autohosts to master
Closes #2889.
Squashed commit of the following:
commit 1d3b649364f991c092851c02d99827769cce8b70
Merge: abc6e1c8 1a214eaa
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:59:51 2021 +0300
Merge branch 'master' into 2889-imp-autohosts
commit abc6e1c8830e41a774c6d239ddd7b722b29df93e
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:34:56 2021 +0300
dnsforward: imp code
commit 4b2b9140d3e2526a935216ba42faba9b86b9ef3f
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:31:34 2021 +0300
dnsforward: respond with nxdomain
commit 814667417a1b02c152a034852858b96412874f85
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 6 19:16:14 2021 +0300
dnsforward: restrict the access to intl hosts for ext clients </s> remove qtyp uint16
</s> add </s> remove qtyp: dns.TypeAAAA,
wantRes: resultCodeSuccess,
</s> add wantRes: resultCodeFinish,
isLocalCli: false,
}, {
name: "external_client_unknown_host",
host: "wronghost.lan",
wantIP: nil,
wantRes: resultCodeFinish,
isLocalCli: false,
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s := &Server{
autohostSuffix: defaultAutohostSuffix,
tableHostToIP: map[string]net.IP{
"example": knownIP,
},
}
req := &dns.Msg{
MsgHdr: dns.MsgHdr{
Id: dns.Id(),
},
Question: []dns.Question{{
Name: dns.Fqdn(tc.host),
Qtype: dns.TypeA,
Qclass: dns.ClassINET,
}},
}
dctx := &dnsContext{
proxyCtx: &proxy.DNSContext{
Req: req,
},
isLocalClient: tc.isLocalCli,
}
res := s.processInternalHosts(dctx)
require.Equal(t, tc.wantRes, res)
pctx := dctx.proxyCtx
if tc.wantRes == resultCodeFinish {
require.NotNil(t, pctx.Res)
assert.Equal(t, dns.RcodeNameError, pctx.Res.Rcode)
assert.Len(t, pctx.Res.Answer, 0)
return
}
if tc.wantIP == nil {
assert.Nil(t, pctx.Res)
} else {
require.NotNil(t, pctx.Res)
ans := pctx.Res.Answer
require.Len(t, ans, 1)
assert.Equal(t, tc.wantIP, ans[0].(*dns.A).A)
}
})
}
}
func TestServer_ProcessInternalHosts(t *testing.T) {
const (
examplecom = "example.com"
examplelan = "example.lan"
)
knownIP := net.IP{1, 2, 3, 4}
testCases := []struct {
name string
host string
suffix string
wantIP net.IP
wantRes resultCode
qtyp uint16
}{{
name: "success_external",
host: examplecom,
suffix: defaultAutohostSuffix,
wantIP: nil,
wantRes: resultCodeSuccess,
qtyp: dns.TypeA,
}, {
name: "success_external_non_a",
host: examplecom,
suffix: defaultAutohostSuffix,
wantIP: nil,
wantRes: resultCodeSuccess,
qtyp: dns.TypeCNAME,
}, {
name: "success_internal",
host: examplelan,
suffix: defaultAutohostSuffix,
wantIP: knownIP,
wantRes: resultCodeSuccess,
qtyp: dns.TypeA,
}, {
name: "success_internal_unknown",
host: "example-new.lan",
suffix: defaultAutohostSuffix,
wantIP: nil,
wantRes: resultCodeFinish,
qtyp: dns.TypeA,
}, {
name: "success_internal_aaaa",
host: examplelan,
suffix: defaultAutohostSuffix,
wantIP: nil,
wantRes: resultCodeSuccess,
qtyp: dns.TypeAAAA,
}, {
name: "success_custom_suffix",
host: "example.custom",
suffix: ".custom.",
wantIP: knownIP,
wantRes: resultCodeSuccess,
qtyp: dns.TypeA, </s> add isLocalCli bool </s> add // processDetermineLocal determines if the client's IP address is from
// locally-served network and saves the result into the context.
func (s *Server) processDetermineLocal(dctx *dnsContext) (rc resultCode) {
rc = resultCodeSuccess
var ip net.IP
if ip = IPFromAddr(dctx.proxyCtx.Addr); ip == nil {
return rc
}
dctx.isLocalClient = s.subnetDetector.IsLocallyServedNetwork(ip)
return rc
}
</s> remove name: "success_external",
host: "example.com",
suffix: defaultAutohostSuffix,
wantErrMsg: "",
wantIP: nil,
qtyp: dns.TypeA,
wantRes: resultCodeSuccess,
}, {
name: "success_external_non_a",
host: "example.com",
suffix: defaultAutohostSuffix,
wantErrMsg: "",
wantIP: nil,
qtyp: dns.TypeCNAME,
wantRes: resultCodeSuccess,
}, {
name: "success_internal",
</s> add name: "local_client_success",
|
https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a
|
internal/dnsforward/dns_test.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> host string
<mask> suffix string
<mask> wantErrMsg string
<mask> wantIP net.IP
<mask> qtyp uint16
<mask> wantRes resultCode
<mask> }{{
<mask> name: "success_external",
<mask> host: "example.com",
<mask> suffix: defaultAutohostSuffix,
</s> Pull request: 2889 internal hosts restriction
Merge in DNS/adguard-home from 2889-imp-autohosts to master
Closes #2889.
Squashed commit of the following:
commit 1d3b649364f991c092851c02d99827769cce8b70
Merge: abc6e1c8 1a214eaa
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:59:51 2021 +0300
Merge branch 'master' into 2889-imp-autohosts
commit abc6e1c8830e41a774c6d239ddd7b722b29df93e
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:34:56 2021 +0300
dnsforward: imp code
commit 4b2b9140d3e2526a935216ba42faba9b86b9ef3f
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 8 17:31:34 2021 +0300
dnsforward: respond with nxdomain
commit 814667417a1b02c152a034852858b96412874f85
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 6 19:16:14 2021 +0300
dnsforward: restrict the access to intl hosts for ext clients </s> remove suffix string
wantErrMsg string
</s> add </s> add isLocalCli bool </s> remove name: "success_external",
host: "example.com",
suffix: defaultAutohostSuffix,
wantErrMsg: "",
wantIP: nil,
qtyp: dns.TypeA,
wantRes: resultCodeSuccess,
}, {
name: "success_external_non_a",
host: "example.com",
suffix: defaultAutohostSuffix,
wantErrMsg: "",
wantIP: nil,
qtyp: dns.TypeCNAME,
wantRes: resultCodeSuccess,
}, {
name: "success_internal",
</s> add name: "local_client_success", </s> remove qtyp: dns.TypeAAAA,
wantRes: resultCodeSuccess,
</s> add wantRes: resultCodeFinish,
isLocalCli: false,
}, {
name: "external_client_unknown_host",
host: "wronghost.lan",
wantIP: nil,
wantRes: resultCodeFinish,
isLocalCli: false,
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s := &Server{
autohostSuffix: defaultAutohostSuffix,
tableHostToIP: map[string]net.IP{
"example": knownIP,
},
}
req := &dns.Msg{
MsgHdr: dns.MsgHdr{
Id: dns.Id(),
},
Question: []dns.Question{{
Name: dns.Fqdn(tc.host),
Qtype: dns.TypeA,
Qclass: dns.ClassINET,
}},
}
dctx := &dnsContext{
proxyCtx: &proxy.DNSContext{
Req: req,
},
isLocalClient: tc.isLocalCli,
}
res := s.processInternalHosts(dctx)
require.Equal(t, tc.wantRes, res)
pctx := dctx.proxyCtx
if tc.wantRes == resultCodeFinish {
require.NotNil(t, pctx.Res)
assert.Equal(t, dns.RcodeNameError, pctx.Res.Rcode)
assert.Len(t, pctx.Res.Answer, 0)
return
}
if tc.wantIP == nil {
assert.Nil(t, pctx.Res)
} else {
require.NotNil(t, pctx.Res)
ans := pctx.Res.Answer
require.Len(t, ans, 1)
assert.Equal(t, tc.wantIP, ans[0].(*dns.A).A)
}
})
}
}
func TestServer_ProcessInternalHosts(t *testing.T) {
const (
examplecom = "example.com"
examplelan = "example.lan"
)
knownIP := net.IP{1, 2, 3, 4}
testCases := []struct {
name string
host string
suffix string
wantIP net.IP
wantRes resultCode
qtyp uint16
}{{
name: "success_external",
host: examplecom,
suffix: defaultAutohostSuffix,
wantIP: nil,
wantRes: resultCodeSuccess,
qtyp: dns.TypeA,
}, {
name: "success_external_non_a",
host: examplecom,
suffix: defaultAutohostSuffix,
wantIP: nil,
wantRes: resultCodeSuccess,
qtyp: dns.TypeCNAME,
}, {
name: "success_internal",
host: examplelan,
suffix: defaultAutohostSuffix,
wantIP: knownIP,
wantRes: resultCodeSuccess,
qtyp: dns.TypeA,
}, {
name: "success_internal_unknown",
host: "example-new.lan",
suffix: defaultAutohostSuffix,
wantIP: nil,
wantRes: resultCodeFinish,
qtyp: dns.TypeA,
}, {
name: "success_internal_aaaa",
host: examplelan,
suffix: defaultAutohostSuffix,
wantIP: nil,
wantRes: resultCodeSuccess,
qtyp: dns.TypeAAAA,
}, {
name: "success_custom_suffix",
host: "example.custom",
suffix: ".custom.",
wantIP: knownIP,
wantRes: resultCodeSuccess,
qtyp: dns.TypeA, </s> remove func TestServer_ProcessInternalHosts(t *testing.T) {
</s> add func TestServer_ProcessDetermineLocal(t *testing.T) {
snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
s := &Server{
subnetDetector: snd,
}
testCases := []struct {
name string
cliIP net.IP
want bool
}{{
name: "local",
cliIP: net.IP{192, 168, 0, 1},
want: true,
}, {
name: "external",
cliIP: net.IP{250, 249, 0, 1},
want: false,
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
proxyCtx := &proxy.DNSContext{
Addr: &net.TCPAddr{
IP: tc.cliIP,
},
}
dctx := &dnsContext{
proxyCtx: proxyCtx,
}
s.processDetermineLocal(dctx)
assert.Equal(t, tc.want, dctx.isLocalClient)
})
}
}
func TestServer_ProcessInternalHosts_localRestriction(t *testing.T) { </s> remove qtyp: dns.TypeA,
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a
|
internal/dnsforward/dns_test.go
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.