mirror of
https://github.com/gravitl/netmaker.git
synced 2025-11-09 16:21:01 +08:00
configure mq to update admin password
This commit is contained in:
parent
d59a8687e9
commit
1b4128bf69
3 changed files with 57 additions and 4 deletions
2
main.go
2
main.go
|
|
@ -169,6 +169,8 @@ func runMessageQueue(wg *sync.WaitGroup) {
|
|||
defer wg.Done()
|
||||
brokerHost, secure := servercfg.GetMessageQueueEndpoint()
|
||||
logger.Log(0, "connecting to mq broker at", brokerHost, "with TLS?", fmt.Sprintf("%v", secure))
|
||||
// update admin password and re-create client
|
||||
mq.Configure()
|
||||
mq.SetupMQTT()
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
go mq.DynamicSecManager(ctx)
|
||||
|
|
|
|||
|
|
@ -31,8 +31,10 @@ var (
|
|||
ModifyClientCmd = "modifyClient"
|
||||
)
|
||||
|
||||
const mqDynSecAdmin = "Netmaker-Admin"
|
||||
const defaultAdminPassword = "Netmaker-Admin"
|
||||
var (
|
||||
mqDynSecAdmin string = "Netmaker-Admin"
|
||||
adminPassword string = "Netmaker-Admin"
|
||||
)
|
||||
|
||||
type MqDynSecGroup struct {
|
||||
Groupname string `json:"groupname"`
|
||||
|
|
@ -76,7 +78,7 @@ type MqDynsecPayload struct {
|
|||
var DynSecChan = make(chan DynSecAction, 100)
|
||||
|
||||
func DynamicSecManager(ctx context.Context) {
|
||||
|
||||
defer close(DynSecChan)
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
|
|
|
|||
51
mq/mq.go
51
mq/mq.go
|
|
@ -2,10 +2,12 @@ package mq
|
|||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"time"
|
||||
|
||||
mqtt "github.com/eclipse/paho.mqtt.golang"
|
||||
"github.com/gravitl/netmaker/logger"
|
||||
"github.com/gravitl/netmaker/logic"
|
||||
"github.com/gravitl/netmaker/netclient/ncutils"
|
||||
"github.com/gravitl/netmaker/servercfg"
|
||||
)
|
||||
|
|
@ -22,6 +24,53 @@ var peer_force_send = 0
|
|||
|
||||
var mqclient mqtt.Client
|
||||
|
||||
func Configure() {
|
||||
opts := mqtt.NewClientOptions()
|
||||
broker, _ := servercfg.GetMessageQueueEndpoint()
|
||||
opts.AddBroker(broker)
|
||||
id := ncutils.MakeRandomString(23)
|
||||
opts.ClientID = id
|
||||
opts.SetUsername(mqDynSecAdmin)
|
||||
opts.SetPassword(adminPassword)
|
||||
opts.SetAutoReconnect(true)
|
||||
opts.SetConnectRetry(true)
|
||||
opts.SetConnectRetryInterval(time.Second << 2)
|
||||
opts.SetKeepAlive(time.Minute)
|
||||
opts.SetWriteTimeout(time.Minute)
|
||||
mqclient := mqtt.NewClient(opts)
|
||||
tperiod := time.Now().Add(10 * time.Second)
|
||||
for {
|
||||
if token := mqclient.Connect(); !token.WaitTimeout(MQ_TIMEOUT*time.Second) || token.Error() != nil {
|
||||
logger.Log(2, "unable to connect to broker, retrying ...")
|
||||
if time.Now().After(tperiod) {
|
||||
if token.Error() == nil {
|
||||
logger.FatalLog("could not connect to broker, token timeout, exiting ...")
|
||||
} else {
|
||||
logger.FatalLog("could not connect to broker, exiting ...", token.Error().Error())
|
||||
}
|
||||
}
|
||||
} else {
|
||||
break
|
||||
}
|
||||
time.Sleep(2 * time.Second)
|
||||
}
|
||||
newAdminPassword := logic.GenKey()
|
||||
payload := MqDynsecPayload{
|
||||
Commands: []MqDynSecCmd{
|
||||
{
|
||||
Command: ModifyClientCmd,
|
||||
Username: mqDynSecAdmin,
|
||||
Password: newAdminPassword,
|
||||
},
|
||||
},
|
||||
}
|
||||
d, _ := json.Marshal(payload)
|
||||
if token := mqclient.Publish(DynamicSecPubTopic, 0, true, d); token.Error() != nil {
|
||||
logger.FatalLog("failed to modify admin password: ", token.Error().Error())
|
||||
}
|
||||
adminPassword = newAdminPassword
|
||||
}
|
||||
|
||||
// SetupMQTT creates a connection to broker and return client
|
||||
func SetupMQTT() {
|
||||
opts := mqtt.NewClientOptions()
|
||||
|
|
@ -30,7 +79,7 @@ func SetupMQTT() {
|
|||
id := ncutils.MakeRandomString(23)
|
||||
opts.ClientID = id
|
||||
opts.SetUsername(mqDynSecAdmin)
|
||||
opts.SetPassword(defaultAdminPassword)
|
||||
opts.SetPassword(adminPassword)
|
||||
opts.SetAutoReconnect(true)
|
||||
opts.SetConnectRetry(true)
|
||||
opts.SetConnectRetryInterval(time.Second << 2)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue