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

replace ncutil.Log/PrintLog with logger.Log

Browse Source
This commit is contained in:
Matthew R. Kasun
2022-03-20 11:12:05 -04:00
committed by 0xdcarns
parent 28efa45419
commit 11b1098390
28 changed files with 274 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
netclient/functions/common.go
View File

@@ -10,6 +10,7 @@ import (
"strings"
nodepb "github.com/gravitl/netmaker/grpc"
"github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/netclient/auth"
"github.com/gravitl/netmaker/netclient/config"
@@ -120,13 +121,13 @@ func GetNode(network string) models.Node {
func Uninstall() error {
networks, err := ncutils.GetSystemNetworks()
if err != nil {
ncutils.PrintLog("unable to retrieve networks: "+err.Error(), 1)
ncutils.PrintLog("continuing uninstall without leaving networks", 1)
logger.Log(1, "unable to retrieve networks: ", err.Error())
logger.Log(1, "continuing uninstall without leaving networks")
} else {
for _, network := range networks {
err = LeaveNetwork(network, true)
if err != nil {
ncutils.PrintLog("Encounter issue leaving network "+network+": "+err.Error(), 1)
logger.Log(1, "Encounter issue leaving network ", network, ": ", err.Error())
}
}
}
@@ -140,7 +141,7 @@ func Uninstall() error {
} else if ncutils.IsFreeBSD() {
daemon.CleanupFreebsd()
} else if !ncutils.IsKernel() {
ncutils.PrintLog("manual cleanup required", 1)
logger.Log(1, "manual cleanup required")
}
return err
@@ -184,9 +185,9 @@ func LeaveNetwork(network string, force bool) error {
grpc.Header(&header),
)
if err != nil {
ncutils.PrintLog("encountered error deleting node: "+err.Error(), 1)
logger.Log(1, "encountered error deleting node: ", err.Error())
} else {
ncutils.PrintLog("removed machine from "+node.Network+" network on remote server", 1)
logger.Log(1, "removed machine from ", node.Network, " network on remote server")
}
}
}
@@ -211,15 +212,15 @@ func LeaveNetwork(network string, force bool) error {
local.RemoveCIDRRoute(removeIface, cfg.Node.Address, cidr)
}
} else {
ncutils.PrintLog("could not flush peer routes when leaving network, "+cfg.Node.Network, 1)
logger.Log(1, "could not flush peer routes when leaving network, ", cfg.Node.Network)
}
}
err = WipeLocal(node.Network)
if err != nil {
ncutils.PrintLog("unable to wipe local config", 1)
logger.Log(1, "unable to wipe local config")
} else {
ncutils.PrintLog("removed "+node.Network+" network locally", 1)
logger.Log(1, "removed ", node.Network, " network locally")
}
currentNets, err := ncutils.GetSystemNetworks()
@@ -262,7 +263,7 @@ func WipeLocal(network string) error {
ifacename := nodecfg.Interface
if ifacename != "" {
if err = wireguard.RemoveConf(ifacename, true); err == nil {
ncutils.PrintLog("removed WireGuard interface: "+ifacename, 1)
logger.Log(1, "removed WireGuard interface: ", ifacename)
} else if strings.Contains(err.Error(), "does not exist") {
err = nil
}

65
netclient/functions/daemon.go
View File

@@ -13,6 +13,7 @@ import (
mqtt "github.com/eclipse/paho.mqtt.golang"
"github.com/go-ping/ping"
"github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/netclient/auth"
"github.com/gravitl/netmaker/netclient/config"
@@ -55,7 +56,7 @@ func Daemon() error {
// == subscribe to all nodes on each comms network on machine ==
for currCommsNet := range commsNetworks {
ncutils.PrintLog("started comms network daemon, "+currCommsNet, 1)
logger.Log(1, "started comms network daemon, ", currCommsNet)
ctx, cancel := context.WithCancel(context.Background())
networkcontext.Store(currCommsNet, cancel)
go messageQueue(ctx, currCommsNet)
@@ -75,27 +76,27 @@ func Daemon() error {
}
}
cancel()
ncutils.Log("shutting down netclient daemon")
logger.Log(0, "shutting down netclient daemon")
wg.Wait()
ncutils.Log("shutdown complete")
logger.Log(0, "shutdown complete")
return nil
}
// UpdateKeys -- updates private key and returns new publickey
func UpdateKeys(nodeCfg *config.ClientConfig, client mqtt.Client) error {
ncutils.Log("received message to update wireguard keys for network " + nodeCfg.Network)
logger.Log(0, "received message to update wireguard keys for network ", nodeCfg.Network)
key, err := wgtypes.GeneratePrivateKey()
if err != nil {
ncutils.Log("error generating privatekey " + err.Error())
logger.Log(0, "error generating privatekey ", err.Error())
return err
}
file := ncutils.GetNetclientPathSpecific() + nodeCfg.Node.Interface + ".conf"
if err := wireguard.UpdatePrivateKey(file, key.String()); err != nil {
ncutils.Log("error updating wireguard key " + err.Error())
logger.Log(0, "error updating wireguard key ", err.Error())
return err
}
if storeErr := wireguard.StorePrivKey(key.String(), nodeCfg.Network); storeErr != nil {
ncutils.Log("failed to save private key" + storeErr.Error())
logger.Log(0, "failed to save private key", storeErr.Error())
return storeErr
}
@@ -129,25 +130,25 @@ func PingServer(commsCfg *config.ClientConfig) error {
func setSubscriptions(client mqtt.Client, nodeCfg *config.ClientConfig) {
if nodeCfg.DebugOn {
if token := client.Subscribe("#", 0, nil); token.Wait() && token.Error() != nil {
ncutils.Log(token.Error().Error())
logger.Log(0, token.Error().Error())
return
}
ncutils.Log("subscribed to all topics for debugging purposes")
logger.Log(0, "subscribed to all topics for debugging purposes")
}
if token := client.Subscribe(fmt.Sprintf("update/%s/%s", nodeCfg.Node.Network, nodeCfg.Node.ID), 0, mqtt.MessageHandler(NodeUpdate)); token.Wait() && token.Error() != nil {
ncutils.Log(token.Error().Error())
logger.Log(0, token.Error().Error())
return
}
if nodeCfg.DebugOn {
ncutils.Log(fmt.Sprintf("subscribed to node updates for node %s update/%s/%s", nodeCfg.Node.Name, nodeCfg.Node.Network, nodeCfg.Node.ID))
logger.Log(0, fmt.Sprintf("subscribed to node updates for node %s update/%s/%s", nodeCfg.Node.Name, nodeCfg.Node.Network, nodeCfg.Node.ID))
}
if token := client.Subscribe(fmt.Sprintf("peers/%s/%s", nodeCfg.Node.Network, nodeCfg.Node.ID), 0, mqtt.MessageHandler(UpdatePeers)); token.Wait() && token.Error() != nil {
ncutils.Log(token.Error().Error())
logger.Log(0, token.Error().Error())
return
}
if nodeCfg.DebugOn {
ncutils.Log(fmt.Sprintf("subscribed to peer updates for node %s peers/%s/%s", nodeCfg.Node.Name, nodeCfg.Node.Network, nodeCfg.Node.ID))
logger.Log(0, fmt.Sprintf("subscribed to peer updates for node %s peers/%s/%s", nodeCfg.Node.Name, nodeCfg.Node.Network, nodeCfg.Node.ID))
}
}
@@ -157,15 +158,15 @@ func unsubscribeNode(client mqtt.Client, nodeCfg *config.ClientConfig) {
client.Unsubscribe(fmt.Sprintf("update/%s/%s", nodeCfg.Node.Network, nodeCfg.Node.ID))
var ok = true
if token := client.Unsubscribe(fmt.Sprintf("update/%s/%s", nodeCfg.Node.Network, nodeCfg.Node.ID)); token.Wait() && token.Error() != nil {
ncutils.PrintLog("unable to unsubscribe from updates for node "+nodeCfg.Node.Name+"\n"+token.Error().Error(), 1)
logger.Log(1, "unable to unsubscribe from updates for node ", nodeCfg.Node.Name, "\n", token.Error().Error())
ok = false
}
if token := client.Unsubscribe(fmt.Sprintf("peers/%s/%s", nodeCfg.Node.Network, nodeCfg.Node.ID)); token.Wait() && token.Error() != nil {
ncutils.PrintLog("unable to unsubscribe from peer updates for node "+nodeCfg.Node.Name+"\n"+token.Error().Error(), 1)
logger.Log(1, "unable to unsubscribe from peer updates for node ", nodeCfg.Node.Name, "\n", token.Error().Error())
ok = false
}
if ok {
ncutils.PrintLog("successfully unsubscribed node "+nodeCfg.Node.ID+" : "+nodeCfg.Node.Name, 0)
logger.Log(1, "successfully unsubscribed node ", nodeCfg.Node.ID, " : ", nodeCfg.Node.Name)
}
}
@@ -175,11 +176,11 @@ func messageQueue(ctx context.Context, commsNet string) {
var commsCfg config.ClientConfig
commsCfg.Network = commsNet
commsCfg.ReadConfig()
ncutils.Log("netclient daemon started for network: " + commsNet)
logger.Log(0, "netclient daemon started for network: ", commsNet)
client := setupMQTT(&commsCfg, false)
defer client.Disconnect(250)
<-ctx.Done()
ncutils.Log("shutting down daemon for comms network " + commsNet)
logger.Log(0, "shutting down daemon for comms network ", commsNet)
}
// setupMQTT creates a connection to broker and return client
@@ -199,7 +200,7 @@ func setupMQTT(commsCfg *config.ClientConfig, publish bool) mqtt.Client {
if !publish {
networks, err := ncutils.GetSystemNetworks()
if err != nil {
ncutils.Log("error retriving networks " + err.Error())
logger.Log(0, "error retriving networks ", err.Error())
}
for _, network := range networks {
var currNodeCfg config.ClientConfig
@@ -212,13 +213,13 @@ func setupMQTT(commsCfg *config.ClientConfig, publish bool) mqtt.Client {
opts.SetOrderMatters(true)
opts.SetResumeSubs(true)
opts.SetConnectionLostHandler(func(c mqtt.Client, e error) {
ncutils.Log("detected broker connection lost, running pull for " + commsCfg.Node.Network)
logger.Log(0, "detected broker connection lost, running pull for ", commsCfg.Node.Network)
_, err := Pull(commsCfg.Node.Network, true)
if err != nil {
ncutils.Log("could not run pull, server unreachable: " + err.Error())
ncutils.Log("waiting to retry...")
logger.Log(0, "could not run pull, server unreachable: ", err.Error())
logger.Log(0, "waiting to retry...")
}
ncutils.Log("connection re-established with mqtt server")
logger.Log(0, "connection re-established with mqtt server")
})
client := mqtt.NewClient(opts)
@@ -226,20 +227,20 @@ func setupMQTT(commsCfg *config.ClientConfig, publish bool) mqtt.Client {
for {
//if after 12 seconds, try a gRPC pull on the last try
if time.Now().After(tperiod) {
ncutils.Log("running pull for " + commsCfg.Node.Network)
logger.Log(0, "running pull for ", commsCfg.Node.Network)
_, err := Pull(commsCfg.Node.Network, true)
if err != nil {
ncutils.Log("could not run pull, exiting " + commsCfg.Node.Network + " setup: " + err.Error())
logger.Log(0, "could not run pull, exiting ", commsCfg.Node.Network, " setup: ", err.Error())
return client
}
time.Sleep(time.Second)
}
if token := client.Connect(); token.Wait() && token.Error() != nil {
ncutils.Log("unable to connect to broker, retrying ...")
logger.Log(0, "unable to connect to broker, retrying ...")
if time.Now().After(tperiod) {
ncutils.Log("could not connect to broker, exiting " + commsCfg.Node.Network + " setup: " + token.Error().Error())
logger.Log(0, "could not connect to broker, exiting ", commsCfg.Node.Network, " setup: ", token.Error().Error())
if strings.Contains(token.Error().Error(), "connectex") || strings.Contains(token.Error().Error(), "i/o timeout") {
ncutils.PrintLog("connection issue detected.. pulling and restarting daemon", 0)
logger.Log(0, "connection issue detected.. pulling and restarting daemon")
Pull(commsCfg.Node.Network, true)
daemon.Restart()
}
@@ -262,11 +263,11 @@ func publishSignal(commsCfg, nodeCfg *config.ClientConfig, signal byte) error {
}
func initialPull(network string) {
ncutils.Log("pulling latest config for " + network)
logger.Log(0, "pulling latest config for ", network)
var configPath = fmt.Sprintf("%snetconfig-%s", ncutils.GetNetclientPathSpecific(), network)
fileInfo, err := os.Stat(configPath)
if err != nil {
ncutils.Log("could not stat config file: " + configPath)
logger.Log(0, "could not stat config file: ", configPath)
return
}
// speed up UDP rest
@@ -280,8 +281,8 @@ func initialPull(network string) {
if sleepTime > 3600 {
sleepTime = 3600
}
ncutils.Log("failed to pull for network " + network)
ncutils.Log(fmt.Sprintf("waiting %d seconds to retry...", sleepTime))
logger.Log(0, "failed to pull for network ", network)
logger.Log(0, fmt.Sprintf("waiting %d seconds to retry...", sleepTime))
time.Sleep(time.Second * time.Duration(sleepTime))
sleepTime = sleepTime * 2
}

31
netclient/functions/join.go
View File

@@ -10,6 +10,7 @@ import (
"runtime"
nodepb "github.com/gravitl/netmaker/grpc"
"github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/netclient/auth"
"github.com/gravitl/netmaker/netclient/config"
@@ -72,7 +73,7 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string, iscomms bool) erro
if err == nil {
cfg.Node.LocalAddress = intIP
} else {
ncutils.PrintLog("error retrieving private address: "+err.Error(), 1)
logger.Log(1, "error retrieving private address: ", err.Error())
}
}
@@ -84,7 +85,7 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string, iscomms bool) erro
cfg.Node.Endpoint, err = ncutils.GetPublicIP()
}
if err != nil || cfg.Node.Endpoint == "" {
ncutils.Log("Error setting cfg.Node.Endpoint.")
logger.Log(0, "Error setting cfg.Node.Endpoint.")
return err
}
}
@@ -111,8 +112,8 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string, iscomms bool) erro
// if ncutils.IsLinux() {
// _, err := exec.LookPath("resolvectl")
// if err != nil {
// ncutils.PrintLog("resolvectl not present", 2)
// ncutils.PrintLog("unable to configure DNS automatically, disabling automated DNS management", 2)
// logger.Log("resolvectl not present", 2)
// logger.Log("unable to configure DNS automatically, disabling automated DNS management", 2)
// cfg.Node.DNSOn = "no"
// }
// }
@@ -148,7 +149,7 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string, iscomms bool) erro
Version: ncutils.Version,
}
ncutils.Log("joining " + cfg.Network + " at " + cfg.Server.GRPCAddress)
logger.Log(0, "joining "+cfg.Network+" at "+cfg.Server.GRPCAddress)
var wcclient nodepb.NodeServiceClient
conn, err := grpc.Dial(cfg.Server.GRPCAddress,
@@ -178,8 +179,8 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string, iscomms bool) erro
return err
}
if node.IsPending == "yes" {
ncutils.Log("Node is marked as PENDING.")
ncutils.Log("Awaiting approval from Admin before configuring WireGuard.")
logger.Log(0, "Node is marked as PENDING.")
logger.Log(0, "Awaiting approval from Admin before configuring WireGuard.")
if cfg.Daemon != "off" {
return daemon.InstallDaemon(cfg)
}
@@ -199,7 +200,7 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string, iscomms bool) erro
if err != nil {
return err
}
ncutils.PrintLog("node created on remote server...updating configs", 1)
logger.Log(1, "node created on remote server...updating configs")
// keep track of the old listenport value
oldListenPort := node.ListenPort
@@ -219,17 +220,17 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string, iscomms bool) erro
}
// 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")
logger.Log(0, "failed to make backup, node will not auto restore if config is corrupted")
}
ncutils.Log("retrieving peers")
logger.Log(0, "retrieving peers")
peers, hasGateway, gateways, err := server.GetPeers(node.MacAddress, cfg.Network, cfg.Server.GRPCAddress, node.IsDualStack == "yes", node.IsIngressGateway == "yes", node.IsServer == "yes")
if err != nil && !ncutils.IsEmptyRecord(err) {
ncutils.Log("failed to retrieve peers")
logger.Log(0, "failed to retrieve peers")
return err
}
ncutils.Log("starting wireguard")
logger.Log(0, "starting wireguard")
err = wireguard.InitWireguard(&node, privateKey, peers, hasGateway, gateways, false)
if err != nil {
return err
@@ -273,8 +274,8 @@ func formatName(node models.Node) string {
node.Name = ncutils.ShortenString(node.Name, models.MAX_NAME_LENGTH)
}
if !node.NameInNodeCharSet() || len(node.Name) > models.MAX_NAME_LENGTH {
ncutils.PrintLog("could not properly format name: "+node.Name, 1)
ncutils.PrintLog("setting name to blank", 1)
logger.Log(1, "could not properly format name: "+node.Name)
logger.Log(1, "setting name to blank")
node.Name = ""
}
return node.Name
@@ -290,7 +291,7 @@ func setListenPort(oldListenPort int32, cfg *config.ClientConfig) {
cfg.Node.ListenPort, errN = ncutils.GetFreePort(cfg.Node.ListenPort)
if errN != nil {
cfg.Node.ListenPort = newListenPort
ncutils.PrintLog("Error retrieving port: "+errN.Error(), 1)
logger.Log(1, "Error retrieving port: ", errN.Error())
}
// if newListenPort has been modified to find an available port, publish to server

3
netclient/functions/list.go
View File

@@ -5,6 +5,7 @@ import (
"fmt"
nodepb "github.com/gravitl/netmaker/grpc"
"github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/netclient/auth"
"github.com/gravitl/netmaker/netclient/config"
@@ -43,7 +44,7 @@ func List(network string) error {
for _, network := range networks {
net, err := getNetwork(network)
if err != nil {
ncutils.PrintLog(network+": Could not retrieve network configuration.", 1)
logger.Log(1, network+": Could not retrieve network configuration.")
return err
}
nets = append(nets, net)

64
netclient/functions/mqhandlers.go
View File

@@ -2,12 +2,12 @@ package functions
import (
"encoding/json"
"fmt"
"runtime"
"strings"
"time"
mqtt "github.com/eclipse/paho.mqtt.golang"
"github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/netclient/config"
"github.com/gravitl/netmaker/netclient/local"
@@ -21,9 +21,9 @@ import (
// All -- mqtt message hander for all ('#') topics
var All mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message) {
ncutils.Log("default message handler -- received message but not handling")
ncutils.Log("Topic: " + string(msg.Topic()))
//ncutils.Log("Message: " + string(msg.Payload()))
logger.Log(0, "default message handler -- received message but not handling")
logger.Log(0, "Topic: "+string(msg.Topic()))
//logger.Log(0, "Message: " + string(msg.Payload()))
}
// NodeUpdate -- mqtt message handler for /update/<NodeID> topic
@@ -41,11 +41,11 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
}
err := json.Unmarshal([]byte(data), &newNode)
if err != nil {
ncutils.Log("error unmarshalling node update data" + err.Error())
logger.Log(0, "error unmarshalling node update data"+err.Error())
return
}
ncutils.Log("received message to update node " + newNode.Name)
logger.Log(0, "received message to update node "+newNode.Name)
// see if cache hit, if so skip
var currentMessage = read(newNode.Network, lastNodeUpdate)
if currentMessage == string(data) {
@@ -64,15 +64,15 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
nodeCfg.Node = newNode
switch newNode.Action {
case models.NODE_DELETE:
ncutils.PrintLog(fmt.Sprintf("received delete request for %s", nodeCfg.Node.Name), 0)
logger.Log(0, "received delete request for %s", nodeCfg.Node.Name)
unsubscribeNode(client, &nodeCfg)
if err = LeaveNetwork(nodeCfg.Node.Network, true); err != nil {
if !strings.Contains("rpc error", err.Error()) {
ncutils.PrintLog(fmt.Sprintf("failed to leave, please check that local files for network %s were removed", nodeCfg.Node.Network), 0)
logger.Log(0, "failed to leave, please check that local files for network", nodeCfg.Node.Network, "were removed")
return
}
}
ncutils.PrintLog(fmt.Sprintf("%s was removed", nodeCfg.Node.Name), 0)
logger.Log(0, nodeCfg.Node.Name, " was removed")
return
case models.NODE_UPDATE_KEY:
// == get the current key for node ==
@@ -81,7 +81,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
break
}
if err := UpdateKeys(&nodeCfg, client); err != nil {
ncutils.PrintLog("err updating wireguard keys, reusing last key\n"+err.Error(), 0)
logger.Log(0, "err updating wireguard keys, reusing last key\n", err.Error())
if key, parseErr := wgtypes.ParseKey(oldPrivateKey); parseErr == nil {
wireguard.StorePrivKey(key.String(), nodeCfg.Network)
nodeCfg.Node.PublicKey = key.PublicKey().String()
@@ -94,31 +94,31 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
// Save new config
nodeCfg.Node.Action = models.NODE_NOOP
if err := config.Write(&nodeCfg, nodeCfg.Network); err != nil {
ncutils.PrintLog("error updating node configuration: "+err.Error(), 0)
logger.Log(0, "error updating node configuration: ", err.Error())
}
nameserver := nodeCfg.Server.CoreDNSAddr
privateKey, err := wireguard.RetrievePrivKey(newNode.Network)
if err != nil {
ncutils.Log("error reading PrivateKey " + err.Error())
logger.Log(0, "error reading PrivateKey "+err.Error())
return
}
file := ncutils.GetNetclientPathSpecific() + nodeCfg.Node.Interface + ".conf"
if err := wireguard.UpdateWgInterface(file, privateKey, nameserver, newNode); err != nil {
ncutils.Log("error updating wireguard config " + err.Error())
logger.Log(0, "error updating wireguard config "+err.Error())
return
}
if keepaliveChange {
wireguard.UpdateKeepAlive(file, newNode.PersistentKeepalive)
}
if ifaceDelta { // if a change caused an ifacedelta we need to notify the server to update the peers
ncutils.Log("applying WG conf to " + file)
logger.Log(0, "applying WG conf to "+file)
if ncutils.IsWindows() {
wireguard.RemoveConfGraceful(nodeCfg.Node.Interface)
}
err = wireguard.ApplyConf(&nodeCfg.Node, nodeCfg.Node.Interface, file)
if err != nil {
ncutils.Log("error restarting wg after node update " + err.Error())
logger.Log(0, "error restarting wg after node update "+err.Error())
return
}
@@ -133,27 +133,27 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
// }
doneErr := publishSignal(&commsCfg, &nodeCfg, ncutils.DONE)
if doneErr != nil {
ncutils.Log("could not notify server to update peers after interface change")
logger.Log(0, "could not notify server to update peers after interface change")
} else {
ncutils.Log("signalled finished interface update to server")
logger.Log(0, "signalled finished interface update to server")
}
} else if hubChange {
doneErr := publishSignal(&commsCfg, &nodeCfg, ncutils.DONE)
if doneErr != nil {
ncutils.Log("could not notify server to update peers after hub change")
logger.Log(0, "could not notify server to update peers after hub change")
} else {
ncutils.Log("signalled finished hub update to server")
logger.Log(0, "signalled finished hub update to server")
}
}
//deal with DNS
if newNode.DNSOn != "yes" && shouldDNSChange && nodeCfg.Node.Interface != "" {
ncutils.Log("settng DNS off")
if err := removeHostDNS(nodeCfg.Node.Interface, ncutils.IsWindows()); err != nil {
ncutils.Log("error removing netmaker profile from /etc/hosts " + err.Error())
logger.Log(0, "settng DNS off")
if err := removeHostDNS(nodeCfg.Network, ncutils.IsWindows()); err != nil {
logger.Log(0, "error removing netmaker profile from /etc/hosts "+err.Error())
}
// _, err := ncutils.RunCmd("/usr/bin/resolvectl revert "+nodeCfg.Node.Interface, true)
// if err != nil {
// ncutils.Log("error applying dns" + err.Error())
// logger.Log(0, "error applying dns" + err.Error())
// }
}
}
@@ -172,7 +172,7 @@ func UpdatePeers(client mqtt.Client, msg mqtt.Message) {
}
err := json.Unmarshal([]byte(data), &peerUpdate)
if err != nil {
ncutils.Log("error unmarshalling peer data")
logger.Log(0, "error unmarshalling peer data")
return
}
// see if cached hit, if so skip
@@ -185,7 +185,7 @@ func UpdatePeers(client mqtt.Client, msg mqtt.Message) {
file := ncutils.GetNetclientPathSpecific() + cfg.Node.Interface + ".conf"
err = wireguard.UpdateWgPeers(file, peerUpdate.Peers)
if err != nil {
ncutils.Log("error updating wireguard peers" + err.Error())
logger.Log(0, "error updating wireguard peers"+err.Error())
return
}
//err = wireguard.SyncWGQuickConf(cfg.Node.Interface, file)
@@ -193,28 +193,28 @@ func UpdatePeers(client mqtt.Client, msg mqtt.Message) {
if ncutils.IsMac() {
iface, err = local.GetMacIface(cfg.Node.Address)
if err != nil {
ncutils.Log("error retrieving mac iface: " + err.Error())
logger.Log(0, "error retrieving mac iface: "+err.Error())
return
}
}
err = wireguard.SetPeers(iface, &cfg.Node, peerUpdate.Peers)
if err != nil {
ncutils.Log("error syncing wg after peer update: " + err.Error())
logger.Log(0, "error syncing wg after peer update: "+err.Error())
return
}
ncutils.Log("received peer update for node " + cfg.Node.Name + " " + cfg.Node.Network)
logger.Log(0, "received peer update for node "+cfg.Node.Name+" "+cfg.Node.Network)
//skip dns updates if this is a peer update for comms network
if cfg.Node.NetworkSettings.IsComms == "yes" {
return
}
if cfg.Node.DNSOn == "yes" {
if err := setHostDNS(peerUpdate.DNS, cfg.Node.Interface, ncutils.IsWindows()); err != nil {
ncutils.Log("error updating /etc/hosts " + err.Error())
if err := setHostDNS(peerUpdate.DNS, cfg.Node.Network, ncutils.IsWindows()); err != nil {
logger.Log(0, "error updating /etc/hosts "+err.Error())
return
}
} else {
if err := removeHostDNS(cfg.Node.Interface, ncutils.IsWindows()); err != nil {
ncutils.Log("error removing profile from /etc/hosts " + err.Error())
if err := removeHostDNS(cfg.Node.Network, ncutils.IsWindows()); err != nil {
logger.Log(0, "error removing profile from /etc/hosts "+err.Error())
return
}
}

33
netclient/functions/mqpublish.go
View File

@@ -7,6 +7,7 @@ import (
"sync"
"time"
"github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/netclient/auth"
"github.com/gravitl/netmaker/netclient/config"
"github.com/gravitl/netmaker/netclient/ncutils"
@@ -19,11 +20,11 @@ func Checkin(ctx context.Context, wg *sync.WaitGroup, currentComms map[string]bo
for {
select {
case <-ctx.Done():
ncutils.Log("checkin routine closed")
logger.Log(0, "checkin routine closed")
return
//delay should be configuraable -> use cfg.Node.NetworkSettings.DefaultCheckInInterval ??
case <-time.After(time.Second * 60):
// ncutils.Log("Checkin running")
// logger.Log(0, "Checkin running")
//read latest config
networks, err := ncutils.GetSystemNetworks()
if err != nil {
@@ -43,41 +44,41 @@ func Checkin(ctx context.Context, wg *sync.WaitGroup, currentComms map[string]bo
if nodeCfg.Node.IsStatic != "yes" {
extIP, err := ncutils.GetPublicIP()
if err != nil {
ncutils.PrintLog("error encountered checking public ip addresses: "+err.Error(), 1)
logger.Log(1, "error encountered checking public ip addresses: ", err.Error())
}
if nodeCfg.Node.Endpoint != extIP && extIP != "" {
ncutils.PrintLog("endpoint has changed from "+nodeCfg.Node.Endpoint+" to "+extIP, 1)
logger.Log(1, "endpoint has changed from ", nodeCfg.Node.Endpoint, " to ", extIP)
nodeCfg.Node.Endpoint = extIP
if err := PublishNodeUpdate(&currCommsCfg, &nodeCfg); err != nil {
ncutils.Log("could not publish endpoint change")
logger.Log(0, "could not publish endpoint change")
}
}
intIP, err := getPrivateAddr()
if err != nil {
ncutils.PrintLog("error encountered checking private ip addresses: "+err.Error(), 1)
logger.Log(1, "error encountered checking private ip addresses: ", err.Error())
}
if nodeCfg.Node.LocalAddress != intIP && intIP != "" {
ncutils.PrintLog("local Address has changed from "+nodeCfg.Node.LocalAddress+" to "+intIP, 1)
logger.Log(1, "local Address has changed from ", nodeCfg.Node.LocalAddress, " to ", intIP)
nodeCfg.Node.LocalAddress = intIP
if err := PublishNodeUpdate(&currCommsCfg, &nodeCfg); err != nil {
ncutils.Log("could not publish local address change")
logger.Log(0, "could not publish local address change")
}
}
} else if nodeCfg.Node.IsLocal == "yes" && nodeCfg.Node.LocalRange != "" {
localIP, err := ncutils.GetLocalIP(nodeCfg.Node.LocalRange)
if err != nil {
ncutils.PrintLog("error encountered checking local ip addresses: "+err.Error(), 1)
logger.Log(1, "error encountered checking local ip addresses: ", err.Error())
}
if nodeCfg.Node.Endpoint != localIP && localIP != "" {
ncutils.PrintLog("endpoint has changed from "+nodeCfg.Node.Endpoint+" to "+localIP, 1)
logger.Log(1, "endpoint has changed from "+nodeCfg.Node.Endpoint+" to ", localIP)
nodeCfg.Node.Endpoint = localIP
if err := PublishNodeUpdate(&currCommsCfg, &nodeCfg); err != nil {
ncutils.Log("could not publish localip change")
logger.Log(0, "could not publish localip change")
}
}
}
if err := PingServer(&currCommsCfg); err != nil {
ncutils.PrintLog("could not ping server on comms net, "+currCommsCfg.Network+"\n"+err.Error(), 0)
logger.Log(0, "could not ping server on comms net, ", currCommsCfg.Network, "\n", err.Error())
} else {
Hello(&currCommsCfg, &nodeCfg)
}
@@ -99,18 +100,18 @@ func PublishNodeUpdate(commsCfg, nodeCfg *config.ClientConfig) error {
if err = publish(commsCfg, nodeCfg, fmt.Sprintf("update/%s", nodeCfg.Node.ID), data, 1); err != nil {
return err
}
ncutils.PrintLog("sent a node update to server for node"+nodeCfg.Node.Name+", "+nodeCfg.Node.ID, 1)
logger.Log(0, "sent a node update to server for node", nodeCfg.Node.Name, ", ", nodeCfg.Node.ID)
return nil
}
// Hello -- ping the broker to let server know node it's alive and well
func Hello(commsCfg, nodeCfg *config.ClientConfig) {
if err := publish(commsCfg, nodeCfg, fmt.Sprintf("ping/%s", nodeCfg.Node.ID), []byte(ncutils.Version), 0); err != nil {
ncutils.Log(fmt.Sprintf("error publishing ping, %v", err))
ncutils.Log("running pull on " + commsCfg.Node.Network + " to reconnect")
logger.Log(0, fmt.Sprintf("error publishing ping, %v", err))
logger.Log(0, "running pull on "+commsCfg.Node.Network+" to reconnect")
_, err := Pull(commsCfg.Node.Network, true)
if err != nil {
ncutils.Log("could not run pull on " + commsCfg.Node.Network + ", error: " + err.Error())
logger.Log(0, "could not run pull on "+commsCfg.Node.Network+", error: "+err.Error())
}
}
}

11
netclient/functions/pull.go
View File

@@ -8,6 +8,7 @@ import (
"runtime"
nodepb "github.com/gravitl/netmaker/grpc"
"github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/netclient/auth"
"github.com/gravitl/netmaker/netclient/config"
@@ -43,7 +44,7 @@ func Pull(network string, manual bool) (*models.Node, error) {
conn, err := grpc.Dial(cfg.Server.GRPCAddress,
ncutils.GRPCRequestOpts(cfg.Server.GRPCSSL))
if err != nil {
ncutils.PrintLog("Cant dial GRPC server: "+err.Error(), 1)
logger.Log(1, "Cant dial GRPC server: ", err.Error())
return nil, err
}
defer conn.Close()
@@ -51,12 +52,12 @@ func Pull(network string, manual bool) (*models.Node, error) {
ctx, err = auth.SetJWT(wcclient, network)
if err != nil {
ncutils.PrintLog("Failed to authenticate: "+err.Error(), 1)
logger.Log(1, "Failed to authenticate: ", err.Error())
return nil, err
}
data, err := json.Marshal(&node)
if err != nil {
ncutils.PrintLog("Failed to parse node config: "+err.Error(), 1)
logger.Log(1, "Failed to parse node config: ", err.Error())
return nil, err
}
@@ -80,7 +81,7 @@ func Pull(network string, manual bool) (*models.Node, error) {
// check for interface change
if cfg.Node.Interface != resNode.Interface {
if err = DeleteInterface(cfg.Node.Interface, cfg.Node.PostDown); err != nil {
ncutils.PrintLog("could not delete old interface "+cfg.Node.Interface, 1)
logger.Log(1, "could not delete old interface ", cfg.Node.Interface)
}
}
if err = config.ModConfig(&resNode); err != nil {
@@ -119,7 +120,7 @@ func Pull(network string, manual bool) (*models.Node, error) {
}
var bkupErr = config.SaveBackup(network)
if bkupErr != nil {
ncutils.Log("unable to update backup file")
logger.Log(0, "unable to update backup file")
}
return &resNode, err