Merge branch 'feature_v0.10.0_server_response' into feature_v0.10.0_serverPings

controllers/node_grpc.go

@@ -68,12 +68,14 @@ func (s *NodeServiceServer) CreateNode(ctx context.Context, req *nodepb.Object)
 	}
 
 	var serverNodes = logic.GetServerNodes(node.Network)
+	var serverAddrs = make([]models.ServerAddr, len(serverNodes))
 	for i, server := range serverNodes {
-		node.NetworkSettings.DefaultServerAddrs += server.Address
-		if i < len(serverNodes)-1 {
-			node.NetworkSettings.DefaultServerAddrs += ","
+		serverAddrs[i] = models.ServerAddr{
+			IsLeader: logic.IsLeader(&server),
+			Address:  server.Address,
 		}
 	}
+	node.NetworkSettings.DefaultServerAddrs = serverAddrs
 
 	err = logic.CreateNode(&node)
 	if err != nil {

logger/logger.go

@@ -6,6 +6,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 )
 
@@ -36,6 +37,9 @@ func ResetLogs() {
 
 // Log - handles adding logs
 func Log(verbosity int, message ...string) {
+	var mu sync.Mutex
+	mu.Lock()
+	defer mu.Unlock()
 	var currentTime = time.Now()
 	var currentMessage = makeString(message...)
 	if int32(verbosity) <= getVerbose() && getVerbose() >= 0 {

logic/peers.go

@@ -20,7 +20,7 @@ func GetPeerUpdate(node *models.Node) (models.PeerUpdate, error) {
 	if err != nil {
 		return models.PeerUpdate{}, err
 	}
-	var serverNodeAddresses = []string{}
+	var serverNodeAddresses = []models.ServerAddr{}
 	for _, peer := range networkNodes {
 		if peer.ID == node.ID {
 			//skip yourself
@@ -57,7 +57,7 @@ func GetPeerUpdate(node *models.Node) (models.PeerUpdate, error) {
 		}
 		peers = append(peers, peerData)
 		if peer.IsServer == "yes" {
-			serverNodeAddresses = append(serverNodeAddresses, peer.Address)
+			serverNodeAddresses = append(serverNodeAddresses, models.ServerAddr{IsLeader: IsLeader(&peer), Address: peer.Address})
 		}
 	}
 	peerUpdate.Network = node.Network

models/mqtt.go

@@ -4,9 +4,9 @@ import "golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 
 // PeerUpdate - struct
 type PeerUpdate struct {
-	Network     string               `json:"network" bson:"network"`
-	ServerAddrs []string             `json:"serversaddrs" bson:"serversaddrs"`
-	Peers       []wgtypes.PeerConfig `json:"peers" bson:"peers"`
+	Network     string               `json:"network" bson:"network" yaml:"network"`
+	ServerAddrs []ServerAddr         `json:"serveraddrs" bson:"serveraddrs" yaml:"serveraddrs"`
+	Peers       []wgtypes.PeerConfig `json:"peers" bson:"peers" yaml:"peers"`
 }
 
 // KeyUpdate - key update struct

models/network.go

@@ -34,11 +34,11 @@ type Network struct {
 	LocalRange          string      `json:"localrange" bson:"localrange" validate:"omitempty,cidr"`
 
 	// checkin interval is depreciated at the network level. Set on server with CHECKIN_INTERVAL
-	DefaultCheckInInterval int32  `json:"checkininterval,omitempty" bson:"checkininterval,omitempty" validate:"omitempty,numeric,min=2,max=100000"`
-	DefaultUDPHolePunch    string `json:"defaultudpholepunch" bson:"defaultudpholepunch" validate:"checkyesorno"`
-	DefaultExtClientDNS    string `json:"defaultextclientdns" bson:"defaultextclientdns"`
-	DefaultMTU             int32  `json:"defaultmtu" bson:"defaultmtu"`
-	DefaultServerAddrs     string `json:"defaultserveraddrs" bson:"defaultserveraddrs" yaml:"defaultserveraddrs"`
+	DefaultCheckInInterval int32        `json:"checkininterval,omitempty" bson:"checkininterval,omitempty" validate:"omitempty,numeric,min=2,max=100000"`
+	DefaultUDPHolePunch    string       `json:"defaultudpholepunch" bson:"defaultudpholepunch" validate:"checkyesorno"`
+	DefaultExtClientDNS    string       `json:"defaultextclientdns" bson:"defaultextclientdns"`
+	DefaultMTU             int32        `json:"defaultmtu" bson:"defaultmtu"`
+	DefaultServerAddrs     []ServerAddr `json:"defaultserveraddrs" bson:"defaultserveraddrs" yaml:"defaultserveraddrs"`
 }
 
 // SaveData - sensitive fields of a network that should be kept the same

models/structs.go

@@ -169,3 +169,9 @@ type Telemetry struct {
 	UUID     string `json:"uuid" bson:"uuid"`
 	LastSend int64  `json:"lastsend" bson:"lastsend"`
 }
+
+// ServerAddr - to pass to clients to tell server addresses and if it's the leader or not
+type ServerAddr struct {
+	IsLeader bool   `json:"isleader" bson:"isleader" yaml:"isleader"`
+	Address  string `json:"address" bson:"address" yaml:"address"`
+}

netclient/config/config.go

@@ -119,7 +119,6 @@ func ModConfig(node *models.Node) error {
 
 	modconfig.Node = (*node)
 	modconfig.NetworkSettings = node.NetworkSettings
-	log.Printf("%v \n", modconfig)
 	err = Write(&modconfig, network)
 	return err
 }

netclient/functions/daemon.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"os/signal"
 	"runtime"
-	"strings"
 	"sync"
 	"syscall"
 	"time"
@@ -62,11 +61,11 @@ func Daemon() error {
 // SetupMQTT creates a connection to broker and return client
 func SetupMQTT(cfg *config.ClientConfig) mqtt.Client {
 	opts := mqtt.NewClientOptions()
-	serverAddrs := strings.Split(cfg.Node.NetworkSettings.DefaultServerAddrs, ",")
-	for i, addr := range serverAddrs {
-		if addr != "" {
-			ncutils.Log(fmt.Sprintf("adding server (%d) to listen on network %s \n", (i + 1), cfg.Node.Network))
-			opts.AddBroker(addr + ":1883")
+	for _, server := range cfg.Node.NetworkSettings.DefaultServerAddrs {
+		if server.Address != "" && server.IsLeader {
+			ncutils.Log(fmt.Sprintf("adding server (%s) to listen on network %s \n", server.Address, cfg.Node.Network))
+			opts.AddBroker(server.Address + ":1883")
+			break
 		}
 	}
 	opts.SetDefaultPublishHandler(All)
@@ -92,13 +91,13 @@ func MessageQueue(ctx context.Context, network string) {
 		}
 		ncutils.Log("subscribed to all topics for debugging purposes")
 	}
-	if token := client.Subscribe("update/"+cfg.Node.ID, 0, NodeUpdate); token.Wait() && token.Error() != nil {
+	if token := client.Subscribe("update/"+cfg.Node.ID, 0, mqtt.MessageHandler(NodeUpdate)); token.Wait() && token.Error() != nil {
 		log.Fatal(token.Error())
 	}
 	if cfg.DebugOn {
 		ncutils.Log("subscribed to node updates for node " + cfg.Node.Name + " update/" + cfg.Node.ID)
 	}
-	if token := client.Subscribe("update/peers/"+cfg.Node.ID, 0, UpdatePeers); token.Wait() && token.Error() != nil {
+	if token := client.Subscribe("update/peers/"+cfg.Node.ID, 0, mqtt.MessageHandler(UpdatePeers)); token.Wait() && token.Error() != nil {
 		log.Fatal(token.Error())
 	}
 	if cfg.DebugOn {
@@ -124,8 +123,7 @@ var All mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message) {
 }
 
 // NodeUpdate -- mqtt message handler for /update/<NodeID> topic
-var NodeUpdate mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message) {
-	ncutils.Log("received message to update node " + string(msg.Payload()))
+func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
 	//potentiall blocking i/o so do this in a go routine
 	go func() {
 		var newNode models.Node
@@ -135,6 +133,7 @@ var NodeUpdate mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message)
 			ncutils.Log("error unmarshalling node update data" + err.Error())
 			return
 		}
+		ncutils.Log("received message to update node " + newNode.Name)
 		// see if cache hit, if so skip
 		var currentMessage = read(newNode.Network, lastNodeUpdate)
 		if currentMessage == string(msg.Payload()) {
@@ -208,7 +207,7 @@ var NodeUpdate mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message)
 }
 
 // UpdatePeers -- mqtt message handler for /update/peers/<NodeID> topic
-var UpdatePeers mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message) {
+func UpdatePeers(client mqtt.Client, msg mqtt.Message) {
 	go func() {
 		var peerUpdate models.PeerUpdate
 		err := json.Unmarshal(msg.Payload(), &peerUpdate)
@@ -226,12 +225,10 @@ var UpdatePeers mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message)
 		var cfg config.ClientConfig
 		cfg.Network = peerUpdate.Network
 		cfg.ReadConfig()
-		var shouldReSub = shouldResub(strings.Split(cfg.Node.NetworkSettings.DefaultServerAddrs, ","), peerUpdate.ServerAddrs)
+		var shouldReSub = shouldResub(cfg.Node.NetworkSettings.DefaultServerAddrs, peerUpdate.ServerAddrs)
 		if shouldReSub {
-			client.Disconnect(250) // kill client
-			// un sub, re sub.. how?
-			client.Unsubscribe("update/"+cfg.Node.ID, "update/peers/"+cfg.Node.ID)
-			cfg.Node.NetworkSettings.DefaultServerAddrs = strings.Join(peerUpdate.ServerAddrs, ",")
+			Resubscribe(client, &cfg)
+			cfg.Node.NetworkSettings.DefaultServerAddrs = peerUpdate.ServerAddrs
 		}
 		file := ncutils.GetNetclientPathSpecific() + cfg.Node.Interface + ".conf"
 		err = wireguard.UpdateWgPeers(file, peerUpdate.Peers)
@@ -260,8 +257,9 @@ func ServerKeepAlive(client mqtt.Client, msg mqtt.Message) {
 }
 
 // Resubscribe --- handles resubscribing if needed
-func Resubscribe(client mqtt.Client, cfg *config.ClientConfig) {
+func Resubscribe(client mqtt.Client, cfg *config.ClientConfig) error {
 	if err := config.ModConfig(&cfg.Node); err == nil {
+		ncutils.Log("resubbing on network " + cfg.Node.Network)
 		client.Disconnect(250)
 		client = SetupMQTT(cfg)
 		if token := client.Subscribe("update/"+cfg.Node.ID, 0, NodeUpdate); token.Wait() && token.Error() != nil {
@@ -274,8 +272,10 @@ func Resubscribe(client mqtt.Client, cfg *config.ClientConfig) {
 			log.Fatal(token.Error())
 		}
 		ncutils.Log("finished re subbing")
+		return nil
 	} else {
 		ncutils.Log("could not mod config when re-subbing")
+		return err
 	}
 }
 
@@ -375,12 +375,12 @@ func Hello(cfg *config.ClientConfig, network string) {
 	client.Disconnect(250)
 }
 
-func shouldResub(currentServers, newServers []string) bool {
+func shouldResub(currentServers, newServers []models.ServerAddr) bool {
 	if len(currentServers) != len(newServers) {
-		return false
+		return true
 	}
 	for _, srv := range currentServers {
-		if !ncutils.StringSliceContains(newServers, srv) {
+		if !ncutils.ServerAddrSliceContains(newServers, srv) {
 			return true
 		}
 	}

netclient/functions/join.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"log"
 	"os/exec"
+	"runtime"
 
 	"github.com/google/uuid"
 	nodepb "github.com/gravitl/netmaker/grpc"
@@ -101,8 +102,7 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
 	// make sure name is appropriate, if not, give blank name
 	cfg.Node.Name = formatName(cfg.Node)
 	// differentiate between client/server here
-	var node models.Node // fill this node with appropriate calls
-	postnode := &models.Node{
+	var node = models.Node{
 		Password:            cfg.Node.Password,
 		ID:                  cfg.Node.ID,
 		MacAddress:          cfg.Node.MacAddress,
@@ -124,45 +124,17 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
 		UDPHolePunch:        cfg.Node.UDPHolePunch,
 	}
 
-	if cfg.Node.IsServer != "yes" {
-		ncutils.Log("joining " + cfg.Network + " at " + cfg.Server.GRPCAddress)
-		var wcclient nodepb.NodeServiceClient
-
-		conn, err := grpc.Dial(cfg.Server.GRPCAddress,
-			ncutils.GRPCRequestOpts(cfg.Server.GRPCSSL))
+	ncutils.Log("joining " + cfg.Network + " at " + cfg.Server.GRPCAddress)
+	var wcclient nodepb.NodeServiceClient
 
-		if err != nil {
-			log.Fatalf("Unable to establish client connection to "+cfg.Server.GRPCAddress+": %v", err)
-		}
-		defer conn.Close()
-		wcclient = nodepb.NewNodeServiceClient(conn)
+	conn, err := grpc.Dial(cfg.Server.GRPCAddress,
+		ncutils.GRPCRequestOpts(cfg.Server.GRPCSSL))
 
-		if err = config.ModConfig(postnode); err != nil {
-			return err
-		}
-		data, err := json.Marshal(postnode)
-		if err != nil {
-			return err
-		}
-		// Create node on server
-		res, err := wcclient.CreateNode(
-			context.TODO(),
-			&nodepb.Object{
-				Data: string(data),
-				Type: nodepb.NODE_TYPE,
-			},
-		)
-		if err != nil {
-			return err
-		}
-		ncutils.PrintLog("node created on remote server...updating configs", 1)
-
-		nodeData := res.Data
-		if err = json.Unmarshal([]byte(nodeData), &node); err != nil {
-			return err
-		}
-		log.Printf("%v \n", nodeData)
+	if err != nil {
+		log.Fatalf("Unable to establish client connection to "+cfg.Server.GRPCAddress+": %v", err)
 	}
+	defer conn.Close()
+	wcclient = nodepb.NewNodeServiceClient(conn)
 
 	// get free port based on returned default listen port
 	node.ListenPort, err = ncutils.GetFreePort(node.ListenPort)
@@ -183,33 +155,48 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
 		cfg.Node.IsStatic = "yes"
 	}
 
-	if node.IsServer != "yes" { // == handle client side ==
-		cfg.Node = node
-		err = config.ModConfig(&node)
-		if err != nil {
-			return err
-		}
-		err = wireguard.StorePrivKey(privateKey, cfg.Network)
-		if err != nil {
-			return err
-		}
-		if node.IsPending == "yes" {
-			ncutils.Log("Node is marked as PENDING.")
-			ncutils.Log("Awaiting approval from Admin before configuring WireGuard.")
-			if cfg.Daemon != "off" {
-				return daemon.InstallDaemon(cfg)
-			}
-		}
-		// pushing any local changes to server before starting wireguard
-		err = Push(cfg.Network)
-		if err != nil {
-			return err
-		}
-		// attempt to make backup
-		if err = config.SaveBackup(node.Network); err != nil {
-			ncutils.Log("failed to make backup, node will not auto restore if config is corrupted")
+	err = wireguard.StorePrivKey(privateKey, cfg.Network)
+	if err != nil {
+		return err
+	}
+	if node.IsPending == "yes" {
+		ncutils.Log("Node is marked as PENDING.")
+		ncutils.Log("Awaiting approval from Admin before configuring WireGuard.")
+		if cfg.Daemon != "off" {
+			return daemon.InstallDaemon(cfg)
 		}
 	}
+	data, err := json.Marshal(&node)
+	if err != nil {
+		return err
+	}
+	// Create node on server
+	res, err := wcclient.CreateNode(
+		context.TODO(),
+		&nodepb.Object{
+			Data: string(data),
+			Type: nodepb.NODE_TYPE,
+		},
+	)
+	if err != nil {
+		return err
+	}
+	ncutils.PrintLog("node created on remote server...updating configs", 1)
+
+	nodeData := res.Data
+	if err = json.Unmarshal([]byte(nodeData), &node); err != nil {
+		return err
+	}
+	node.OS = runtime.GOOS
+	cfg.Node = node
+	err = config.ModConfig(&node)
+	if err != nil {
+		return err
+	}
+	// attempt to make backup
+	if err = config.SaveBackup(node.Network); err != nil {
+		ncutils.Log("failed to make backup, node will not auto restore if config is corrupted")
+	}
 
 	ncutils.Log("retrieving peers")
 	peers, hasGateway, gateways, err := server.GetPeers(node.MacAddress, cfg.Network, cfg.Server.GRPCAddress, node.IsDualStack == "yes", node.IsIngressGateway == "yes", node.IsServer == "yes")

netclient/ncutils/netclientutils.go

@@ -17,6 +17,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/gravitl/netmaker/models"
 	"golang.zx2c4.com/wireguard/wgctrl"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 	"google.golang.org/grpc"
@@ -533,10 +534,10 @@ func CheckWG() {
 	}
 }
 
-// StringSliceContains - sees if a string slice contains a string element
-func StringSliceContains(slice []string, item string) bool {
+// ServerAddrSliceContains - sees if a string slice contains a string element
+func ServerAddrSliceContains(slice []models.ServerAddr, item models.ServerAddr) bool {
 	for _, s := range slice {
-		if s == item {
+		if s.Address == item.Address && s.IsLeader == item.IsLeader {
 			return true
 		}
 	}