configure proxy on daemon startup and peer updates

This commit is contained in:
Abhishek Kondur
2022-10-27 23:17:04 +05:30
parent f4783f87d0
commit 4486393f45
2 changed files with 72 additions and 2 deletions

View File

@@ -2,8 +2,12 @@ package functions
import ( import (
"context" "context"
"encoding/json"
"errors" "errors"
"fmt" "fmt"
"io"
"log"
"net/http"
"os" "os"
"os/signal" "os/signal"
"strings" "strings"
@@ -13,6 +17,7 @@ import (
mqtt "github.com/eclipse/paho.mqtt.golang" mqtt "github.com/eclipse/paho.mqtt.golang"
"github.com/gravitl/netmaker/logger" "github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/mq" "github.com/gravitl/netmaker/mq"
"github.com/gravitl/netmaker/netclient/auth" "github.com/gravitl/netmaker/netclient/auth"
"github.com/gravitl/netmaker/netclient/config" "github.com/gravitl/netmaker/netclient/config"
@@ -21,11 +26,14 @@ import (
"github.com/gravitl/netmaker/netclient/ncutils" "github.com/gravitl/netmaker/netclient/ncutils"
"github.com/gravitl/netmaker/netclient/wireguard" "github.com/gravitl/netmaker/netclient/wireguard"
nmproxy "github.com/gravitl/netmaker/nm-proxy" nmproxy "github.com/gravitl/netmaker/nm-proxy"
"github.com/gravitl/netmaker/nm-proxy/common"
"github.com/gravitl/netmaker/nm-proxy/manager"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes" "golang.zx2c4.com/wireguard/wgctrl/wgtypes"
) )
var ProxyMgmChan = make(chan *manager.ManagerAction, 100)
var messageCache = new(sync.Map) var messageCache = new(sync.Map)
var ProxyStatus = "OFF"
var serverSet map[string]bool var serverSet map[string]bool
var mqclient mqtt.Client var mqclient mqtt.Client
@@ -115,9 +123,63 @@ func startGoRoutines(wg *sync.WaitGroup) context.CancelFunc {
} }
wg.Add(1) wg.Add(1)
go Checkin(ctx, wg) go Checkin(ctx, wg)
go nmproxy.Start() if ProxyStatus == "OFF" {
ProxyStatus = "ON"
go nmproxy.Start(ProxyMgmChan)
} else {
log.Println("Proxy already running...")
}
go func() {
networks, _ := ncutils.GetSystemNetworks()
for _, network := range networks {
logger.Log(0, "Collecting interface and peers info to configure proxy...")
cfg := config.ClientConfig{}
cfg.Network = network
cfg.ReadConfig()
node, err := GetNodeInfo(&cfg)
if err != nil {
log.Println("Failed to get node info: ", err)
continue
}
ProxyMgmChan <- &manager.ManagerAction{
Action: manager.AddInterface,
Payload: manager.ManagerPayload{
InterfaceName: node.Node.Interface,
Peers: node.Peers,
},
}
}
}()
return cancel return cancel
} }
func GetNodeInfo(cfg *config.ClientConfig) (models.NodeGet, error) {
var nodeGET models.NodeGet
token, err := common.Authenticate(cfg)
if err != nil {
return nodeGET, err
}
url := fmt.Sprintf("https://%s/api/nodes/%s/%s", cfg.Server.API, cfg.Network, cfg.Node.ID)
response, err := common.API("", http.MethodGet, url, token)
if err != nil {
return nodeGET, err
}
if response.StatusCode != http.StatusOK {
bytes, err := io.ReadAll(response.Body)
if err != nil {
fmt.Println(err)
}
return nodeGET, (fmt.Errorf("%s %w", string(bytes), err))
}
defer response.Body.Close()
if err := json.NewDecoder(response.Body).Decode(&nodeGET); err != nil {
return nodeGET, fmt.Errorf("error decoding node %w", err)
}
return nodeGET, nil
}
// UpdateKeys -- updates private key and returns new publickey // UpdateKeys -- updates private key and returns new publickey
func UpdateKeys(nodeCfg *config.ClientConfig, client mqtt.Client) error { func UpdateKeys(nodeCfg *config.ClientConfig, client mqtt.Client) error {

View File

@@ -17,6 +17,7 @@ import (
"github.com/gravitl/netmaker/netclient/local" "github.com/gravitl/netmaker/netclient/local"
"github.com/gravitl/netmaker/netclient/ncutils" "github.com/gravitl/netmaker/netclient/ncutils"
"github.com/gravitl/netmaker/netclient/wireguard" "github.com/gravitl/netmaker/netclient/wireguard"
"github.com/gravitl/netmaker/nm-proxy/manager"
"github.com/guumaster/hostctl/pkg/file" "github.com/guumaster/hostctl/pkg/file"
"github.com/guumaster/hostctl/pkg/parser" "github.com/guumaster/hostctl/pkg/parser"
"github.com/guumaster/hostctl/pkg/types" "github.com/guumaster/hostctl/pkg/types"
@@ -246,6 +247,13 @@ func UpdatePeers(client mqtt.Client, msg mqtt.Message) {
logger.Log(0, "error syncing wg after peer update: "+err.Error()) logger.Log(0, "error syncing wg after peer update: "+err.Error())
return return
} }
ProxyMgmChan <- &manager.ManagerAction{
Action: manager.AddInterface,
Payload: manager.ManagerPayload{
InterfaceName: cfg.Node.Interface,
Peers: peerUpdate.Peers,
},
}
logger.Log(0, "network:", cfg.Node.Network, "received peer update for node "+cfg.Node.Name+" "+cfg.Node.Network) logger.Log(0, "network:", cfg.Node.Network, "received peer update for node "+cfg.Node.Name+" "+cfg.Node.Network)
if cfg.Node.DNSOn == "yes" { if cfg.Node.DNSOn == "yes" {
if err := setHostDNS(peerUpdate.DNS, cfg.Node.Interface, ncutils.IsWindows()); err != nil { if err := setHostDNS(peerUpdate.DNS, cfg.Node.Interface, ncutils.IsWindows()); err != nil {