From 6b42cbe120ead9976e3403b6699eb9c32f6d91bd Mon Sep 17 00:00:00 2001
From: "Matthew R. Kasun" <mkasun@nusak.ca>
Date: Sat, 3 Sep 2022 08:55:49 -0400
Subject: [PATCH] normalize cidr on network/egress gateway creation

---
 logic/gateway.go  |  8 ++++++++
 logic/networks.go | 14 ++++++++++++++
 logic/util.go     | 17 +++++++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/logic/gateway.go b/logic/gateway.go
index b36589f2..944fd3e5 100644
--- a/logic/gateway.go
+++ b/logic/gateway.go
@@ -14,6 +14,14 @@ import (
 
 // CreateEgressGateway - creates an egress gateway
 func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, error) {
+	for i, cidr := range gateway.Ranges {
+		normalized, err := NormalizeCIDR(cidr)
+		if err != nil {
+			return models.Node{}, nil
+		}
+		gateway.Ranges[i] = normalized
+
+	}
 	node, err := GetNodeByID(gateway.NodeID)
 	if err != nil {
 		return models.Node{}, err
diff --git a/logic/networks.go b/logic/networks.go
index 3802b9a3..9400e7b9 100644
--- a/logic/networks.go
+++ b/logic/networks.go
@@ -70,6 +70,20 @@ func DeleteNetwork(network string) error {
 // CreateNetwork - creates a network in database
 func CreateNetwork(network models.Network) (models.Network, error) {
 
+	if network.AddressRange != "" {
+		normalizedRange, err := NormalizeCIDR(network.AddressRange)
+		if err != nil {
+			return models.Network{}, err
+		}
+		network.AddressRange = normalizedRange
+	}
+	if network.AddressRange6 != "" {
+		normalizedRange, err := NormalizeCIDR(network.AddressRange6)
+		if err != nil {
+			return models.Network{}, err
+		}
+		network.AddressRange6 = normalizedRange
+	}
 	network.SetDefaults()
 	network.SetNodesLastModified()
 	network.SetNetworkLastModified()
diff --git a/logic/util.go b/logic/util.go
index af68afbd..7315d39b 100644
--- a/logic/util.go
+++ b/logic/util.go
@@ -13,6 +13,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/c-robinson/iplib"
 	"github.com/gravitl/netmaker/database"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/models"
@@ -169,3 +170,19 @@ func ShouldPublishPeerPorts(serverNode *models.Node) bool {
 	}
 	return false
 }
+
+// NormalCidr - returns the first address of CIDR
+func NormalizeCIDR(address string) (string, error) {
+	ip, IPNet, err := net.ParseCIDR(address)
+	if err != nil {
+		return "", err
+	}
+	if ip.To4() == nil {
+		net6 := iplib.Net6FromStr(IPNet.String())
+		IPNet.IP = net6.FirstAddress()
+	} else {
+		net4 := iplib.Net4FromStr(IPNet.String())
+		IPNet.IP = net4.FirstAddress()
+	}
+	return IPNet.String(), nil
+}