fix(vpn): handle sending nil router config

ethanndickson · ethanndickson · commit 45ef86bd4763 · 2025-01-28T04:02:47.000Z
diff --git a/vpn/router.go b/vpn/router.go
@@ -22,7 +22,10 @@ func (*vpnRouter) Up() error {
 }
 
 func (v *vpnRouter) Set(cfg *router.Config) error {
-	req := convertRouterConfig(cfg)
+	if cfg == nil {
+		return nil
+	}
+	req := convertRouterConfig(*cfg)
 	return v.tunnel.ApplyNetworkSettings(v.tunnel.ctx, req)
 }
 
@@ -31,7 +34,7 @@ func (*vpnRouter) Close() error {
 	return nil
 }
 
-func convertRouterConfig(cfg *router.Config) *NetworkSettingsRequest {
+func convertRouterConfig(cfg router.Config) *NetworkSettingsRequest {
 	v4LocalAddrs := make([]string, 0)
 	v6LocalAddrs := make([]string, 0)
 	for _, addrs := range cfg.LocalAddrs {
diff --git a/vpn/router_internal_test.go b/vpn/router_internal_test.go
@@ -13,12 +13,12 @@ func TestConvertRouterConfig(t *testing.T) {
 
 	tests := []struct {
 		name     string
-		cfg      *router.Config
+		cfg      router.Config
 		expected *NetworkSettingsRequest
 	}{
 		{
 			name: "IPv4 and IPv6 configuration",
-			cfg: &router.Config{
+			cfg: router.Config{
 				LocalAddrs:  []netip.Prefix{netip.MustParsePrefix("100.64.0.1/32"), netip.MustParsePrefix("fd7a:115c:a1e0::1/128")},
 				Routes:      []netip.Prefix{netip.MustParsePrefix("192.168.0.0/24"), netip.MustParsePrefix("fd00::/64")},
 				LocalRoutes: []netip.Prefix{netip.MustParsePrefix("10.0.0.0/8"), netip.MustParsePrefix("2001:db8::/32")},
@@ -48,7 +48,7 @@ func TestConvertRouterConfig(t *testing.T) {
 		},
 		{
 			name: "Empty",
-			cfg:  &router.Config{},
+			cfg:  router.Config{},
 			expected: &NetworkSettingsRequest{
 				Ipv4Settings: &NetworkSettingsRequest_IPv4Settings{
 					Addrs:          []string{},

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,10 @@ func (*vpnRouter) Up() error {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`func (v vpnRouter) Set(cfg router.Config) error {`
`25`		`- req := convertRouterConfig(cfg)`
	`25`	`+ if cfg == nil {`
	`26`	`+ return nil`
	`27`	`+ }`
	`28`	`+ req := convertRouterConfig(*cfg)`
`26`	`29`	`return v.tunnel.ApplyNetworkSettings(v.tunnel.ctx, req)`
`27`	`30`	`}`
`28`	`31`
`@@ -31,7 +34,7 @@ func (*vpnRouter) Close() error {`
`31`	`34`	`return nil`
`32`	`35`	`}`
`33`	`36`
`34`		`-func convertRouterConfig(cfg router.Config) NetworkSettingsRequest {`
	`37`	`+func convertRouterConfig(cfg router.Config) *NetworkSettingsRequest {`
`35`	`38`	`v4LocalAddrs := make([]string, 0)`
`36`	`39`	`v6LocalAddrs := make([]string, 0)`
`37`	`40`	`for _, addrs := range cfg.LocalAddrs {`