TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-20 11:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: make TestShrinkDefaultRoute hermetic

Browse Source 
Make shrinkDefaultRoute a pure function.
Instead of calling interfaceRoutes, accept that information as parameters.
Hard-code those parameters in TestShrinkDefaultRoute.

Fixes #3580

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder 2021-12-16 11:15:45 -08:00 committed by Josh Bleecher Snyder
parent 894693f352
commit add6dc8ccc
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ipn/ipnlocal/local.go
View File

@ -1020,7 +1020,12 @@ func (b *LocalBackend) updateFilter(netMap *netmap.NetworkMap, prefs *ipn.Prefs)
// wifi": you get internet access, but to additionally // wifi": you get internet access, but to additionally
// get LAN access the LAN(s) need to be offered // get LAN access the LAN(s) need to be offered
// explicitly as well. // explicitly as well.
s, err := shrinkDefaultRoute(r) localInterfaceRoutes, hostIPs, err := interfaceRoutes()
if err != nil {
b.logf("getting local interface routes: %v", err)
continue
}
s, err := shrinkDefaultRoute(r, localInterfaceRoutes, hostIPs)
if err != nil { if err != nil {
b.logf("computing default route filter: %v", err) b.logf("computing default route filter: %v", err)
continue continue
@ -1164,17 +1169,14 @@ func interfaceRoutes() (ips *netaddr.IPSet, hostIPs []netaddr.IP, err error) {
} }
// shrinkDefaultRoute returns an IPSet representing the IPs in route, // shrinkDefaultRoute returns an IPSet representing the IPs in route,
// minus those in removeFromDefaultRoute and local interface subnets. // minus those in removeFromDefaultRoute and localInterfaceRoutes,
func shrinkDefaultRoute(route netaddr.IPPrefix) (*netaddr.IPSet, error) { // plus the IPs in hostIPs.
interfaceRoutes, hostIPs, err := interfaceRoutes() func shrinkDefaultRoute(route netaddr.IPPrefix, localInterfaceRoutes *netaddr.IPSet, hostIPs []netaddr.IP) (*netaddr.IPSet, error) {
if err != nil {
return nil, err
}
var b netaddr.IPSetBuilder var b netaddr.IPSetBuilder
// Add the default route. // Add the default route.
b.AddPrefix(route) b.AddPrefix(route)
// Remove the local interface routes. // Remove the local interface routes.
b.RemoveSet(interfaceRoutes) b.RemoveSet(localInterfaceRoutes)
// Having removed all the LAN subnets, re-add the hosts's own // Having removed all the LAN subnets, re-add the hosts's own
// IPs. It's fine for clients to connect to an exit node's public // IPs. It's fine for clients to connect to an exit node's public

30
ipn/ipnlocal/local_test.go
View File

@ -178,9 +178,31 @@ func TestShrinkDefaultRoute(t *testing.T) {
}, },
} }
// Construct a fake local network environment to make this test hermetic.
// localInterfaceRoutes and hostIPs would normally come from calling interfaceRoutes,
// and localAddresses would normally come from calling interfaces.LocalAddresses.
var b netaddr.IPSetBuilder
for _, c := range []string{"127.0.0.0/8", "192.168.9.0/24", "fe80::/32"} {
p := netaddr.MustParseIPPrefix(c)
b.AddPrefix(p)
}
localInterfaceRoutes, err := b.IPSet()
if err != nil {
t.Fatal(err)
}
hostIPs := []netaddr.IP{
netaddr.MustParseIP("127.0.0.1"),
netaddr.MustParseIP("192.168.9.39"),
netaddr.MustParseIP("fe80::1"),
netaddr.MustParseIP("fe80::437d:feff:feca:49a7"),
}
localAddresses := []netaddr.IP{
netaddr.MustParseIP("192.168.9.39"),
}
for _, test := range tests { for _, test := range tests {
def := netaddr.MustParseIPPrefix(test.route) def := netaddr.MustParseIPPrefix(test.route)
got, err := shrinkDefaultRoute(def) got, err := shrinkDefaultRoute(def, localInterfaceRoutes, hostIPs)
if err != nil { if err != nil {
t.Fatalf("shrinkDefaultRoute(%q): %v", test.route, err) t.Fatalf("shrinkDefaultRoute(%q): %v", test.route, err)
} }
@ -194,11 +216,7 @@ func TestShrinkDefaultRoute(t *testing.T) {
t.Errorf("shrink(%q).Contains(%v) = true, want false", test.route, ip) t.Errorf("shrink(%q).Contains(%v) = true, want false", test.route, ip)
} }
} }
ips, _, err := interfaces.LocalAddresses() for _, ip := range localAddresses {
if err != nil {
t.Fatal(err)
}
for _, ip := range ips {
want := test.localIPFn(ip) want := test.localIPFn(ip)
if gotContains := got.Contains(ip); gotContains != want { if gotContains := got.Contains(ip); gotContains != want {
t.Errorf("shrink(%q).Contains(%v) = %v, want %v", test.route, ip, gotContains, want) t.Errorf("shrink(%q).Contains(%v) = %v, want %v", test.route, ip, gotContains, want)