Pārlūkot izejas kodu

add valid token

lijian 1 mēnesi atpakaļ
vecāks
revīzija
4aa6a60532
1 mainītis faili ar 15 papildinājumiem un 14 dzēšanām
  1. 15 14
      pkg/mqtt/connection.go

+ 15 - 14
pkg/mqtt/connection.go

@@ -1,6 +1,7 @@
 package mqtt
 
 import (
+	"encoding/hex"
 	"errors"
 	"net"
 	"sparrow/pkg/models"
@@ -183,20 +184,20 @@ func (c *Connection) RcvMsgFromClient() {
 			c.DeviceID = device.RecordId
 			c.VendorId = device.VendorID
 			c.DeviceCode = device.DeviceIdentifier
-			//token, err := hex.DecodeString(msg.Password)
-			//if err != nil {
-			//	server.Log.Errorf("token format error : %v", err)
-			//	ret = RetCodeNotAuthorized
-			//	c.Close()
-			//	return
-			//}
-			//err = c.ValidateToken(token)
-			//if err != nil {
-			//	server.Log.Errorf("validate device token error. deviceid : %v, token : %s, error: %v", c.DeviceCode, hex.EncodeToString(token), err)
-			//	ret = RetCodeNotAuthorized
-			//	c.Close()
-			//	return
-			//}
+			token, err := hex.DecodeString(msg.Password)
+			if err != nil {
+				server.Log.Errorf("token format error : %v", err)
+				ret = RetCodeNotAuthorized
+				c.Close()
+				return
+			}
+			err = c.ValidateToken(token)
+			if err != nil {
+				server.Log.Errorf("validate device token error. deviceid : %v, token : %s, error: %v", c.DeviceCode, hex.EncodeToString(token), err)
+				ret = RetCodeNotAuthorized
+				c.Close()
+				return
+			}
 
 			if ret != RetCodeAccepted {
 				server.Log.Errorf("invalid CON: %d", ret)