From f42a2c94349348d1d78f4102561abfd7788b65e3 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 20 Jun 2022 18:12:02 +0800 Subject: [PATCH 1/7] kickoff --- internal/msg_gateway/gate/logic.go | 21 +++++++++++-- internal/msg_gateway/gate/rpc_server.go | 4 ++- internal/msg_gateway/gate/ws_server.go | 19 ++++++++++++ internal/utils/jwt_token_test.go | 10 +++---- pkg/common/constant/constant.go | 4 +++ pkg/common/constant/error.go | 40 ++++++++++++++----------- pkg/common/token_verify/jwt_token.go | 13 ++++---- 7 files changed, 77 insertions(+), 34 deletions(-) diff --git a/internal/msg_gateway/gate/logic.go b/internal/msg_gateway/gate/logic.go index 2ece3bd94..60ba0ab2c 100644 --- a/internal/msg_gateway/gate/logic.go +++ b/internal/msg_gateway/gate/logic.go @@ -3,6 +3,7 @@ package gate import ( "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" + "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" "Open_IM/pkg/grpc-etcdv3/getcdv3" pbChat "Open_IM/pkg/proto/chat" @@ -170,7 +171,7 @@ func (ws *WServer) sendMsgReq(conn *UserConn, m *Req) { sendMsgAllCountLock.Lock() sendMsgAllCount++ sendMsgAllCountLock.Unlock() - log.NewInfo(m.OperationID, "Ws call success to sendMsgReq start", m.MsgIncr, m.ReqIdentifier, m.SendID, m.Data) + log.NewInfo(m.OperationID, "Ws call success to sendMsgReq start", m.MsgIncr, m.ReqIdentifier, m.SendID) nReply := new(pbChat.SendMsgResp) isPass, errCode, errMsg, pData := ws.argsValidate(m, constant.WSSendMsg, m.OperationID) @@ -181,7 +182,7 @@ func (ws *WServer) sendMsgReq(conn *UserConn, m *Req) { OperationID: m.OperationID, MsgData: &data, } - log.NewInfo(m.OperationID, "Ws call success to sendMsgReq middle", m.ReqIdentifier, m.SendID, m.MsgIncr, data) + log.NewInfo(m.OperationID, "Ws call success to sendMsgReq middle", m.ReqIdentifier, m.SendID, m.MsgIncr, data.String()) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName, m.OperationID) if etcdConn == nil { errMsg := m.OperationID + "getcdv3.GetConn == nil" @@ -331,3 +332,19 @@ func (ws *WServer) sendErrMsg(conn *UserConn, errCode int32, errMsg string, reqI } ws.sendMsg(conn, mReply) } + +func SetTokenKicked(userID string, platformID int, operationID string) { + m, err := db.DB.GetTokenMapByUidPid(userID, constant.PlatformIDToName(platformID)) + if err != nil { + log.Error(operationID, "GetTokenMapByUidPid failed ", err.Error(), userID, constant.PlatformIDToName(platformID)) + return + } + for k, _ := range m { + m[k] = constant.KickedToken + } + err = db.DB.SetTokenMapByUidPid(userID, platformID, m) + if err != nil { + log.Error(operationID, "SetTokenMapByUidPid failed ", err.Error(), userID, constant.PlatformIDToName(platformID)) + return + } +} diff --git a/internal/msg_gateway/gate/rpc_server.go b/internal/msg_gateway/gate/rpc_server.go index 6b851b8f0..6c7ec7809 100644 --- a/internal/msg_gateway/gate/rpc_server.go +++ b/internal/msg_gateway/gate/rpc_server.go @@ -292,11 +292,13 @@ func (r *RPCServer) KickUserOffline(_ context.Context, req *pbRelay.KickUserOffl oldConnMap := ws.getUserAllCons(v) if conn, ok := oldConnMap[int(req.PlatformID)]; ok { // user->map[platform->conn] ws.sendKickMsg(conn, &UserConn{}) + conn.Close() } + SetTokenKicked(v, int(req.PlatformID), req.OperationID) } return &pbRelay.KickUserOfflineResp{}, nil - } + func sendMsgToUser(conn *UserConn, bMsg []byte, in *pbRelay.OnlinePushMsgReq, RecvPlatForm int, RecvID string) (ResultCode int64) { err := ws.writeMsg(conn, websocket.BinaryMessage, bMsg) if err != nil { diff --git a/internal/msg_gateway/gate/ws_server.go b/internal/msg_gateway/gate/ws_server.go index 223270197..aaffb68d6 100644 --- a/internal/msg_gateway/gate/ws_server.go +++ b/internal/msg_gateway/gate/ws_server.go @@ -289,6 +289,24 @@ func (ws *WServer) headerCheck(w http.ResponseWriter, r *http.Request, operation query := r.URL.Query() if len(query["token"]) != 0 && len(query["sendID"]) != 0 && len(query["platformID"]) != 0 { if ok, err, msg := token_verify.WsVerifyToken(query["token"][0], query["sendID"][0], query["platformID"][0], operationID); !ok { + switch err { + case constant.ErrTokenExpired: + status = int(constant.ErrTokenExpired.ErrCode) + case constant.ErrTokenInvalid: + status = int(constant.ErrTokenInvalid.ErrCode) + case constant.ErrTokenMalformed: + status = int(constant.ErrTokenMalformed.ErrCode) + case constant.ErrTokenNotValidYet: + status = int(constant.ErrTokenNotValidYet.ErrCode) + case constant.ErrTokenUnknown: + status = int(constant.ErrTokenUnknown.ErrCode) + case constant.ErrTokenKicked: + status = int(constant.ErrTokenKicked.ErrCode) + case constant.ErrTokenDifferentPlatformID: + status = int(constant.ErrTokenDifferentPlatformID.ErrCode) + case constant.ErrTokenDifferentUserID: + status = int(constant.ErrTokenDifferentUserID.ErrCode) + } log.Error(operationID, "Token verify failed ", "query ", query, msg, err.Error()) w.Header().Set("Sec-Websocket-Version", "13") w.Header().Set("ws_err_msg", err.Error()) @@ -299,6 +317,7 @@ func (ws *WServer) headerCheck(w http.ResponseWriter, r *http.Request, operation return true } } else { + status = int(constant.ErrArgs.ErrCode) log.Error(operationID, "Args err ", "query ", query) w.Header().Set("Sec-Websocket-Version", "13") errMsg := "args err, need token, sendID, platformID" diff --git a/internal/utils/jwt_token_test.go b/internal/utils/jwt_token_test.go index da53a2a36..fe7a6b320 100644 --- a/internal/utils/jwt_token_test.go +++ b/internal/utils/jwt_token_test.go @@ -38,7 +38,7 @@ func Test_CreateToken(t *testing.T) { platform := int32(1) now := time.Now().Unix() - tokenString, expiresAt, err := token_verify.CreateToken(uid, platform) + tokenString, expiresAt, err := token_verify.CreateToken(uid, int(platform)) assert.NotEmpty(t, tokenString) assert.Equal(t, expiresAt, 604800+now) @@ -48,7 +48,7 @@ func Test_CreateToken(t *testing.T) { func Test_VerifyToken(t *testing.T) { uid := "1" platform := int32(1) - tokenString, _, _ := token_verify.CreateToken(uid, platform) + tokenString, _, _ := token_verify.CreateToken(uid, int(platform)) result, _ := token_verify.VerifyToken(tokenString, uid) assert.True(t, result) result, _ = token_verify.VerifyToken(tokenString, "2") @@ -58,7 +58,7 @@ func Test_VerifyToken(t *testing.T) { func Test_ParseRedisInterfaceToken(t *testing.T) { uid := "1" platform := int32(1) - tokenString, _, _ := token_verify.CreateToken(uid, platform) + tokenString, _, _ := token_verify.CreateToken(uid, int(platform)) claims, err := token_verify.ParseRedisInterfaceToken([]uint8(tokenString)) assert.Nil(t, err) @@ -66,7 +66,7 @@ func Test_ParseRedisInterfaceToken(t *testing.T) { // timeout config.Config.TokenPolicy.AccessExpire = -80 - tokenString, _, _ = token_verify.CreateToken(uid, platform) + tokenString, _, _ = token_verify.CreateToken(uid, int(platform)) claims, err = token_verify.ParseRedisInterfaceToken([]uint8(tokenString)) assert.Equal(t, err, constant.ExpiredToken) assert.Nil(t, claims) @@ -75,7 +75,7 @@ func Test_ParseRedisInterfaceToken(t *testing.T) { func Test_ParseToken(t *testing.T) { uid := "1" platform := int32(1) - tokenString, _, _ := token_verify.CreateToken(uid, platform) + tokenString, _, _ := token_verify.CreateToken(uid, int(platform)) claims, err := token_verify.ParseToken(tokenString, "") if err == nil { assert.Equal(t, claims.UID, uid) diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go index 324e4e8bc..5f95063a9 100644 --- a/pkg/common/constant/constant.go +++ b/pkg/common/constant/constant.go @@ -283,6 +283,10 @@ func GroupIsBanPrivateChat(status int32) bool { return true } +const ( + TokenKicked = 1001 +) + const BigVersion = "v2" const LogFileName = "OpenIM.log" diff --git a/pkg/common/constant/error.go b/pkg/common/constant/error.go index 08a3c23f8..fa5f3c68b 100644 --- a/pkg/common/constant/error.go +++ b/pkg/common/constant/error.go @@ -42,12 +42,14 @@ var ( // ErrQuitGroup = ErrInfo{621, "Failed to quit the group"} // ErrSetGroupInfo = ErrInfo{622, "Failed to set group info"} // ErrParam = ErrInfo{700, "param failed"} - ErrTokenExpired = ErrInfo{701, TokenExpiredMsg.Error()} - ErrTokenInvalid = ErrInfo{702, TokenInvalidMsg.Error()} - ErrTokenMalformed = ErrInfo{703, TokenMalformedMsg.Error()} - ErrTokenNotValidYet = ErrInfo{704, TokenNotValidYetMsg.Error()} - ErrTokenUnknown = ErrInfo{705, TokenUnknownMsg.Error()} - ErrTokenKicked = ErrInfo{706, TokenUserKickedMsg.Error()} + ErrTokenExpired = ErrInfo{701, TokenExpiredMsg.Error()} + ErrTokenInvalid = ErrInfo{702, TokenInvalidMsg.Error()} + ErrTokenMalformed = ErrInfo{703, TokenMalformedMsg.Error()} + ErrTokenNotValidYet = ErrInfo{704, TokenNotValidYetMsg.Error()} + ErrTokenUnknown = ErrInfo{705, TokenUnknownMsg.Error()} + ErrTokenKicked = ErrInfo{706, TokenUserKickedMsg.Error()} + ErrTokenDifferentPlatformID = ErrInfo{707, TokenDifferentPlatformIDMsg.Error()} + ErrTokenDifferentUserID = ErrInfo{708, TokenDifferentUserIDMsg.Error()} ErrAccess = ErrInfo{ErrCode: 801, ErrMsg: AccessMsg.Error()} ErrDB = ErrInfo{ErrCode: 802, ErrMsg: DBMsg.Error()} @@ -60,18 +62,20 @@ var ( ) var ( - ParseTokenMsg = errors.New("parse token failed") - TokenExpiredMsg = errors.New("token is timed out, please log in again") - TokenInvalidMsg = errors.New("token has been invalidated") - TokenNotValidYetMsg = errors.New("token not active yet") - TokenMalformedMsg = errors.New("that's not even a token") - TokenUnknownMsg = errors.New("couldn't handle this token") - TokenUserKickedMsg = errors.New("user has been kicked") - AccessMsg = errors.New("no permission") - StatusMsg = errors.New("status is abnormal") - DBMsg = errors.New("db failed") - ArgsMsg = errors.New("args failed") - CallBackMsg = errors.New("callback failed") + ParseTokenMsg = errors.New("parse token failed") + TokenExpiredMsg = errors.New("token is timed out, please log in again") + TokenInvalidMsg = errors.New("token has been invalidated") + TokenNotValidYetMsg = errors.New("token not active yet") + TokenMalformedMsg = errors.New("that's not even a token") + TokenUnknownMsg = errors.New("couldn't handle this token") + TokenUserKickedMsg = errors.New("user has been kicked") + TokenDifferentPlatformIDMsg = errors.New("different platformID") + TokenDifferentUserIDMsg = errors.New("different userID") + AccessMsg = errors.New("no permission") + StatusMsg = errors.New("status is abnormal") + DBMsg = errors.New("db failed") + ArgsMsg = errors.New("args failed") + CallBackMsg = errors.New("callback failed") ThirdPartyMsg = errors.New("third party error") ) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 54a1b4274..3d93ccb44 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -188,7 +188,7 @@ func ParseToken(tokensString, operationID string) (claims *Claims, err error) { return nil, utils.Wrap(&constant.ErrTokenInvalid, "get token from redis err") } if m == nil { - log.NewError(operationID, "get token from redis err", "m is nil", tokensString) + log.NewError(operationID, "get token from redis err, not in redis ", "m is nil", tokensString) return nil, utils.Wrap(&constant.ErrTokenInvalid, "get token from redis err") } if v, ok := m[tokensString]; ok { @@ -196,13 +196,9 @@ func ParseToken(tokensString, operationID string) (claims *Claims, err error) { case constant.NormalToken: log.NewDebug(operationID, "this is normal return", claims) return claims, nil - case constant.InValidToken: - return nil, utils.Wrap(&constant.ErrTokenInvalid, "") case constant.KickedToken: log.Error(operationID, "this token has been kicked by other same terminal ", constant.ErrTokenKicked) return nil, utils.Wrap(&constant.ErrTokenKicked, "this token has been kicked by other same terminal ") - case constant.ExpiredToken: - return nil, utils.Wrap(&constant.ErrTokenExpired, "") default: return nil, utils.Wrap(&constant.ErrTokenUnknown, "") } @@ -244,20 +240,21 @@ func VerifyToken(token, uid string) (bool, error) { log.NewDebug("", claims.UID, claims.Platform) return true, nil } + func WsVerifyToken(token, uid string, platformID string, operationID string) (bool, error, string) { argMsg := "token: " + token + " operationID: " + operationID + " userID: " + uid + " platformID: " + platformID claims, err := ParseToken(token, operationID) if err != nil { - errMsg := "parse token err " + argMsg + errMsg := "parse token err " + err.Error() + argMsg return false, utils.Wrap(err, errMsg), errMsg } if claims.UID != uid { errMsg := " uid is not same to token uid " + " claims.UID " + claims.UID + argMsg - return false, utils.Wrap(&constant.ErrTokenUnknown, errMsg), errMsg + return false, utils.Wrap(&constant.ErrTokenDifferentUserID, errMsg), errMsg } if claims.Platform != constant.PlatformIDToName(utils.StringToInt(platformID)) { errMsg := " platform is not same to token platform " + argMsg + "claims platformID " + claims.Platform - return false, utils.Wrap(&constant.ErrTokenUnknown, errMsg), errMsg + return false, utils.Wrap(&constant.ErrTokenDifferentPlatformID, errMsg), errMsg } log.NewDebug(operationID, utils.GetSelfFuncName(), " check ok ", claims.UID, uid, claims.Platform) return true, nil, "" From b242aac7cdfc116c9e7c19279a4a7d4c9c6c08e9 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 21 Jun 2022 11:27:39 +0800 Subject: [PATCH 2/7] jpush add config for ios env mode --- config/config.yaml | 1 + internal/push/jpush/push.go | 2 +- pkg/common/config/config.go | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/config.yaml b/config/config.yaml index 923b95591..617d5b557 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -261,6 +261,7 @@ messageverify: iospush: pushSound: "xxx" badgeCount: true + production: true callback: # callback url 需要自行更换callback url diff --git a/internal/push/jpush/push.go b/internal/push/jpush/push.go index 833174de5..060b11d78 100644 --- a/internal/push/jpush/push.go +++ b/internal/push/jpush/push.go @@ -51,7 +51,7 @@ func (j *JPush) Push(accounts []string, alert, detailContent, operationID string var me requestBody.Message me.SetMsgContent(detailContent) var o requestBody.Options - o.SetApnsProduction(false) + o.SetApnsProduction(config.Config.IOSPush.Production) var po requestBody.PushObj po.SetPlatform(&pf) po.SetAudience(&au) diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index 2163e7619..9f6b4ba18 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -238,6 +238,7 @@ type config struct { IOSPush struct { PushSound string `yaml:"pushSound"` BadgeCount bool `yaml:"badgeCount"` + Production bool `yaml:"production"` } Callback struct { From 7783e5b7cfdb602a328b6345f82e935be6e8381c Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 21 Jun 2022 11:28:02 +0800 Subject: [PATCH 3/7] jpush add config for ios env mode --- config/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.yaml b/config/config.yaml index 617d5b557..d30e21afa 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -261,7 +261,7 @@ messageverify: iospush: pushSound: "xxx" badgeCount: true - production: true + production: false callback: # callback url 需要自行更换callback url From 49797ce6abd110a6fd55336123e6223c70b5b338 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 14:54:42 +0800 Subject: [PATCH 4/7] super group notification --- internal/rpc/group/group.go | 22 +++++++++++++++----- internal/rpc/msg/super_group_notification.go | 6 +++--- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index f51e0edc4..946002363 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -208,8 +208,11 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR if req.GroupInfo.GroupType != constant.SuperGroup { chat.GroupCreatedNotification(req.OperationID, req.OpUserID, groupId, okUserIDList) } else { - chat.SuperGroupNotification(req.OperationID, req.OpUserID, groupId) - + go func() { + for _, v := range okUserIDList { + chat.SuperGroupNotification(req.OperationID, v, v) + } + }() } return resp, nil } else { @@ -406,7 +409,11 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite if groupInfo.GroupType != constant.SuperGroup { chat.MemberInvitedNotification(req.OperationID, req.GroupID, req.OpUserID, req.Reason, okUserIDList) } else { - chat.SuperGroupNotification(req.OperationID, req.OpUserID, req.GroupID) + go func() { + for _, v := range req.InvitedUserIDList { + chat.SuperGroupNotification(req.OperationID, v, v) + } + }() } log.NewInfo(req.OperationID, "InviteUserToGroup rpc return ") @@ -620,7 +627,12 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou if groupInfo.GroupType != constant.SuperGroup { chat.MemberKickedNotification(req, okUserIDList) } else { - chat.SuperGroupNotification(req.OperationID, req.OpUserID, req.GroupID) + go func() { + for _, v := range req.KickedUserIDList { + chat.SuperGroupNotification(req.OperationID, v, v) + } + }() + } log.NewInfo(req.OperationID, "GetGroupMemberList rpc return ", resp.String()) return &resp, nil @@ -928,7 +940,7 @@ func (s *groupServer) QuitGroup(ctx context.Context, req *pbGroup.QuitGroupReq) if groupInfo.GroupType != constant.SuperGroup { chat.MemberQuitNotification(req) } else { - chat.SuperGroupNotification(req.OperationID, req.OpUserID, req.GroupID) + chat.SuperGroupNotification(req.OperationID, req.OpUserID, req.OpUserID) } log.NewInfo(req.OperationID, "rpc QuitGroup return ", pbGroup.QuitGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}) diff --git a/internal/rpc/msg/super_group_notification.go b/internal/rpc/msg/super_group_notification.go index 52e2e17a2..9369c7910 100644 --- a/internal/rpc/msg/super_group_notification.go +++ b/internal/rpc/msg/super_group_notification.go @@ -9,7 +9,7 @@ import ( //"github.com/golang/protobuf/proto" ) -func SuperGroupNotification(operationID, sendID, groupID string) { +func SuperGroupNotification(operationID, sendID, recvID string) { //var tips sdk.TipsComm //var err error @@ -21,10 +21,10 @@ func SuperGroupNotification(operationID, sendID, groupID string) { //tips.JsonDetail, _ = marshaler.MarshalToString(m) n := &NotificationMsg{ SendID: sendID, - RecvID: groupID, + RecvID: recvID, MsgFrom: constant.SysMsgType, ContentType: constant.SuperGroupUpdateNotification, - SessionType: constant.SuperGroupChatType, + SessionType: constant.SingleChatType, OperationID: operationID, } //n.Content, err = proto.Marshal(&tips) From c3bdd2f288637afc44bf48087883499e654e0a91 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 16:36:34 +0800 Subject: [PATCH 5/7] debug --- internal/api/auth/auth.go | 2 +- internal/msg_gateway/gate/ws_server.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index 84beaa32b..605cc890b 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -100,7 +100,7 @@ func UserToken(c *gin.Context) { client := rpc.NewAuthClient(etcdConn) reply, err := client.UserToken(context.Background(), req) if err != nil { - errMsg := req.OperationID + " UserToken failed " + err.Error() + req.String() + errMsg := req.OperationID + " UserToken failed " + err.Error() + " req: " + req.String() log.NewError(req.OperationID, errMsg) c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) return diff --git a/internal/msg_gateway/gate/ws_server.go b/internal/msg_gateway/gate/ws_server.go index aaffb68d6..774b8555f 100644 --- a/internal/msg_gateway/gate/ws_server.go +++ b/internal/msg_gateway/gate/ws_server.go @@ -11,6 +11,7 @@ import ( "encoding/gob" go_redis "github.com/go-redis/redis/v8" "net/http" + "reflect" "sync" "time" @@ -307,7 +308,7 @@ func (ws *WServer) headerCheck(w http.ResponseWriter, r *http.Request, operation case constant.ErrTokenDifferentUserID: status = int(constant.ErrTokenDifferentUserID.ErrCode) } - log.Error(operationID, "Token verify failed ", "query ", query, msg, err.Error()) + log.Error(operationID, "Token verify failed ", "query ", query, msg, err.Error(), "type: ", reflect.TypeOf(err)) w.Header().Set("Sec-Websocket-Version", "13") w.Header().Set("ws_err_msg", err.Error()) http.Error(w, err.Error(), status) From 08d95512300090db9e374b488628c1f0203acf9c Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 16:50:18 +0800 Subject: [PATCH 6/7] debug --- go.mod | 1 + go.sum | 2 ++ internal/msg_gateway/gate/ws_server.go | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e34d69ab0..dc695a9bb 100644 --- a/go.mod +++ b/go.mod @@ -45,6 +45,7 @@ require ( google.golang.org/grpc v1.45.0 google.golang.org/protobuf v1.27.1 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect + gopkg.in/errgo.v2 v2.1.0 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df gopkg.in/ini.v1 v1.66.2 // indirect gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 diff --git a/go.sum b/go.sum index ac8ee760f..7b996f80d 100644 --- a/go.sum +++ b/go.sum @@ -562,6 +562,8 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE= gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw= diff --git a/internal/msg_gateway/gate/ws_server.go b/internal/msg_gateway/gate/ws_server.go index 774b8555f..3836dec4d 100644 --- a/internal/msg_gateway/gate/ws_server.go +++ b/internal/msg_gateway/gate/ws_server.go @@ -10,6 +10,7 @@ import ( "bytes" "encoding/gob" go_redis "github.com/go-redis/redis/v8" + "gopkg.in/errgo.v2/errors" "net/http" "reflect" "sync" @@ -308,7 +309,7 @@ func (ws *WServer) headerCheck(w http.ResponseWriter, r *http.Request, operation case constant.ErrTokenDifferentUserID: status = int(constant.ErrTokenDifferentUserID.ErrCode) } - log.Error(operationID, "Token verify failed ", "query ", query, msg, err.Error(), "type: ", reflect.TypeOf(err)) + log.Error(operationID, "Token verify failed ", "query ", query, msg, err.Error(), "type: ", reflect.TypeOf(errors.Cause(err))) w.Header().Set("Sec-Websocket-Version", "13") w.Header().Set("ws_err_msg", err.Error()) http.Error(w, err.Error(), status) From 9b76eb6b55cb0497ff381fc3cee17c0537efae70 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 17:15:24 +0800 Subject: [PATCH 7/7] debug --- internal/msg_gateway/gate/ws_server.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/msg_gateway/gate/ws_server.go b/internal/msg_gateway/gate/ws_server.go index 3836dec4d..453619cf3 100644 --- a/internal/msg_gateway/gate/ws_server.go +++ b/internal/msg_gateway/gate/ws_server.go @@ -12,7 +12,6 @@ import ( go_redis "github.com/go-redis/redis/v8" "gopkg.in/errgo.v2/errors" "net/http" - "reflect" "sync" "time" @@ -291,7 +290,7 @@ func (ws *WServer) headerCheck(w http.ResponseWriter, r *http.Request, operation query := r.URL.Query() if len(query["token"]) != 0 && len(query["sendID"]) != 0 && len(query["platformID"]) != 0 { if ok, err, msg := token_verify.WsVerifyToken(query["token"][0], query["sendID"][0], query["platformID"][0], operationID); !ok { - switch err { + switch errors.Cause(err) { case constant.ErrTokenExpired: status = int(constant.ErrTokenExpired.ErrCode) case constant.ErrTokenInvalid: @@ -309,7 +308,7 @@ func (ws *WServer) headerCheck(w http.ResponseWriter, r *http.Request, operation case constant.ErrTokenDifferentUserID: status = int(constant.ErrTokenDifferentUserID.ErrCode) } - log.Error(operationID, "Token verify failed ", "query ", query, msg, err.Error(), "type: ", reflect.TypeOf(errors.Cause(err))) + log.Error(operationID, "Token verify failed ", "query ", query, msg, err.Error()) w.Header().Set("Sec-Websocket-Version", "13") w.Header().Set("ws_err_msg", err.Error()) http.Error(w, err.Error(), status)