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

comment certs code for mq

Browse Source
This commit is contained in:
Abhishek Kondur
2022-09-15 09:23:33 +05:30
parent 5270c1ede8
commit 7db3bd3aca
6 changed files with 38 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
controllers/node.go
View File

@@ -601,19 +601,8 @@ func createNode(w http.ResponseWriter, r *http.Request) {
Command: mq.CreateClientCmd, Command: mq.CreateClientCmd,
Username: node.ID, Username: node.ID,
Password: node.Password, Password: node.Password,
Clientid: node.ID, Roles: make([]mq.MqDynSecRole, 0),
Roles: []mq.MqDynSecRole{ Groups: make([]mq.MqDynSecGroup, 0),
{
Rolename: "node",
Priority: -1,
},
},
Groups: []mq.MqDynSecGroup{
{
Groupname: "nodes",
Priority: -1,
},
},
}, },
}, },
}, },

1
mq/mq.go
View File

@@ -26,6 +26,7 @@ var mqclient mqtt.Client
func SetupMQTT() { func SetupMQTT() {
opts := mqtt.NewClientOptions() opts := mqtt.NewClientOptions()
broker, _ := servercfg.GetMessageQueueEndpoint() broker, _ := servercfg.GetMessageQueueEndpoint()
logger.Log(0, "----------> BROKER: ", broker)
opts.AddBroker(broker) opts.AddBroker(broker)
id := ncutils.MakeRandomString(23) id := ncutils.MakeRandomString(23)
opts.ClientID = id opts.ClientID = id

45
netclient/command/commands.go
View File

@@ -1,8 +1,6 @@
package command package command
import ( import (
"crypto/ed25519"
"crypto/rand"
"fmt" "fmt"
"strings" "strings"
@@ -11,7 +9,6 @@ import (
"github.com/gravitl/netmaker/netclient/daemon" "github.com/gravitl/netmaker/netclient/daemon"
"github.com/gravitl/netmaker/netclient/functions" "github.com/gravitl/netmaker/netclient/functions"
"github.com/gravitl/netmaker/netclient/ncutils" "github.com/gravitl/netmaker/netclient/ncutils"
"github.com/gravitl/netmaker/tls"
) )
// Join - join command to run from cli // Join - join command to run from cli
@@ -93,27 +90,27 @@ func Pull(cfg *config.ClientConfig) error {
currentServers[currCfg.Server.Server] = *currCfg currentServers[currCfg.Server.Server] = *currCfg
} }
//generate new client key if one doesn' exist // //generate new client key if one doesn' exist
var private *ed25519.PrivateKey // var private *ed25519.PrivateKey
private, err = tls.ReadKeyFromFile(ncutils.GetNetclientPath() + ncutils.GetSeparator() + "client.key") // private, err = tls.ReadKeyFromFile(ncutils.GetNetclientPath() + ncutils.GetSeparator() + "client.key")
if err != nil { // if err != nil {
_, newKey, err := ed25519.GenerateKey(rand.Reader) // _, newKey, err := ed25519.GenerateKey(rand.Reader)
if err != nil { // if err != nil {
return err // return err
} // }
if err := tls.SaveKeyToFile(ncutils.GetNetclientPath(), ncutils.GetSeparator()+"client.key", newKey); err != nil { // if err := tls.SaveKeyToFile(ncutils.GetNetclientPath(), ncutils.GetSeparator()+"client.key", newKey); err != nil {
return err // return err
} // }
private = &newKey // private = &newKey
} // }
// re-register with server -- get new certs for broker // // re-register with server -- get new certs for broker
for _, clientCfg := range currentServers { // for _, clientCfg := range currentServers {
if err = functions.RegisterWithServer(private, &clientCfg); err != nil { // if err = functions.RegisterWithServer(private, &clientCfg); err != nil {
logger.Log(0, "registration error", err.Error()) // logger.Log(0, "registration error", err.Error())
} else { // } else {
daemon.Restart() daemon.Restart()
} // }
} // }
logger.Log(1, "reset network", cfg.Network, "and peer configs") logger.Log(1, "reset network", cfg.Network, "and peer configs")
return err return err

18
netclient/functions/daemon.go
View File

@@ -265,13 +265,15 @@ func setupMQTT(cfg *config.ClientConfig) error {
opts := mqtt.NewClientOptions() opts := mqtt.NewClientOptions()
server := cfg.Server.Server server := cfg.Server.Server
port := cfg.Server.MQPort port := cfg.Server.MQPort
opts.AddBroker("ssl://" + server + ":" + port) opts.AddBroker("mqtts://" + server + ":" + port)
tlsConfig, err := NewTLSConfig(server) // tlsConfig, err := NewTLSConfig(server)
if err != nil { // if err != nil {
logger.Log(0, "failed to get TLS config for", server, err.Error()) // logger.Log(0, "failed to get TLS config for", server, err.Error())
return err // return err
} // }
opts.SetTLSConfig(tlsConfig) //opts.SetTLSConfig(tlsConfig)
opts.SetUsername(cfg.Node.ID)
opts.SetPassword(cfg.Node.Password)
opts.SetClientID(ncutils.MakeRandomString(23)) opts.SetClientID(ncutils.MakeRandomString(23))
opts.SetDefaultPublishHandler(All) opts.SetDefaultPublishHandler(All)
opts.SetAutoReconnect(true) opts.SetAutoReconnect(true)
@@ -314,7 +316,7 @@ func setupMQTT(cfg *config.ClientConfig) error {
} }
} }
if connecterr != nil { if connecterr != nil {
reRegisterWithServer(cfg) //reRegisterWithServer(cfg)
//try after re-registering //try after re-registering
if token := mqclient.Connect(); !token.WaitTimeout(30*time.Second) || token.Error() != nil { if token := mqclient.Connect(); !token.WaitTimeout(30*time.Second) || token.Error() != nil {
return errors.New("unable to connect to broker") return errors.New("unable to connect to broker")

6
netclient/functions/join.go
View File

@@ -206,9 +206,9 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error {
logger.Log(0, "error setting route for netmaker: "+err.Error()) logger.Log(0, "error setting route for netmaker: "+err.Error())
} }
cfg.Node = node cfg.Node = node
if err := Register(cfg); err != nil { // if err := Register(cfg); err != nil {
return err // return err
} // }
logger.Log(0, "starting wireguard") logger.Log(0, "starting wireguard")
err = wireguard.InitWireguard(&node, privateKey, nodeGET.Peers[:]) err = wireguard.InitWireguard(&node, privateKey, nodeGET.Peers[:])

2
netclient/functions/mqpublish.go
View File

@@ -103,7 +103,7 @@ func checkin() {
config.Write(&nodeCfg, nodeCfg.Network) config.Write(&nodeCfg, nodeCfg.Network)
} }
Hello(&nodeCfg) Hello(&nodeCfg)
checkCertExpiry(&nodeCfg) //checkCertExpiry(&nodeCfg)
} }
} }