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

added new struct and adapted to funcs

Browse Source
This commit is contained in:
0xdcarns
2022-01-26 10:40:39 -05:00
parent 424c801c6c
commit 27b29baf32
7 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
controllers/node_grpc.go
View File

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

4
logic/peers.go
View File

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

6
models/mqtt.go
View File

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

2
models/network.go
View File

@@ -38,7 +38,7 @@ type Network struct {
DefaultUDPHolePunch string `json:"defaultudpholepunch" bson:"defaultudpholepunch" validate:"checkyesorno"` DefaultUDPHolePunch string `json:"defaultudpholepunch" bson:"defaultudpholepunch" validate:"checkyesorno"`
DefaultExtClientDNS string `json:"defaultextclientdns" bson:"defaultextclientdns"` DefaultExtClientDNS string `json:"defaultextclientdns" bson:"defaultextclientdns"`
DefaultMTU int32 `json:"defaultmtu" bson:"defaultmtu"` DefaultMTU int32 `json:"defaultmtu" bson:"defaultmtu"`
DefaultServerAddrs string `json:"defaultserveraddrs" bson:"defaultserveraddrs" yaml:"defaultserveraddrs"` DefaultServerAddrs []ServerAddr `json:"defaultserveraddrs" bson:"defaultserveraddrs" yaml:"defaultserveraddrs"`
} }
// SaveData - sensitive fields of a network that should be kept the same // SaveData - sensitive fields of a network that should be kept the same

6
models/structs.go
View File

@@ -169,3 +169,9 @@ type Telemetry struct {
UUID string `json:"uuid" bson:"uuid"` UUID string `json:"uuid" bson:"uuid"`
LastSend int64 `json:"lastsend" bson:"lastsend"` 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"`
}

35
netclient/functions/daemon.go
View File

@@ -8,7 +8,6 @@ import (
"os" "os"
"os/signal" "os/signal"
"runtime" "runtime"
"strings"
"sync" "sync"
"syscall" "syscall"
"time" "time"
@@ -60,11 +59,10 @@ func Daemon() error {
// SetupMQTT creates a connection to broker and return client // SetupMQTT creates a connection to broker and return client
func SetupMQTT(cfg *config.ClientConfig) mqtt.Client { func SetupMQTT(cfg *config.ClientConfig) mqtt.Client {
opts := mqtt.NewClientOptions() opts := mqtt.NewClientOptions()
serverAddrs := strings.Split(cfg.Node.NetworkSettings.DefaultServerAddrs, ",") for i, server := range cfg.Node.NetworkSettings.DefaultServerAddrs {
for i, addr := range serverAddrs { if server.Address != "" && server.IsLeader {
if addr != "" {
ncutils.Log(fmt.Sprintf("adding server (%d) to listen on network %s \n", (i + 1), cfg.Node.Network)) ncutils.Log(fmt.Sprintf("adding server (%d) to listen on network %s \n", (i + 1), cfg.Node.Network))
opts.AddBroker(addr + ":1883") opts.AddBroker(server.Address + ":1883")
} }
} }
opts.SetDefaultPublishHandler(All) opts.SetDefaultPublishHandler(All)
@@ -89,13 +87,13 @@ func MessageQueue(ctx context.Context, network string) {
} }
ncutils.Log("subscribed to all topics for debugging purposes") 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()) log.Fatal(token.Error())
} }
if cfg.DebugOn { if cfg.DebugOn {
ncutils.Log("subscribed to node updates for node " + cfg.Node.Name + " update/" + cfg.Node.ID) 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()) log.Fatal(token.Error())
} }
if cfg.DebugOn { if cfg.DebugOn {
@@ -115,7 +113,7 @@ var All mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message) {
} }
// NodeUpdate -- mqtt message handler for /update/<NodeID> topic // NodeUpdate -- mqtt message handler for /update/<NodeID> topic
var NodeUpdate mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message) { func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
ncutils.Log("received message to update node " + string(msg.Payload())) ncutils.Log("received message to update node " + string(msg.Payload()))
//potentiall blocking i/o so do this in a go routine //potentiall blocking i/o so do this in a go routine
go func() { go func() {
@@ -199,7 +197,7 @@ var NodeUpdate mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message)
} }
// UpdatePeers -- mqtt message handler for /update/peers/<NodeID> topic // 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() { go func() {
var peerUpdate models.PeerUpdate var peerUpdate models.PeerUpdate
err := json.Unmarshal(msg.Payload(), &peerUpdate) err := json.Unmarshal(msg.Payload(), &peerUpdate)
@@ -217,12 +215,10 @@ var UpdatePeers mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message)
var cfg config.ClientConfig var cfg config.ClientConfig
cfg.Network = peerUpdate.Network cfg.Network = peerUpdate.Network
cfg.ReadConfig() cfg.ReadConfig()
var shouldReSub = shouldResub(strings.Split(cfg.Node.NetworkSettings.DefaultServerAddrs, ","), peerUpdate.ServerAddrs) var shouldReSub = shouldResub(cfg.Node.NetworkSettings.DefaultServerAddrs, peerUpdate.ServerAddrs)
if shouldReSub { if shouldReSub {
client.Disconnect(250) // kill client Resubscribe(client, &cfg)
// un sub, re sub.. how? cfg.Node.NetworkSettings.DefaultServerAddrs = peerUpdate.ServerAddrs
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" file := ncutils.GetNetclientPathSpecific() + cfg.Node.Interface + ".conf"
err = wireguard.UpdateWgPeers(file, peerUpdate.Peers) err = wireguard.UpdateWgPeers(file, peerUpdate.Peers)
@@ -240,8 +236,9 @@ var UpdatePeers mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message)
} }
// Resubscribe --- handles resubscribing if needed // 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 { if err := config.ModConfig(&cfg.Node); err == nil {
ncutils.Log("resubbing on network " + cfg.Node.Network)
client.Disconnect(250) client.Disconnect(250)
client = SetupMQTT(cfg) client = SetupMQTT(cfg)
if token := client.Subscribe("update/"+cfg.Node.ID, 0, NodeUpdate); token.Wait() && token.Error() != nil { if token := client.Subscribe("update/"+cfg.Node.ID, 0, NodeUpdate); token.Wait() && token.Error() != nil {
@@ -254,8 +251,10 @@ func Resubscribe(client mqtt.Client, cfg *config.ClientConfig) {
log.Fatal(token.Error()) log.Fatal(token.Error())
} }
ncutils.Log("finished re subbing") ncutils.Log("finished re subbing")
return nil
} else { } else {
ncutils.Log("could not mod config when re-subbing") ncutils.Log("could not mod config when re-subbing")
return err
} }
} }
@@ -355,12 +354,12 @@ func Hello(cfg *config.ClientConfig, network string) {
client.Disconnect(250) client.Disconnect(250)
} }
func shouldResub(currentServers, newServers []string) bool { func shouldResub(currentServers, newServers []models.ServerAddr) bool {
if len(currentServers) != len(newServers) { if len(currentServers) != len(newServers) {
return false return true
} }
for _, srv := range currentServers { for _, srv := range currentServers {
if !ncutils.StringSliceContains(newServers, srv) { if !ncutils.ServerAddrSliceContains(newServers, srv) {
return true return true
} }
} }

7
netclient/ncutils/netclientutils.go
View File

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