gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-11 07:34:31 +08:00
Code Issues Projects Releases Packages 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
Show stats 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,
Username: node.ID,
Password: node.Password,
Clientid: node.ID,
Roles: []mq.MqDynSecRole{
{
Rolename: "node",
Priority: -1,
},
},
Groups: []mq.MqDynSecGroup{
{
Groupname: "nodes",
Priority: -1,
},
},
Roles: make([]mq.MqDynSecRole, 0),
Groups: make([]mq.MqDynSecGroup, 0),
},
},
},

1
mq/mq.go
View file

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

45
netclient/command/commands.go
View file

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

18
netclient/functions/daemon.go
View file

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