diff --git a/netutil/net.go b/netutil/net.go index 1b3b2fe..a3b4c51 100644 --- a/netutil/net.go +++ b/netutil/net.go @@ -192,18 +192,37 @@ func IsPublicIP(IP net.IP) bool { // IsInternalIP verify an ip is intranet or not. // Play: https://go.dev/play/p/sYGhXbgO4Cb func IsInternalIP(IP net.IP) bool { - if IP.IsLoopback() { + if IP.IsLoopback() || IP.IsPrivate() || IP.IsLinkLocalUnicast() { return true } if ip4 := IP.To4(); ip4 != nil { - return ip4[0] == 10 || - (ip4[0] == 172 && ip4[1] >= 16 && ip4[1] <= 31) || - (ip4[0] == 169 && ip4[1] == 254) || - (ip4[0] == 192 && ip4[1] == 168) + // RFC 6598 shared address space, 100.64.0.0/10. + return ip4[0] == 100 && ip4[1]&0xc0 == 0x40 + } + if embedded, ok := embeddedTransitionIPv4(IP); ok { + return IsInternalIP(embedded) } return false } +// embeddedTransitionIPv4 returns the IPv4 address carried by a NAT64, 6to4, or Teredo address. +func embeddedTransitionIPv4(ip net.IP) (net.IP, bool) { + ip = ip.To16() + if ip == nil || ip.To4() != nil { + return nil, false + } + switch { + case bytes.Equal(ip[:12], []byte{0x00, 0x64, 0xff, 0x9b, 0, 0, 0, 0, 0, 0, 0, 0}): + return net.IPv4(ip[12], ip[13], ip[14], ip[15]), true + case ip[0] == 0x20 && ip[1] == 0x02: + return net.IPv4(ip[2], ip[3], ip[4], ip[5]), true + case ip[0] == 0x20 && ip[1] == 0x01 && ip[2] == 0 && ip[3] == 0: + return net.IPv4(ip[12]^0xff, ip[13]^0xff, ip[14]^0xff, ip[15]^0xff), true + default: + return nil, false + } +} + // EncodeUrl encode url. // Play: https://go.dev/play/p/bsZ6BRC4uKI func EncodeUrl(urlStr string) (string, error) { diff --git a/netutil/net_test.go b/netutil/net_test.go index a080a48..9b19c11 100644 --- a/netutil/net_test.go +++ b/netutil/net_test.go @@ -95,6 +95,36 @@ func TestIsInternalIP(t *testing.T) { } } +func TestIsInternalIPCoversIPv6AndSharedSpace(t *testing.T) { + t.Parallel() + + assert := internal.NewAssert(t, "TestIsInternalIPCoversIPv6AndSharedSpace") + + ips := []net.IP{ + net.ParseIP("fd12:3456:789a::1"), + net.ParseIP("fe80::1"), + net.ParseIP("100.64.0.1"), + net.ParseIP("100.127.255.255"), + net.ParseIP("100.63.255.255"), + net.ParseIP("100.128.0.1"), + net.ParseIP("::ffff:192.168.0.1"), + net.ParseIP("64:ff9b::a9fe:a9fe"), + net.ParseIP("64:ff9b::808:808"), + net.ParseIP("2002:7f00:1::1"), + net.ParseIP("2002:808:808::1"), + net.ParseIP("2001::80ff:fffe"), + net.ParseIP("2001:db8::1"), + } + expected := []bool{ + true, true, true, true, false, false, true, + true, false, true, false, true, false, + } + + for i := 0; i < len(ips); i++ { + assert.Equal(expected[i], IsInternalIP(ips[i])) + } +} + func TestGetIps(t *testing.T) { ips := GetIps() t.Log(ips)