refactor: centralize CIDR whitespace normalization

Author: sechmann

internal/helper/helper_darwin.go

@@ -8,7 +8,6 @@ import (
 	"net/netip"
 	"os"
 	"os/exec"
-	"strings"
 	"sync"
 	"syscall"
 	"time"
@@ -82,7 +81,6 @@ func (c *DarwinConfigurator) SetupRoutes(ctx context.Context, gateways []*pb.Gat
 	routesAdded := 0
 	for _, gw := range gateways {
 		for _, cidr := range gw.GetRoutesIPv4() {
-			cidr = strings.TrimSpace(cidr)
 			if IsTunnelRoute(tunnelNet, cidr) {
 				continue
 			}
@@ -93,7 +91,6 @@ func (c *DarwinConfigurator) SetupRoutes(ctx context.Context, gateways []*pb.Gat
 		}
 
 		for _, cidr := range gw.GetRoutesIPv6() {
-			cidr = strings.TrimSpace(cidr)
 			if IsTunnelRoute(tunnelNet, cidr) {
 				continue
 			}

internal/helper/helper_linux.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net"
 	"net/netip"
-	"strings"
 	"sync"
 	"syscall"
 
@@ -75,8 +74,6 @@ func (c *LinuxConfigurator) SetupRoutes(ctx context.Context, gateways []*pb.Gate
 	routesAdded := 0
 	for _, gw := range gateways {
 		for _, cidr := range append(gw.GetRoutesIPv4(), gw.GetRoutesIPv6()...) {
-			cidr = strings.TrimSpace(cidr)
-
 			if IsTunnelRoute(tunnelNet, cidr) {
 				c.log.WithFields(logrus.Fields{
 					"cidr":    cidr,

internal/helper/helper_windows.go

@@ -7,7 +7,6 @@ import (
 	"net"
 	"net/netip"
 	"os"
-	"strings"
 	"sync"
 
 	"github.com/sirupsen/logrus"
@@ -66,8 +65,6 @@ func (c *WindowsConfigurator) SetupRoutes(ctx context.Context, gateways []*pb.Ga
 	routesAdded := 0
 	for _, gw := range gateways {
 		for _, cidr := range append(gw.GetRoutesIPv4(), gw.GetRoutesIPv6()...) {
-			cidr = strings.TrimSpace(cidr)
-
 			if IsTunnelRoute(c.tunnelNet, cidr) {
 				continue
 			}

internal/iputil/iputil.go

@@ -4,11 +4,14 @@ package iputil
 import (
 	"fmt"
 	"net/netip"
+	"strings"
 )
 
 // ParsePrefix parses s as a CIDR prefix.
 // Bare IP addresses without a prefix length are treated as host addresses (/32 or /128).
 func ParsePrefix(s string) (netip.Prefix, error) {
+	s = strings.TrimSpace(s)
+
 	prefix, err := netip.ParsePrefix(s)
 	if err == nil {
 		return prefix, nil

internal/iputil/iputil_test.go

@@ -40,6 +40,16 @@ func TestParsePrefix(t *testing.T) {
 			input: "fd00::1",
 			want:  netip.MustParsePrefix("fd00::1/128"),
 		},
+		{
+			name:  "CIDR with surrounding whitespace",
+			input: " 10.0.0.0/24 ",
+			want:  netip.MustParsePrefix("10.0.0.0/24"),
+		},
+		{
+			name:  "bare IP with surrounding whitespace",
+			input: " 10.43.0.60 ",
+			want:  netip.MustParsePrefix("10.43.0.60/32"),
+		},
 		{
 			name:    "garbage input",
 			input:   "not-an-ip",