Browse Source

if emqx, avoid sending mq creds from server to client

abhishek9686 1 year ago
parent
commit
82de96d9a3
4 changed files with 0 additions and 19 deletions
  1. 0 6
      auth/host_session.go
  2. 0 6
      controllers/enrollmentkeys.go
  3. 0 3
      controllers/migrate.go
  4. 0 4
      controllers/node.go

+ 0 - 6
auth/host_session.go

@@ -129,7 +129,6 @@ func SessionHandler(conn *websocket.Conn) {
 	select {
 	select {
 	case result := <-answer: // a read from req.answerCh has occurred
 	case result := <-answer: // a read from req.answerCh has occurred
 		// add the host, if not exists, handle like enrollment registration
 		// add the host, if not exists, handle like enrollment registration
-		hostPass := result.Host.HostPass
 		if !logic.HostExists(&result.Host) { // check if host already exists, add if not
 		if !logic.HostExists(&result.Host) { // check if host already exists, add if not
 			if servercfg.GetBrokerType() == servercfg.EmqxBrokerType {
 			if servercfg.GetBrokerType() == servercfg.EmqxBrokerType {
 				if err := mq.GetEmqxHandler().CreateEmqxUser(result.Host.ID.String(), result.Host.HostPass); err != nil {
 				if err := mq.GetEmqxHandler().CreateEmqxUser(result.Host.ID.String(), result.Host.HostPass); err != nil {
@@ -185,11 +184,6 @@ func SessionHandler(conn *websocket.Conn) {
 		}
 		}
 		server := servercfg.GetServerInfo()
 		server := servercfg.GetServerInfo()
 		server.TrafficKey = key
 		server.TrafficKey = key
-		if servercfg.GetBrokerType() == servercfg.EmqxBrokerType {
-			// set MQ username and password for EMQX clients
-			server.MQUserName = result.Host.ID.String()
-			server.MQPassword = hostPass
-		}
 		result.Host.HostPass = ""
 		result.Host.HostPass = ""
 		response := models.RegisterResponse{
 		response := models.RegisterResponse{
 			ServerConf:    server,
 			ServerConf:    server,

+ 0 - 6
controllers/enrollmentkeys.go

@@ -305,7 +305,6 @@ func handleHostRegister(w http.ResponseWriter, r *http.Request) {
 		)
 		)
 		return
 		return
 	}
 	}
-	hostPass := newHost.HostPass
 	if !hostExists {
 	if !hostExists {
 		newHost.PersistentKeepalive = models.DefaultPersistentKeepAlive
 		newHost.PersistentKeepalive = models.DefaultPersistentKeepAlive
 		// register host
 		// register host
@@ -361,11 +360,6 @@ func handleHostRegister(w http.ResponseWriter, r *http.Request) {
 	// ready the response
 	// ready the response
 	server := servercfg.GetServerInfo()
 	server := servercfg.GetServerInfo()
 	server.TrafficKey = key
 	server.TrafficKey = key
-	if servercfg.GetBrokerType() == servercfg.EmqxBrokerType {
-		// set MQ username and password for EMQX clients
-		server.MQUserName = newHost.ID.String()
-		server.MQPassword = hostPass
-	}
 	response := models.RegisterResponse{
 	response := models.RegisterResponse{
 		ServerConf:    server,
 		ServerConf:    server,
 		RequestedHost: newHost,
 		RequestedHost: newHost,

+ 0 - 3
controllers/migrate.go

@@ -71,9 +71,6 @@ func migrate(w http.ResponseWriter, r *http.Request) {
 				return
 				return
 			}
 			}
 			server = servercfg.GetServerInfo()
 			server = servercfg.GetServerInfo()
-			if servercfg.GetBrokerType() == servercfg.EmqxBrokerType {
-				server.MQUserName = host.ID.String()
-			}
 			key, keyErr := logic.RetrievePublicTrafficKey()
 			key, keyErr := logic.RetrievePublicTrafficKey()
 			if keyErr != nil {
 			if keyErr != nil {
 				slog.Error("retrieving traffickey", "error", err)
 				slog.Error("retrieving traffickey", "error", err)

+ 0 - 4
controllers/node.go

@@ -372,10 +372,6 @@ func getNode(w http.ResponseWriter, r *http.Request) {
 		return
 		return
 	}
 	}
 	server := servercfg.GetServerInfo()
 	server := servercfg.GetServerInfo()
-	if servercfg.GetBrokerType() == servercfg.EmqxBrokerType {
-		// set MQ username for EMQX clients
-		server.MQUserName = host.ID.String()
-	}
 	response := models.NodeGet{
 	response := models.NodeGet{
 		Node:         node,
 		Node:         node,
 		Host:         *host,
 		Host:         *host,