gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-13 00:24:31 +08:00
Code Issues Projects Releases Packages Wiki Activity

updating route setting logic

Browse source
This commit is contained in:
afeiszli 2022-06-15 11:18:49 -04:00
parent cd78a7c902
commit d3a6faa90d
4 changed files with 51 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
logic/peers.go
View file

@ -377,33 +377,25 @@ func GetPeerUpdateForRelayedNode(node *models.Node) (models.PeerUpdate, error) {
allowedips = append(allowedips, peer.AllowedIPs...)
}
//delete any ips not permitted by acl
for i, ip := range allowedips {
target, err := findNode(ip.IP.String())
for i := len(allowedips) - 1; i >= 0; i-- {
target, err := findNode(allowedips[i].IP.String())
if err != nil {
logger.Log(0, "failed to find node for ip", ip.IP.String(), err.Error())
logger.Log(0, "failed to find node for ip", allowedips[i].IP.String(), err.Error())
continue
}
if target == nil {
logger.Log(0, "failed to find node for ip", ip.IP.String())
logger.Log(0, "failed to find node for ip", allowedips[i].IP.String())
continue
}
if !nodeacls.AreNodesAllowed(nodeacls.NetworkID(node.Network), nodeacls.NodeID(node.ID), nodeacls.NodeID(target.ID)) {
logger.Log(0, "deleting node from relayednode per acl", node.Name, target.Name)
if i+1 == len(allowedips) {
allowedips = allowedips[:i]
} else {
allowedips = append(allowedips[:i], allowedips[i+1:]...)
}
allowedips = append(allowedips[:i], allowedips[i+1:]...)
}
}
//delete self from allowed ips
for i, ip := range allowedips {
if ip.IP.String() == node.Address || ip.IP.String() == node.Address6 {
if i+1 == len(allowedips) {
allowedips = allowedips[:i]
} else {
allowedips = append(allowedips[:i], allowedips[i+1:]...)
}
for i := len(allowedips) - 1; i >= 0; i-- {
if allowedips[i].IP.String() == node.Address || allowedips[i].IP.String() == node.Address6 {
allowedips = append(allowedips[:i], allowedips[i+1:]...)
}
}

39
netclient/local/routes.go
View file

@ -11,41 +11,26 @@ import (
// TODO handle ipv6 in future
// SetPeerRoutes - sets/removes ip routes for each peer on a network
func SetPeerRoutes(iface string, oldPeers map[string][]net.IPNet, newPeers []wgtypes.PeerConfig) {
func SetPeerRoutes(iface string, oldPeers map[string]bool, newPeers []wgtypes.PeerConfig) {
// traverse through all recieved peers
for _, peer := range newPeers {
// if pubkey found in existing peers, check against existing peer
currPeerAllowedIPs := oldPeers[peer.PublicKey.String()]
if currPeerAllowedIPs != nil {
// traverse IPs, check to see if old peer contains each IP
for _, allowedIP := range peer.AllowedIPs { // compare new ones (if any) to old ones
if !ncutils.IPNetSliceContains(currPeerAllowedIPs, allowedIP) {
if err := setRoute(iface, &allowedIP, allowedIP.IP.String()); err != nil {
logger.Log(1, err.Error())
}
}
}
for _, allowedIP := range currPeerAllowedIPs { // compare old ones (if any) to new ones
if !ncutils.IPNetSliceContains(peer.AllowedIPs, allowedIP) {
if err := deleteRoute(iface, &allowedIP, allowedIP.IP.String()); err != nil {
logger.Log(1, err.Error())
}
}
}
delete(oldPeers, peer.PublicKey.String()) // remove peer as it was found and processed
} else {
for _, allowedIP := range peer.AllowedIPs { // add all routes as peer doesn't exist
if err := setRoute(iface, &allowedIP, allowedIP.String()); err != nil {
for _, allowedIP := range peer.AllowedIPs {
if !oldPeers[allowedIP.String()] {
if err := setRoute(iface, &allowedIP, allowedIP.IP.String()); err != nil {
logger.Log(1, err.Error())
}
} else {
delete(oldPeers, allowedIP.String())
}
}
}
// traverse through all remaining existing peers
for _, allowedIPs := range oldPeers {
for _, allowedIP := range allowedIPs {
deleteRoute(iface, &allowedIP, allowedIP.IP.String())
for i, _ := range oldPeers {
ip, err := ncutils.GetIPNetFromString(i)
if err != nil {
logger.Log(1, err.Error())
} else {
deleteRoute(iface, &ip, ip.IP.String())
}
}
}

26
netclient/ncutils/netclientutils.go
View file

@ -19,6 +19,7 @@ import (
"strings"
"time"
"github.com/c-robinson/iplib"
"github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/models"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
@ -593,3 +594,28 @@ func MakeRandomString(n int) string {
}
return string(result)
}
func GetIPNetFromString(ip string) (net.IPNet, error) {
var ipnet *net.IPNet
var err error
// parsing as a CIDR first. If valid CIDR, append
if _, cidr, err := net.ParseCIDR(ip); err == nil {
ipnet = cidr
} else { // parsing as an IP second. If valid IP, check if ipv4 or ipv6, then append
if iplib.Version(net.ParseIP(ip)) == 4 {
ipnet = &net.IPNet{
IP: net.ParseIP(ip),
Mask: net.CIDRMask(32, 32),
}
} else if iplib.Version(net.ParseIP(ip)) == 6 {
ipnet = &net.IPNet{
IP: net.ParseIP(ip),
Mask: net.CIDRMask(128, 128),
}
}
}
if ipnet == nil {
err = errors.New(ip + " is not a valid ip or cidr")
}
return *ipnet, err
}

7
netclient/wireguard/common.go
View file

@ -28,7 +28,8 @@ const (
func SetPeers(iface string, node *models.Node, peers []wgtypes.PeerConfig) error {
var devicePeers []wgtypes.Peer
var keepalive = node.PersistentKeepalive
var oldPeerAllowedIps = make(map[string][]net.IPNet, len(peers))
var oldPeerAllowedIps = make(map[string]bool, len(peers))
var err error
devicePeers, err = GetDevicePeers(iface)
if err != nil {
@ -106,7 +107,9 @@ func SetPeers(iface string, node *models.Node, peers []wgtypes.PeerConfig) error
log.Println(output, "error removing peer", currentPeer.PublicKey.String())
}
}
oldPeerAllowedIps[currentPeer.PublicKey.String()] = currentPeer.AllowedIPs
for _, ip := range currentPeer.AllowedIPs {
oldPeerAllowedIps[ip.String()] = true
}
}
}
}