TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-03-01 19:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove duplicates from patched prefs and add correct netMap to testbackend so the routes won't disappear.

Browse Source
This commit is contained in:
Kevin Liang 2024-04-09 22:24:08 +00:00
parent 2a39f2fc24
commit 71a36fe15f
2 changed files with 150 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipn/ipnlocal/local.go
View File

@ -3159,6 +3159,8 @@ func (b *LocalBackend) PatchPrefsHandler(mp *ipn.MaskedPrefs) (ipn.PrefsView, er
// will then be advertised again when the prefs are sent.
if !mp.AppConnectorSet {
curRoutes = append(curRoutes, mp.AdvertiseRoutes...)
slices.SortFunc(curRoutes, func(i, j netip.Prefix) int { return i.Addr().Compare(j.Addr()) })
curRoutes = slices.Compact(curRoutes)
mp.AdvertiseRoutes = curRoutes
}
}

154
ipn/ipnlocal/local_test.go
View File

@ -2586,6 +2586,29 @@ func TestPatchPrefsHandlerWithPresistStore(t *testing.T) {
AppConnectorSet: true,
})
appCfgTmpl := `{
"name": "example",
"domains": [%s],
"connectors": ["tag:example"],
"routes":[%s]
}`
appCfg := fmt.Sprintf(appCfgTmpl, `"example.com"`, `"1.2.3.5/32"`)
reconfigWithAppCfg := func(appCfg string) {
b.netMap.SelfNode = (&tailcfg.Node{
Name: "example.ts.net",
Tags: []string{"tag:example"},
CapMap: (tailcfg.NodeCapMap)(map[tailcfg.NodeCapability][]tailcfg.RawMessage{
"tailscale.com/app-connectors": {tailcfg.RawMessage(appCfg)},
}),
}).View()
b.reconfigAppConnectorLocked(b.netMap, b.pm.prefs)
b.appConnector.Wait(context.Background())
}
reconfigWithAppCfg(appCfg)
now := time.Now()
ri := routeinfo.NewRouteInfo()
ri.Control = []netip.Prefix{prefix2}
@ -2598,10 +2621,8 @@ func TestPatchPrefsHandlerWithPresistStore(t *testing.T) {
}
ri.Discovered = discovered
b.StoreRouteInfo(ri)
b.AdvertiseRoute([]netip.Prefix{prefix2, prefix3}...)
testAppConnector.RouteInfo()
b.appConnector.UpdateRouteInfo(ri)
b.AdvertiseRoute([]netip.Prefix{prefix3}...)
prefView, err := b.PatchPrefsHandler(mp)
if err != nil {
@ -2632,7 +2653,7 @@ func TestPatchPrefsHandlerWithPresistStore(t *testing.T) {
//Check if the routes in control and discovered are presisted.
routesShouldPresist := storedRouteInfo.Routes(false, true, true)
if len(routesShouldPresist) != 2 {
t.Fatalf("wanted %d, got %d", 1, len(routesShouldPresist))
t.Fatalf("wanted %d, got %d", 2, len(routesShouldPresist))
}
if !slices.Contains(routesShouldPresist, prefix2) || !slices.Contains(routesShouldPresist, prefix3) {
t.Fatalf("Pre-existed routes not presisted.")
@ -2683,7 +2704,29 @@ func TestPatchPrefsHandlerWithoutPresistStore(t *testing.T) {
AppConnectorSet: true,
})
b.AdvertiseRoute([]netip.Prefix{prefix2, prefix3}...)
appCfgTmpl := `{
"name": "example",
"domains": [%s],
"connectors": ["tag:example"],
"routes":[%s]
}`
appCfg := fmt.Sprintf(appCfgTmpl, `"example.com"`, `"1.2.3.5/32"`)
reconfigWithAppCfg := func(appCfg string) {
b.netMap.SelfNode = (&tailcfg.Node{
Name: "example.ts.net",
Tags: []string{"tag:example"},
CapMap: (tailcfg.NodeCapMap)(map[tailcfg.NodeCapability][]tailcfg.RawMessage{
"tailscale.com/app-connectors": {tailcfg.RawMessage(appCfg)},
}),
}).View()
b.reconfigAppConnectorLocked(b.netMap, b.pm.prefs)
b.appConnector.Wait(context.Background())
}
reconfigWithAppCfg(appCfg)
b.AdvertiseRoute([]netip.Prefix{prefix3}...)
testAppConnector.RouteInfo()
@ -2841,3 +2884,102 @@ func TestFran(t *testing.T) {
}
}
}
func TestPatchPrefsHandlerNoDuplicateAdvertisement(t *testing.T) {
// test can read what's written
prefix1 := netip.MustParsePrefix("1.2.3.4/32")
prefix2 := netip.MustParsePrefix("1.2.3.5/32")
prefix3 := netip.MustParsePrefix("1.2.3.6/32")
mp := new(ipn.MaskedPrefs)
mp.AdvertiseRoutesSet = true
mp.AdvertiseRoutes = []netip.Prefix{prefix1}
b := newTestBackend(t)
testAppConnector := appc.NewAppConnector(t.Logf, b, true)
b.appConnector = testAppConnector
b.ControlKnobs().AppCStoreRoutes.Store(true)
b.EditPrefs(&ipn.MaskedPrefs{
Prefs: ipn.Prefs{
AppConnector: ipn.AppConnectorPrefs{
Advertise: true,
},
},
AppConnectorSet: true,
})
appCfgTmpl := `{
"name": "example",
"domains": [%s],
"connectors": ["tag:example"],
"routes":[%s]
}`
appCfg := fmt.Sprintf(appCfgTmpl, `"example.com"`, `"1.2.3.4/32", "1.2.3.5/32"`)
reconfigWithAppCfg := func(appCfg string) {
b.netMap.SelfNode = (&tailcfg.Node{
Name: "example.ts.net",
Tags: []string{"tag:example"},
CapMap: (tailcfg.NodeCapMap)(map[tailcfg.NodeCapability][]tailcfg.RawMessage{
"tailscale.com/app-connectors": {tailcfg.RawMessage(appCfg)},
}),
}).View()
b.reconfigAppConnectorLocked(b.netMap, b.pm.prefs)
b.appConnector.Wait(context.Background())
}
reconfigWithAppCfg(appCfg)
now := time.Now()
ri := routeinfo.NewRouteInfo()
ri.Control = []netip.Prefix{prefix1, prefix2}
discovered := make(map[string]*routeinfo.DatedRoutes)
routes := make(map[netip.Prefix]time.Time)
routes[prefix3] = now
discovered["example.com"] = &routeinfo.DatedRoutes{
LastCleanup: now,
Routes: routes,
}
ri.Discovered = discovered
b.appConnector.UpdateRouteInfo(ri)
b.AdvertiseRoute([]netip.Prefix{prefix3}...)
prefView, err := b.PatchPrefsHandler(mp)
if err != nil {
t.Fatalf(err.Error())
}
if prefView.AdvertiseRoutes().Len() != 3 {
t.Fatalf("wanted %d, got %d", 3, prefView.AdvertiseRoutes().Len())
}
if !slices.Contains(prefView.AdvertiseRoutes().AsSlice(), prefix1) {
t.Fatalf("New prefix was not advertised")
}
if !slices.Contains(prefView.AdvertiseRoutes().AsSlice(), prefix2) || !slices.Contains(prefView.AdvertiseRoutes().AsSlice(), prefix3) {
t.Fatalf("Old prefixes are no longer advertised.")
}
//Patch again with no route, see if prefix1 is removed/ prefix2, prefix3 presists.
mp.AdvertiseRoutes = []netip.Prefix{}
prefView2, err := b.PatchPrefsHandler(mp)
if err != nil {
t.Fatalf(err.Error())
}
if prefView2.AdvertiseRoutes().Len() != 3 {
t.Fatalf("wanted %d, got %d", 3, prefView.AdvertiseRoutes().Len())
}
if !slices.Contains(prefView2.AdvertiseRoutes().AsSlice(), prefix1) {
t.Fatalf("Local route was not removed")
}
if !slices.Contains(prefView2.AdvertiseRoutes().AsSlice(), prefix2) || !slices.Contains(prefView.AdvertiseRoutes().AsSlice(), prefix3) {
t.Fatalf("Old prefixes are no longer advertised.")
}
}