gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-11 15:44:52 +08:00
Code Issues Projects Releases Packages Wiki Activity

if emqx, avoid sending mq creds from server to client

Browse source
This commit is contained in:
abhishek9686 2024-01-26 11:15:18 +05:30
parent b5db86d1a7
commit 8a777205d5
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
controllers/hosts.go
View file

@ -124,9 +124,6 @@ func pull(w http.ResponseWriter, r *http.Request) {
return return
} }
serverConf := servercfg.GetServerInfo() serverConf := servercfg.GetServerInfo()
if servercfg.GetBrokerType() == servercfg.EmqxBrokerType {
serverConf.MQUserName = hostID
}
key, keyErr := logic.RetrievePublicTrafficKey() key, keyErr := logic.RetrievePublicTrafficKey()
if keyErr != nil { if keyErr != nil {
logger.Log(0, "error retrieving key:", keyErr.Error()) logger.Log(0, "error retrieving key:", keyErr.Error())

9
servercfg/serverconf.go
View file

@ -117,8 +117,13 @@ func GetRacAutoDisable() bool {
func GetServerInfo() models.ServerConfig { func GetServerInfo() models.ServerConfig {
var cfg models.ServerConfig var cfg models.ServerConfig
cfg.Server = GetServer() cfg.Server = GetServer()
cfg.MQUserName = GetMqUserName() if GetBrokerType() == EmqxBrokerType {
cfg.MQPassword = GetMqPassword() cfg.MQUserName = "HOST_ID"
cfg.MQPassword = "HOST_PASS"
} else {
cfg.MQUserName = GetMqUserName()
cfg.MQPassword = GetMqPassword()
}
cfg.API = GetAPIConnString() cfg.API = GetAPIConnString()
cfg.CoreDNSAddr = GetCoreDNSAddr() cfg.CoreDNSAddr = GetCoreDNSAddr()
cfg.APIPort = GetAPIPort() cfg.APIPort = GetAPIPort()