gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-01 17:34:50 +08:00
Code Issues Projects Releases Packages Wiki Activity

normalize cidr on network/egress gateway creation

Browse source
This commit is contained in:
Matthew R. Kasun 2022-09-03 08:55:49 -04:00
parent edce72cf1e
commit 6b42cbe120
3 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
logic/gateway.go
View file

@ -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

14
logic/networks.go
View file

@ -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()

17
logic/util.go
View file

@ -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
}