TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/tsaddr: extract IsTailscaleIPv4 from IsTailscaleIP (#14169)

Browse Source 
Extracts tsaddr.IsTailscaleIPv4 out of tsaddr.IsTailscaleIP.

This will allow for checking valid Tailscale assigned IPv4 addresses
without checking IPv6 addresses.

Updates #14168
Updates tailscale/corp#24620

Signed-off-by: James Scott <jim@tailscale.com>
This commit is contained in:
James Scott 2024-11-20 12:28:25 -08:00 committed by GitHub
parent ebeb5da202
commit ebaf33a80c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 76 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/tsaddr/tsaddr.go
View File

@ -66,15 +66,21 @@ func TailscaleServiceIPv6() netip.Addr {
TailscaleServiceIPv6String = "fd7a:115c:a1e0::53" TailscaleServiceIPv6String = "fd7a:115c:a1e0::53"
) )
// IsTailscaleIP reports whether ip is an IP address in a range that // IsTailscaleIP reports whether IP is an IP address in a range that
// Tailscale assigns from. // Tailscale assigns from.
func IsTailscaleIP(ip netip.Addr) bool { func IsTailscaleIP(ip netip.Addr) bool {
if ip.Is4() { if ip.Is4() {
return CGNATRange().Contains(ip) && !ChromeOSVMRange().Contains(ip) return IsTailscaleIPv4(ip)
} }
return TailscaleULARange().Contains(ip) return TailscaleULARange().Contains(ip)
} }
// IsTailscaleIPv4 reports whether an IPv4 IP is an IP address that
// Tailscale assigns from.
func IsTailscaleIPv4(ip netip.Addr) bool {
return CGNATRange().Contains(ip) && !ChromeOSVMRange().Contains(ip)
}
// TailscaleULARange returns the IPv6 Unique Local Address range that // TailscaleULARange returns the IPv6 Unique Local Address range that
// is the superset range that Tailscale assigns out of. // is the superset range that Tailscale assigns out of.
func TailscaleULARange() netip.Prefix { func TailscaleULARange() netip.Prefix {

68
net/tsaddr/tsaddr_test.go
View File

@ -222,3 +222,71 @@ func TestContainsExitRoute(t *testing.T) {
} }
} }
} }
func TestIsTailscaleIPv4(t *testing.T) {
tests := []struct {
in netip.Addr
want bool
}{
{
in: netip.MustParseAddr("100.67.19.57"),
want: true,
},
{
in: netip.MustParseAddr("10.10.10.10"),
want: false,
},
{
in: netip.MustParseAddr("fd7a:115c:a1e0:3f2b:7a1d:4e88:9c2b:7f01"),
want: false,
},
{
in: netip.MustParseAddr("bc9d:0aa0:1f0a:69ab:eb5c:28e0:5456:a518"),
want: false,
},
{
in: netip.MustParseAddr("100.115.92.157"),
want: false,
},
}
for _, tt := range tests {
if got := IsTailscaleIPv4(tt.in); got != tt.want {
t.Errorf("IsTailscaleIPv4() = %v, want %v", got, tt.want)
}
}
}
func TestIsTailscaleIP(t *testing.T) {
tests := []struct {
in netip.Addr
want bool
}{
{
in: netip.MustParseAddr("100.67.19.57"),
want: true,
},
{
in: netip.MustParseAddr("10.10.10.10"),
want: false,
},
{
in: netip.MustParseAddr("fd7a:115c:a1e0:3f2b:7a1d:4e88:9c2b:7f01"),
want: true,
},
{
in: netip.MustParseAddr("bc9d:0aa0:1f0a:69ab:eb5c:28e0:5456:a518"),
want: false,
},
{
in: netip.MustParseAddr("100.115.92.157"),
want: false,
},
}
for _, tt := range tests {
if got := IsTailscaleIP(tt.in); got != tt.want {
t.Errorf("IsTailscaleIP() = %v, want %v", got, tt.want)
}
}
}