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

Merge pull request #1467 from gravitl/refactor_v0.14.7_server_routing

Browse source 
refactor server routing
This commit is contained in:
Alex Feiszli 2022-08-22 09:37:10 -04:00 • committed by GitHub
commit 45df9b6bac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 243 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
controllers/network.go
View file

@ -39,7 +39,7 @@ func networkHandlers(r *mux.Router) {
r.HandleFunc("/api/networks/{networkname}/acls", securityCheck(true, http.HandlerFunc(getNetworkACL))).Methods("GET")
}
//simple get all networks function
// simple get all networks function
func getNetworks(w http.ResponseWriter, r *http.Request) {
headerNetworks := r.Header.Get("networks")
@ -216,9 +216,7 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) {
return
}
for _, node := range nodes {
if err = mq.NodeUpdate(&node); err != nil {
logger.Log(1, "failed to send update to node during a network wide update", node.Name, node.ID, err.Error())
}
runUpdates(&node, true)
}
}

41
logic/server.go
View file

@ -11,8 +11,8 @@ import (
"github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/netclient/ncutils"
"github.com/gravitl/netmaker/netclient/wireguard"
"github.com/gravitl/netmaker/servercfg"
"golang.org/x/exp/slices"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
)
@ -148,13 +148,13 @@ func ServerJoin(networkSettings *models.Network) (models.Node, error) {
return returnNode, err
}
peers, hasGateway, gateways, err := GetServerPeers(node)
peers, err := GetPeerUpdate(node)
if err != nil && !ncutils.IsEmptyRecord(err) {
logger.Log(1, "failed to retrieve peers")
return returnNode, err
}
err = initWireguard(node, privateKey, peers[:], hasGateway, gateways[:])
err = wireguard.InitWireguard(node, privateKey, peers.Peers, false)
if err != nil {
return returnNode, err
}
@ -188,41 +188,6 @@ func ServerUpdate(serverNode *models.Node, ifaceDelta bool) error {
return serverPush(serverNode)
}
/**
* Below function needs major refactor
*
*/
// GetServerPeers - gets peers of server
func GetServerPeers(serverNode *models.Node) ([]wgtypes.PeerConfig, bool, []string, error) {
update, err := GetPeerUpdate(serverNode)
if err != nil {
return []wgtypes.PeerConfig{}, false, []string{}, err
}
// this is temporary code, should be removed by 0.14.4
// refactor server routing to use client-side routing code
var hasGateways = false
var gateways = []string{}
nodes, err := GetNetworkNodes(serverNode.Network)
if err == nil {
for _, node := range nodes {
//if egress ranges is internet (0.0.0.0/0 or ::/0) remove as don't want server to use internet gateway
if node.IsEgressGateway == "yes" && (slices.Contains(node.EgressGatewayRanges, "0.0.0.0/0") || slices.Contains(node.EgressGatewayRanges, "::/0")) {
logger.Log(0, "skipping internet gateway for server")
continue
}
if node.IsEgressGateway == "yes" && !IsLocalServer(&node) {
gateways = append(gateways, node.EgressGatewayRanges...)
}
}
hasGateways = len(gateways) > 0
}
// end temporary code
return update.Peers, hasGateways, gateways, nil
}
// == Private ==
func isDeleteError(err error) bool {

203
logic/wireguard.go
View file

@ -1,18 +1,12 @@
package logic
import (
"errors"
"fmt"
"net"
"os"
"os/exec"
"strconv"
"strings"
"time"
"github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/netclient/local"
"github.com/gravitl/netmaker/netclient/ncutils"
"github.com/gravitl/netmaker/netclient/wireguard"
"golang.zx2c4.com/wireguard/wgctrl"
@ -123,177 +117,6 @@ func getSystemPeers(node *models.Node) (map[string]string, error) {
}
return peers, nil
}
func initWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig, hasGateway bool, gateways []string) error {
key, err := wgtypes.ParseKey(privkey)
if err != nil {
return err
}
wgclient, err := wgctrl.New()
if err != nil {
return err
}
defer wgclient.Close()
var ifacename string
if node.Interface != "" {
ifacename = node.Interface
} else {
logger.Log(2, "no server interface provided to configure")
}
if node.Address == "" {
logger.Log(2, "no server address to provided configure")
}
if ncutils.IsKernel() {
logger.Log(2, "setting kernel device", ifacename)
network, err := GetNetwork(node.Network)
if err != nil {
logger.Log(0, "failed to get network"+err.Error())
return err
}
var address4 string
var address6 string
var mask4 string
var mask6 string
if network.AddressRange != "" {
net := strings.Split(network.AddressRange, "/")
mask4 = net[len(net)-1]
address4 = node.Address
}
if network.AddressRange6 != "" {
net := strings.Split(network.AddressRange6, "/")
mask6 = net[len(net)-1]
address6 = node.Address6
}
setKernelDevice(ifacename, address4, mask4, address6, mask6)
}
nodeport := int(node.ListenPort)
var conf = wgtypes.Config{
PrivateKey: &key,
ListenPort: &nodeport,
ReplacePeers: true,
Peers: peers,
}
if !ncutils.IsKernel() {
if err := wireguard.WriteWgConfig(node, key.String(), peers); err != nil {
logger.Log(1, "error writing wg conf file: ", err.Error())
return err
}
// spin up userspace + apply the conf file
var deviceiface = ifacename
confPath := ncutils.GetNetclientPathSpecific() + ifacename + ".conf"
d, _ := wgclient.Device(deviceiface)
for d != nil && d.Name == deviceiface {
_ = RemoveConf(ifacename, false) // remove interface first
time.Sleep(time.Second >> 2)
d, _ = wgclient.Device(deviceiface)
}
time.Sleep(time.Second >> 2)
err = applyWGQuickConf(confPath)
if err != nil {
logger.Log(1, "failed to create wireguard interface")
return err
}
} else {
ipExec, err := exec.LookPath("ip")
if err != nil {
return err
}
_, err = wgclient.Device(ifacename)
if err != nil {
if os.IsNotExist(err) {
fmt.Println("Device does not exist: ")
fmt.Println(err)
} else {
return errors.New("Unknown config error: " + err.Error())
}
}
err = wgclient.ConfigureDevice(ifacename, conf)
if err != nil {
if os.IsNotExist(err) {
fmt.Println("Device does not exist: ")
fmt.Println(err)
} else {
fmt.Printf("This is inconvenient: %v", err)
}
}
if _, err := ncutils.RunCmd(ipExec+" link set down dev "+ifacename, false); err != nil {
logger.Log(2, "attempted to remove interface before editing")
return err
}
if node.PostDown != "" {
runcmds := strings.Split(node.PostDown, "; ")
_ = ncutils.RunCmds(runcmds, false)
}
// set MTU of node interface
if _, err := ncutils.RunCmd(ipExec+" link set mtu "+strconv.Itoa(int(node.MTU))+" up dev "+ifacename, true); err != nil {
logger.Log(2, "failed to create interface with mtu", strconv.Itoa(int(node.MTU)), "-", ifacename)
return err
}
if node.PostUp != "" {
runcmds := strings.Split(node.PostUp, "; ")
_ = ncutils.RunCmds(runcmds, true)
}
if hasGateway {
for _, gateway := range gateways {
_, _ = ncutils.RunCmd(ipExec+" -4 route add "+gateway+" dev "+ifacename, true)
}
}
if node.Address != "" {
logger.Log(1, "adding address:", node.Address)
_, _ = ncutils.RunCmd(ipExec+" address add dev "+ifacename+" "+node.Address+"/32", true)
}
if node.Address6 != "" {
logger.Log(1, "adding address6:", node.Address6)
_, _ = ncutils.RunCmd(ipExec+" address add dev "+ifacename+" "+node.Address6+"/128", true)
}
wireguard.SetPeers(ifacename, node, peers)
}
if node.IsServer == "yes" {
setServerRoutes(node.Interface, node.Network)
}
return err
}
func setKernelDevice(ifacename, address4, mask4, address6, mask6 string) error {
ipExec, err := exec.LookPath("ip")
if err != nil {
return err
}
// == best effort ==
ncutils.RunCmd("ip link delete dev "+ifacename, false)
ncutils.RunCmd(ipExec+" link add dev "+ifacename+" type wireguard", true)
if address4 != "" {
ncutils.RunCmd(ipExec+" address add dev "+ifacename+" "+address4+"/"+mask4, true)
}
if address6 != "" {
ncutils.RunCmd(ipExec+" address add dev "+ifacename+" "+address6+"/"+mask6, true)
}
return nil
}
func applyWGQuickConf(confPath string) error {
if _, err := ncutils.RunCmd("wg-quick up "+confPath, true); err != nil {
return err
}
return nil
}
func removeWGQuickConf(confPath string, printlog bool) error {
if _, err := ncutils.RunCmd("wg-quick down "+confPath, printlog); err != nil {
return err
@ -302,8 +125,7 @@ func removeWGQuickConf(confPath string, printlog bool) error {
}
func setWGConfig(node *models.Node, peerupdate bool) error {
peers, hasGateway, gateways, err := GetServerPeers(node)
peers, err := GetPeerUpdate(node)
if err != nil {
return err
}
@ -312,15 +134,14 @@ func setWGConfig(node *models.Node, peerupdate bool) error {
return err
}
if peerupdate {
if err := wireguard.SetPeers(node.Interface, node, peers); err != nil {
if err := wireguard.SetPeers(node.Interface, node, peers.Peers); err != nil {
logger.Log(0, "error updating peers", err.Error())
}
logger.Log(2, "updated peers on server", node.Name)
} else {
err = initWireguard(node, privkey, peers[:], hasGateway, gateways[:])
err = wireguard.InitWireguard(node, privkey, peers.Peers, false)
logger.Log(3, "finished setting wg config on server", node.Name)
}
peers = nil
return err
}
@ -392,21 +213,3 @@ func removeLocalServer(node *models.Node) error {
}
return err
}
func setServerRoutes(iface, network string) {
parentNetwork, err := GetParentNetwork(network)
if err == nil {
if parentNetwork.AddressRange != "" {
ip, cidr, err := net.ParseCIDR(parentNetwork.AddressRange)
if err == nil {
local.SetCIDRRoute(iface, ip.String(), cidr)
}
}
if parentNetwork.AddressRange6 != "" {
ip, cidr, err := net.ParseCIDR(parentNetwork.AddressRange6)
if err == nil {
local.SetCIDRRoute(iface, ip.String(), cidr)
}
}
}
}

2
models/node.go
View file

@ -41,7 +41,7 @@ var seededRand *rand.Rand = rand.New(
// Node - struct for node model
type Node struct {
ID string `json:"id,omitempty" bson:"id,omitempty" yaml:"id,omitempty" validate:"required,min=5" validate:"id_unique`
ID string `json:"id,omitempty" bson:"id,omitempty" yaml:"id,omitempty" validate:"required,min=5,id_unique"`
Address string `json:"address" bson:"address" yaml:"address" validate:"omitempty,ipv4"`
Address6 string `json:"address6" bson:"address6" yaml:"address6" validate:"omitempty,ipv6"`
LocalAddress string `json:"localaddress" bson:"localaddress" yaml:"localaddress" validate:"omitempty,ip"`