86444eacc2
Merge in DNS/adguard-home from 2704-local-addresses-vol.2 to master Updates #2704. Updates #2829. Squashed commit of the following: commit 507d038c2709de59246fc0b65c3c4ab8e38d1990 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 31 14:33:05 2021 +0300 aghtest: fix file name commit 8e19f99337bee1d88ad6595adb96f9bb23fa3c41 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 31 14:06:43 2021 +0300 aghnet: rm redundant mutexes commit 361fa418b33ed160ca20862be1c455ab9378c03f Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 31 13:45:30 2021 +0300 all: fix names, docs commit 14034f4f0230d7aaa3645054946ae5c278089a99 Merge: 35e265cca72ce1cf
Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 31 13:38:15 2021 +0300 Merge branch 'master' into 2704-local-addresses-vol.2 commit 35e265cc8cd308ef1fda414b58c0217cb5f258e4 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 31 13:33:35 2021 +0300 aghnet: imp naming commit 7a7edac7208a40697d7bc50682b923a144e28e2b Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Mar 30 20:59:54 2021 +0300 changelog: oops, nope yet commit d26a5d2513daf662ac92053b5e235189a64cc022 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Mar 30 20:55:53 2021 +0300 all: some renaming for the glory of semantics commit 9937fa619452b0742616217b975e3ff048d58acb Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Mar 29 15:34:42 2021 +0300 all: log changes commit d8d9e6dfeea8474466ee25f27021efdd3ddb1592 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Mar 26 18:32:23 2021 +0300 all: imp localresolver, imp cutting off own addresses commit 344140df449b85925f19b460fd7dc7c08e29c35a Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Mar 26 14:53:33 2021 +0300 all: imp code quality commit 1c5c0babec73b125044e23dd3aa75d8eefc19b28 Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Mar 25 20:44:08 2021 +0300 all: fix go.mod commit 0b9fb3c2369a752e893af8ddc45a86bb9fb27ce5 Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Mar 25 20:38:51 2021 +0300 all: add error handling commit a7a2e51f57fc6f8f74b95a264ad345cd2a9e026e Merge: c13be63427f4f052
Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Mar 25 19:48:36 2021 +0300 Merge branch 'master' into 2704-local-addresses-vol.2 commit c13be634f47bcaed9320a732a51c0e4752d0dad0 Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Mar 25 18:52:28 2021 +0300 all: cover rdns with tests, imp aghnet functionality commit 48bed9025944530c613ee53e7961d6d5fbabf8be Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 24 20:18:07 2021 +0300 home: make rdns great again commit 1dbacfc8d5b6895807797998317fe3cc814617c1 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 24 16:07:52 2021 +0300 all: imp external client restriction commit 1208a319a7f4ffe7b7fa8956f245d7a19437c0a4 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Mar 22 15:26:45 2021 +0300 all: finish local ptr processor commit c8827fc3db289e1a5d7a11d057743bab39957b02 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Mar 2 13:41:22 2021 +0300 all: imp ipdetector, add local ptr processor
156 lines
3.5 KiB
Go
156 lines
3.5 KiB
Go
package aghnet
|
|
|
|
import (
|
|
"net"
|
|
)
|
|
|
|
// SubnetDetector describes IP address properties.
|
|
type SubnetDetector struct {
|
|
// spNets is the slice of special-purpose address registries as defined
|
|
// by RFC-6890 (https://tools.ietf.org/html/rfc6890).
|
|
spNets []*net.IPNet
|
|
|
|
// locServedNets is the slice of locally-served networks as defined by
|
|
// RFC-6303 (https://tools.ietf.org/html/rfc6303).
|
|
locServedNets []*net.IPNet
|
|
}
|
|
|
|
// NewSubnetDetector returns a new IP detector.
|
|
func NewSubnetDetector() (snd *SubnetDetector, err error) {
|
|
spNets := []string{
|
|
// "This" network.
|
|
"0.0.0.0/8",
|
|
// Private-Use Networks.
|
|
"10.0.0.0/8",
|
|
// Shared Address Space.
|
|
"100.64.0.0/10",
|
|
// Loopback.
|
|
"127.0.0.0/8",
|
|
// Link Local.
|
|
"169.254.0.0/16",
|
|
// Private-Use Networks.
|
|
"172.16.0.0/12",
|
|
// IETF Protocol Assignments.
|
|
"192.0.0.0/24",
|
|
// DS-Lite.
|
|
"192.0.0.0/29",
|
|
// TEST-NET-1
|
|
"192.0.2.0/24",
|
|
// 6to4 Relay Anycast.
|
|
"192.88.99.0/24",
|
|
// Private-Use Networks.
|
|
"192.168.0.0/16",
|
|
// Network Interconnect Device Benchmark Testing.
|
|
"198.18.0.0/15",
|
|
// TEST-NET-2.
|
|
"198.51.100.0/24",
|
|
// TEST-NET-3.
|
|
"203.0.113.0/24",
|
|
// Reserved for Future Use.
|
|
"240.0.0.0/4",
|
|
// Limited Broadcast.
|
|
"255.255.255.255/32",
|
|
|
|
// Loopback.
|
|
"::1/128",
|
|
// Unspecified.
|
|
"::/128",
|
|
// IPv4-IPv6 Translation Address.
|
|
"64:ff9b::/96",
|
|
|
|
// IPv4-Mapped Address. Since this network is used for mapping
|
|
// IPv4 addresses, we don't include it.
|
|
// "::ffff:0:0/96",
|
|
|
|
// Discard-Only Prefix.
|
|
"100::/64",
|
|
// IETF Protocol Assignments.
|
|
"2001::/23",
|
|
// TEREDO.
|
|
"2001::/32",
|
|
// Benchmarking.
|
|
"2001:2::/48",
|
|
// Documentation.
|
|
"2001:db8::/32",
|
|
// ORCHID.
|
|
"2001:10::/28",
|
|
// 6to4.
|
|
"2002::/16",
|
|
// Unique-Local.
|
|
"fc00::/7",
|
|
// Linked-Scoped Unicast.
|
|
"fe80::/10",
|
|
}
|
|
|
|
// TODO(e.burkov): It's a subslice of the slice above. Should be done
|
|
// smarter.
|
|
locServedNets := []string{
|
|
// IPv4.
|
|
"10.0.0.0/8",
|
|
"172.16.0.0/12",
|
|
"192.168.0.0/16",
|
|
"127.0.0.0/8",
|
|
"169.254.0.0/16",
|
|
"192.0.2.0/24",
|
|
"198.51.100.0/24",
|
|
"203.0.113.0/24",
|
|
"255.255.255.255/32",
|
|
// IPv6.
|
|
"::/128",
|
|
"::1/128",
|
|
"fe80::/10",
|
|
"2001:db8::/32",
|
|
}
|
|
|
|
snd = &SubnetDetector{
|
|
spNets: make([]*net.IPNet, len(spNets)),
|
|
locServedNets: make([]*net.IPNet, len(locServedNets)),
|
|
}
|
|
for i, ipnetStr := range spNets {
|
|
var ipnet *net.IPNet
|
|
_, ipnet, err = net.ParseCIDR(ipnetStr)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
snd.spNets[i] = ipnet
|
|
}
|
|
for i, ipnetStr := range locServedNets {
|
|
var ipnet *net.IPNet
|
|
_, ipnet, err = net.ParseCIDR(ipnetStr)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
snd.locServedNets[i] = ipnet
|
|
}
|
|
|
|
return snd, nil
|
|
}
|
|
|
|
// anyNetContains ranges through the given ipnets slice searching for the one
|
|
// which contains the ip. For internal use only.
|
|
//
|
|
// TODO(e.burkov): Think about memoization.
|
|
func anyNetContains(ipnets *[]*net.IPNet, ip net.IP) (is bool) {
|
|
for _, ipnet := range *ipnets {
|
|
if ipnet.Contains(ip) {
|
|
return true
|
|
}
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
// IsSpecialNetwork returns true if IP address is contained by any of
|
|
// special-purpose IP address registries. It's safe for concurrent use.
|
|
func (snd *SubnetDetector) IsSpecialNetwork(ip net.IP) (is bool) {
|
|
return anyNetContains(&snd.spNets, ip)
|
|
}
|
|
|
|
// IsLocallyServedNetwork returns true if IP address is contained by any of
|
|
// locally-served IP address registries. It's safe for concurrent use.
|
|
func (snd *SubnetDetector) IsLocallyServedNetwork(ip net.IP) (is bool) {
|
|
return anyNetContains(&snd.locServedNets, ip)
|
|
}
|