|
@@ -1,6 +1,7 @@
|
|
package mqtt
|
|
package mqtt
|
|
|
|
|
|
import (
|
|
import (
|
|
|
|
+ "encoding/hex"
|
|
"errors"
|
|
"errors"
|
|
"net"
|
|
"net"
|
|
"sparrow/pkg/models"
|
|
"sparrow/pkg/models"
|
|
@@ -183,20 +184,20 @@ func (c *Connection) RcvMsgFromClient() {
|
|
c.DeviceID = device.RecordId
|
|
c.DeviceID = device.RecordId
|
|
c.VendorId = device.VendorID
|
|
c.VendorId = device.VendorID
|
|
c.DeviceCode = device.DeviceIdentifier
|
|
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 {
|
|
if ret != RetCodeAccepted {
|
|
server.Log.Errorf("invalid CON: %d", ret)
|
|
server.Log.Errorf("invalid CON: %d", ret)
|