ADG-12585 Upd bootstrap IP

This commit is contained in:
Maksim Kazantsev
2026-10-07 16:18:14 +03:00
committed by GitHub
parent b2f394896e
commit 07afcdafc6
2 changed files with 15 additions and 12 deletions
+3
View File
@@ -44,6 +44,8 @@ NOTE: Add new changes BELOW THIS COMMENT.
- IP addresses being sorted lexicographically instead of numerically in the web interface ([#8636]).
- Invalid secondary bootstrap resolver IPv4 address ([#8637]).
### Removed
- The support for macOS 13 Ventura, see [Go 1.27 release notes][go-1.27.1-notes].
@@ -55,6 +57,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
[#8610]: https://github.com/AdguardTeam/AdGuardHome/issues/8610
[#8613]: https://github.com/AdguardTeam/AdGuardHome/issues/8613
[#8636]: https://github.com/AdguardTeam/AdGuardHome/issues/8636
[#8637]: https://github.com/AdguardTeam/AdGuardHome/issues/8637
[go-1.27.1]: https://groups.google.com/g/golang-announce/c/QiTRm-HGGtI
[go-1.27.1-notes]: https://go.dev/doc/go1.27#darwin
+12 -12
View File
@@ -430,6 +430,15 @@ func setupBindOpts(opts options) (err error) {
return nil
}
// safeBrowsingResolvers is a slice of static IP addresses of the safebrowsing
// bootstrap DNS resolvers.
var safeBrowsingResolvers = upstream.StaticResolver{
netip.MustParseAddr("94.140.14.15"),
netip.MustParseAddr("94.140.15.16"),
netip.MustParseAddr("2a10:50c0::bad1:ff"),
netip.MustParseAddr("2a10:50c0::bad2:ff"),
}
// setupDNSFilteringConf sets up DNS filtering configuration settings. All
// arguments except hc must not be nil.
func setupDNSFilteringConf(
@@ -472,18 +481,9 @@ func setupDNSFilteringConf(
cacheTime := time.Duration(conf.CacheTime) * time.Minute
upsOpts := &upstream.Options{
Logger: aghslog.NewForUpstream(baseLogger, aghslog.UpstreamTypeService),
Timeout: dnsTimeout,
Bootstrap: upstream.StaticResolver{
// 94.140.14.15.
netip.AddrFrom4([4]byte{94, 140, 14, 15}),
// 94.140.14.16.
netip.AddrFrom4([4]byte{94, 140, 14, 16}),
// 2a10:50c0::bad1:ff.
netip.AddrFrom16([16]byte{42, 16, 80, 192, 12: 186, 209, 0, 255}),
// 2a10:50c0::bad2:ff.
netip.AddrFrom16([16]byte{42, 16, 80, 192, 12: 186, 210, 0, 255}),
},
Logger: aghslog.NewForUpstream(baseLogger, aghslog.UpstreamTypeService),
Timeout: dnsTimeout,
Bootstrap: safeBrowsingResolvers,
}
sbUps, err := upstream.AddressToUpstream(defaultSafeBrowsingServer, upsOpts)