From 76cdc14c45cc768869a3220903a9ce6e64b5e460 Mon Sep 17 00:00:00 2001 From: VishalDalwadi Date: Sat, 4 Apr 2026 19:33:02 +0530 Subject: [PATCH 1/2] fix(go): add check for empty address range; --- migrate/migrate_v1_5_1.go | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/migrate/migrate_v1_5_1.go b/migrate/migrate_v1_5_1.go index 5d493bf7..82fdac4c 100644 --- a/migrate/migrate_v1_5_1.go +++ b/migrate/migrate_v1_5_1.go @@ -207,18 +207,23 @@ func migrateNetworks(ctx context.Context) error { return err } - _, cidr, err := net.ParseCIDR(network.AddressRange) - if err != nil { - err = fmt.Errorf("error parsing network (%s) cidr (%s): %v", _network.Name, network.AddressRange, err) - logger.Log(4, fmt.Sprintf("migrating network %s failed: %v", _network.Name, err)) - return err + var cidr, cidrv6 *net.IPNet + if len(network.AddressRange) == 0 { + _, cidr, err = net.ParseCIDR(network.AddressRange) + if err != nil { + err = fmt.Errorf("error parsing network (%s) cidr (%s): %v", _network.Name, network.AddressRange, err) + logger.Log(4, fmt.Sprintf("migrating network %s failed: %v", _network.Name, err)) + return err + } } - _, cidrv6, err := net.ParseCIDR(network.AddressRange6) - if err != nil { - err = fmt.Errorf("error parsing network (%s) cidr (%s): %v", _network.Name, network.AddressRange6, err) - logger.Log(4, fmt.Sprintf("migrating network %s failed: %v", _network.Name, err)) - return err + if len(network.AddressRange6) == 0 { + _, cidrv6, err = net.ParseCIDR(network.AddressRange6) + if err != nil { + err = fmt.Errorf("error parsing network (%s) cidr (%s): %v", _network.Name, network.AddressRange6, err) + logger.Log(4, fmt.Sprintf("migrating network %s failed: %v", _network.Name, err)) + return err + } } superAdmin := &schema.User{} @@ -253,7 +258,8 @@ func migrateNetworks(ctx context.Context) error { if net.ParseIP(nsIP) == nil { continue } - if !cidr.Contains(net.ParseIP(nsIP)) && !cidrv6.Contains(net.ParseIP(nsIP)) { + if (cidr != nil && !cidr.Contains(net.ParseIP(nsIP))) && + (cidrv6 != nil && !cidrv6.Contains(net.ParseIP(nsIP))) { ns.Servers = append(ns.Servers, nsIP) } } From 65bcd565edea1cb2b6cba129b554b8e2f1f8204d Mon Sep 17 00:00:00 2001 From: VishalDalwadi Date: Sat, 4 Apr 2026 19:41:42 +0530 Subject: [PATCH 2/2] fix(go): add check for empty address range; --- migrate/migrate_v1_5_1.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migrate/migrate_v1_5_1.go b/migrate/migrate_v1_5_1.go index 82fdac4c..443ef5e5 100644 --- a/migrate/migrate_v1_5_1.go +++ b/migrate/migrate_v1_5_1.go @@ -208,7 +208,7 @@ func migrateNetworks(ctx context.Context) error { } var cidr, cidrv6 *net.IPNet - if len(network.AddressRange) == 0 { + if len(network.AddressRange) != 0 { _, cidr, err = net.ParseCIDR(network.AddressRange) if err != nil { err = fmt.Errorf("error parsing network (%s) cidr (%s): %v", _network.Name, network.AddressRange, err) @@ -217,7 +217,7 @@ func migrateNetworks(ctx context.Context) error { } } - if len(network.AddressRange6) == 0 { + if len(network.AddressRange6) != 0 { _, cidrv6, err = net.ParseCIDR(network.AddressRange6) if err != nil { err = fmt.Errorf("error parsing network (%s) cidr (%s): %v", _network.Name, network.AddressRange6, err)