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

controllers/node_grpc.go

@@ -67,6 +67,14 @@ func (s *NodeServiceServer) CreateNode(ctx context.Context, req *nodepb.Object)
 		}
 	}
 
+	var serverNodes = logic.GetServerNodes(node.Network)
+	for i, server := range serverNodes {
+		node.NetworkSettings.DefaultServerAddrs += server.Address
+		if i < len(serverNodes)-1 {
+			node.NetworkSettings.DefaultServerAddrs += ","
+		}
+	}
+
 	err = logic.CreateNode(&node)
 	if err != nil {
 		return nil, err

logic/nodes.go

@@ -58,6 +58,21 @@ func GetSortedNetworkServerNodes(network string) ([]models.Node, error) {
 	return nodes, nil
 }
 
+// GetServerNodes - gets the server nodes of a network
+func GetServerNodes(network string) []models.Node {
+	var nodes, err = GetNetworkNodes(network)
+	var serverNodes = make([]models.Node, 0)
+	if err != nil {
+		return serverNodes
+	}
+	for _, node := range nodes {
+		if node.IsServer == "yes" {
+			serverNodes = append(serverNodes, node)
+		}
+	}
+	return serverNodes
+}
+
 // UncordonNode - approves a node to join a network
 func UncordonNode(nodeid string) (models.Node, error) {
 	node, err := GetNodeByID(nodeid)

logic/peers.go

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

models/mqtt.go

@@ -2,12 +2,15 @@ package models
 
 import "golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 
+// PeerUpdate - struct
 type PeerUpdate struct {
-	Network string
-	Peers   []wgtypes.PeerConfig
+	Network     string               `json:"network" bson:"network"`
+	ServerAddrs []string             `json:"serversaddrs" bson:"serversaddrs"`
+	Peers       []wgtypes.PeerConfig `json:"peers" bson:"peers"`
 }
 
+// KeyUpdate - key update struct
 type KeyUpdate struct {
-	Network   string
-	Interface string
+	Network   string `json:"network" bson:"network"`
+	Interface string `json:"interface" bson:"interface"`
 }

models/network.go

@@ -38,6 +38,7 @@ type Network struct {
 	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"`
 }
 
 // SaveData - sensitive fields of a network that should be kept the same

netclient/config/config.go

@@ -119,6 +119,7 @@ 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

@@ -3,10 +3,13 @@ package functions
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"log"
 	"os"
 	"os/signal"
 	"runtime"
+	"strings"
+	"sync"
 	"syscall"
 	"time"
 
@@ -21,6 +24,21 @@ import (
 
 // ServerKeepalive  - stores time of last server keepalive message
 var KeepaliveReceived time.Time
+var messageCache = make(map[string]string, 20)
+
+const lastNodeUpdate = "lnu"
+const lastPeerUpdate = "lpu"
+
+func insert(network, which, cache string) {
+	var mu sync.Mutex
+	mu.Lock()
+	defer mu.Unlock()
+	messageCache[fmt.Sprintf("%s%s", network, which)] = cache
+}
+
+func read(network, which string) string {
+	return messageCache[fmt.Sprintf("%s%s", network, which)]
+}
 
 // Daemon runs netclient daemon from command line
 func Daemon() error {
@@ -44,8 +62,13 @@ func Daemon() error {
 // SetupMQTT creates a connection to broker and return client
 func SetupMQTT(cfg *config.ClientConfig) mqtt.Client {
 	opts := mqtt.NewClientOptions()
-	ncutils.Log("setting broker to " + cfg.Server.CoreDNSAddr + ":1883")
-	opts.AddBroker(cfg.Server.CoreDNSAddr + ":1883")
+	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")
+		}
+	}
 	opts.SetDefaultPublishHandler(All)
 	client := mqtt.NewClient(opts)
 	if token := client.Connect(); token.Wait() && token.Error() != nil {
@@ -112,6 +135,12 @@ var NodeUpdate mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message)
 			ncutils.Log("error unmarshalling node update data" + err.Error())
 			return
 		}
+		// see if cache hit, if so skip
+		var currentMessage = read(newNode.Network, lastNodeUpdate)
+		if currentMessage == string(msg.Payload()) {
+			return
+		}
+		insert(newNode.Network, lastNodeUpdate, string(msg.Payload()))
 		cfg.Network = newNode.Network
 		cfg.ReadConfig()
 		//check if interface name has changed if so delete.
@@ -187,10 +216,23 @@ var UpdatePeers mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message)
 			ncutils.Log("error unmarshalling peer data")
 			return
 		}
+		// see if cache hit, if so skip
+		var currentMessage = read(peerUpdate.Network, lastPeerUpdate)
+		if currentMessage == string(msg.Payload()) {
+			return
+		}
+		insert(peerUpdate.Network, lastPeerUpdate, string(msg.Payload()))
 		ncutils.Log("update peer handler")
 		var cfg config.ClientConfig
 		cfg.Network = peerUpdate.Network
 		cfg.ReadConfig()
+		var shouldReSub = shouldResub(strings.Split(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, ",")
+		}
 		file := ncutils.GetNetclientPathSpecific() + cfg.Node.Interface + ".conf"
 		err = wireguard.UpdateWgPeers(file, peerUpdate.Peers)
 		if err != nil {
@@ -217,6 +259,26 @@ func ServerKeepAlive(client mqtt.Client, msg mqtt.Message) {
 	///do other stuff
 }
 
+// Resubscribe --- handles resubscribing if needed
+func Resubscribe(client mqtt.Client, cfg *config.ClientConfig) {
+	if err := config.ModConfig(&cfg.Node); err == nil {
+		client.Disconnect(250)
+		client = SetupMQTT(cfg)
+		if token := client.Subscribe("update/"+cfg.Node.ID, 0, 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 {
+			log.Fatal(token.Error())
+		}
+		ncutils.Log("finished re subbing")
+	} else {
+		ncutils.Log("could not mod config when re-subbing")
+	}
+}
+
 // UpdateKeys -- updates private key and returns new publickey
 func UpdateKeys(cfg *config.ClientConfig, client mqtt.Client) error {
 	ncutils.Log("received message to update keys")
@@ -312,3 +374,15 @@ func Hello(cfg *config.ClientConfig, network string) {
 	}
 	client.Disconnect(250)
 }
+
+func shouldResub(currentServers, newServers []string) bool {
+	if len(currentServers) != len(newServers) {
+		return false
+	}
+	for _, srv := range currentServers {
+		if !ncutils.StringSliceContains(newServers, srv) {
+			return true
+		}
+	}
+	return false
+}

netclient/functions/join.go

@@ -161,6 +161,7 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
 		if err = json.Unmarshal([]byte(nodeData), &node); err != nil {
 			return err
 		}
+		log.Printf("%v \n", nodeData)
 	}
 
 	// get free port based on returned default listen port
@@ -183,6 +184,7 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
 	}
 
 	if node.IsServer != "yes" { // == handle client side ==
+		cfg.Node = node
 		err = config.ModConfig(&node)
 		if err != nil {
 			return err

netclient/ncutils/netclientutils.go

@@ -532,3 +532,13 @@ func CheckWG() {
 		log.Println("running userspace WireGuard with " + uspace)
 	}
 }
+
+// StringSliceContains - sees if a string slice contains a string element
+func StringSliceContains(slice []string, item string) bool {
+	for _, s := range slice {
+		if s == item {
+			return true
+		}
+	}
+	return false
+}