From 68e611794ba18c6845ef7c6c0537a9af732d4b28 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 18:15:22 +0800 Subject: [PATCH 01/20] debug --- internal/msg_gateway/gate/ws_server.go | 42 +++++++++++++++----------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/internal/msg_gateway/gate/ws_server.go b/internal/msg_gateway/gate/ws_server.go index 453619cf3..26d1d052e 100644 --- a/internal/msg_gateway/gate/ws_server.go +++ b/internal/msg_gateway/gate/ws_server.go @@ -10,7 +10,9 @@ import ( "bytes" "encoding/gob" go_redis "github.com/go-redis/redis/v8" - "gopkg.in/errgo.v2/errors" + "github.com/pkg/errors" + + //"gopkg.in/errgo.v2/errors" "net/http" "sync" "time" @@ -290,25 +292,29 @@ 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 errors.Cause(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: + if errors.Is(err, 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()) + //switch errors.Cause(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(), "status: ", status) w.Header().Set("Sec-Websocket-Version", "13") w.Header().Set("ws_err_msg", err.Error()) http.Error(w, err.Error(), status) From 8e9ad57173e2c9eb3862eea85ba71cb5e1d3c79f Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 18:36:34 +0800 Subject: [PATCH 02/20] debug --- pkg/common/token_verify/jwt_token.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 3d93ccb44..c2b7dde77 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -8,6 +8,7 @@ import ( "Open_IM/pkg/utils" go_redis "github.com/go-redis/redis/v8" "github.com/golang-jwt/jwt/v4" + "github.com/pkg/errors" "time" ) @@ -178,6 +179,11 @@ func ParseTokenGetUserID(token string, operationID string) (error, string) { func ParseToken(tokensString, operationID string) (claims *Claims, err error) { claims, err = GetClaimFromToken(tokensString) if err != nil { + if errors.Is(err, constant.ErrTokenUnknown) { + errMsg := "GetClaimFromToken failed ErrTokenUnknown " + err.Error() + log.Error(operationID, errMsg) + } + log.NewError(operationID, "token validate err", err.Error(), tokensString) return nil, utils.Wrap(err, "") } @@ -245,6 +251,11 @@ func WsVerifyToken(token, uid string, platformID string, operationID string) (bo argMsg := "token: " + token + " operationID: " + operationID + " userID: " + uid + " platformID: " + platformID claims, err := ParseToken(token, operationID) if err != nil { + if errors.Is(err, constant.ErrTokenUnknown) { + errMsg := "ParseToken failed ErrTokenUnknown " + err.Error() + log.Error(operationID, errMsg) + } + errMsg := "parse token err " + err.Error() + argMsg return false, utils.Wrap(err, errMsg), errMsg } From 5527f7c78a36e4b123223d8774d776dfaa14938f Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 18:49:01 +0800 Subject: [PATCH 03/20] debug --- pkg/common/token_verify/jwt_token.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index c2b7dde77..4cc5be510 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -255,6 +255,11 @@ func WsVerifyToken(token, uid string, platformID string, operationID string) (bo errMsg := "ParseToken failed ErrTokenUnknown " + err.Error() log.Error(operationID, errMsg) } + e := errors.Unwrap(err) + if errors.Is(e, constant.ErrTokenUnknown) { + errMsg := "ParseToken failed ErrTokenUnknown " + e.Error() + log.Error(operationID, errMsg) + } errMsg := "parse token err " + err.Error() + argMsg return false, utils.Wrap(err, errMsg), errMsg From c993bb2f5e042b9941ec96e91bcd1ded125f565e Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 18:58:57 +0800 Subject: [PATCH 04/20] debug --- pkg/common/token_verify/jwt_token.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 4cc5be510..1deeed2de 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -9,6 +9,7 @@ import ( go_redis "github.com/go-redis/redis/v8" "github.com/golang-jwt/jwt/v4" "github.com/pkg/errors" + "reflect" "time" ) @@ -183,8 +184,13 @@ func ParseToken(tokensString, operationID string) (claims *Claims, err error) { errMsg := "GetClaimFromToken failed ErrTokenUnknown " + err.Error() log.Error(operationID, errMsg) } + e := errors.Unwrap(err) + if errors.Is(e, constant.ErrTokenUnknown) { + errMsg := "ParseToken failed ErrTokenUnknown " + e.Error() + log.Error(operationID, errMsg) + } - log.NewError(operationID, "token validate err", err.Error(), tokensString) + log.NewError(operationID, "token validate err", err.Error(), tokensString, "type ", reflect.TypeOf(err), "type2: ", reflect.TypeOf(e)) return nil, utils.Wrap(err, "") } From 7f4e21d4ba60965955214d4e0030d3f4a5600183 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 19:24:09 +0800 Subject: [PATCH 05/20] debug --- pkg/common/constant/error.go | 28 +--------------------------- pkg/common/token_verify/jwt_token.go | 6 ++++++ 2 files changed, 7 insertions(+), 27 deletions(-) diff --git a/pkg/common/constant/error.go b/pkg/common/constant/error.go index fa5f3c68b..10d8a219c 100644 --- a/pkg/common/constant/error.go +++ b/pkg/common/constant/error.go @@ -12,36 +12,10 @@ var ( OK = ErrInfo{0, ""} ErrServer = ErrInfo{500, "server error"} - // ErrMysql = ErrInfo{100, ""} - // ErrMongo = ErrInfo{110, ""} - // ErrRedis = ErrInfo{120, ""} ErrParseToken = ErrInfo{700, ParseTokenMsg.Error()} - // ErrCreateToken = ErrInfo{201, "Create token failed"} - // ErrAppServerKey = ErrInfo{300, "key error"} + ErrTencentCredential = ErrInfo{400, ThirdPartyMsg.Error()} - // ErrorUserRegister = ErrInfo{600, "User registration failed"} - // ErrAccountExists = ErrInfo{601, "The account is already registered and cannot be registered again"} - // ErrUserPassword = ErrInfo{602, "User password error"} - // ErrRefreshToken = ErrInfo{605, "Failed to refresh token"} - // ErrAddFriend = ErrInfo{606, "Failed to add friends"} - // ErrAgreeToAddFriend = ErrInfo{607, "Failed to agree application"} - // ErrAddFriendToBlack = ErrInfo{608, "Failed to add friends to the blacklist"} - // ErrGetBlackList = ErrInfo{609, "Failed to get blacklist"} - // ErrDeleteFriend = ErrInfo{610, "Failed to delete friend"} - // ErrGetFriendApplyList = ErrInfo{611, "Failed to get friend application list"} - // ErrGetFriendList = ErrInfo{612, "Failed to get friend list"} - // ErrRemoveBlackList = ErrInfo{613, "Failed to remove blacklist"} - // ErrSearchUserInfo = ErrInfo{614, "Can't find the user information"} - // ErrDelAppleDeviceToken = ErrInfo{615, ""} - // ErrModifyUserInfo = ErrInfo{616, "update user some attribute failed"} - // ErrSetFriendComment = ErrInfo{617, "set friend comment failed"} - // ErrSearchUserInfoFromTheGroup = ErrInfo{618, "There is no such group or the user not in the group"} - // ErrCreateGroup = ErrInfo{619, "create group chat failed"} - // ErrJoinGroupApplication = ErrInfo{620, "Failed to apply to join the group"} - // 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()} diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 1deeed2de..e5808e5bc 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -184,6 +184,12 @@ func ParseToken(tokensString, operationID string) (claims *Claims, err error) { errMsg := "GetClaimFromToken failed ErrTokenUnknown " + err.Error() log.Error(operationID, errMsg) } + info := err.(constant.ErrInfo) + if info == constant.ErrTokenUnknown { + errMsg := "info == constant.ErrTokenUnknown " + err.Error() + log.Error(operationID, errMsg) + } + e := errors.Unwrap(err) if errors.Is(e, constant.ErrTokenUnknown) { errMsg := "ParseToken failed ErrTokenUnknown " + e.Error() From 06c523ea81c84adb902179b9c35d818ffaec6b16 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 19:38:13 +0800 Subject: [PATCH 06/20] debug --- pkg/common/token_verify/jwt_token.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index e5808e5bc..46a7c0334 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -184,11 +184,11 @@ func ParseToken(tokensString, operationID string) (claims *Claims, err error) { errMsg := "GetClaimFromToken failed ErrTokenUnknown " + err.Error() log.Error(operationID, errMsg) } - info := err.(constant.ErrInfo) - if info == constant.ErrTokenUnknown { - errMsg := "info == constant.ErrTokenUnknown " + err.Error() - log.Error(operationID, errMsg) - } + //info := err.(constant.ErrInfo) + //if info == constant.ErrTokenUnknown { + // errMsg := "info == constant.ErrTokenUnknown " + err.Error() + // log.Error(operationID, errMsg) + //} e := errors.Unwrap(err) if errors.Is(e, constant.ErrTokenUnknown) { From 1bfae7627ed20373c4ab6c3c8c2a3f7a6db506df Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 19:39:46 +0800 Subject: [PATCH 07/20] debug --- pkg/common/token_verify/jwt_token.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 46a7c0334..4f357ae98 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -181,7 +181,7 @@ func ParseToken(tokensString, operationID string) (claims *Claims, err error) { claims, err = GetClaimFromToken(tokensString) if err != nil { if errors.Is(err, constant.ErrTokenUnknown) { - errMsg := "GetClaimFromToken failed ErrTokenUnknown " + err.Error() + errMsg := "GetClaimFromToken failed ErrTokenUnknown " + err.Error() log.Error(operationID, errMsg) } //info := err.(constant.ErrInfo) From c2686beb9b49a92dccd9b5153210c1b9492ba0f2 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 19:44:02 +0800 Subject: [PATCH 08/20] debug --- pkg/common/token_verify/jwt_token.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 4f357ae98..d98824b14 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -101,23 +101,23 @@ func GetClaimFromToken(tokensString string) (*Claims, error) { if err != nil { if ve, ok := err.(*jwt.ValidationError); ok { if ve.Errors&jwt.ValidationErrorMalformed != 0 { - return nil, &constant.ErrTokenMalformed + return nil, constant.ErrTokenMalformed } else if ve.Errors&jwt.ValidationErrorExpired != 0 { - return nil, &constant.ErrTokenExpired + return nil, constant.ErrTokenExpired } else if ve.Errors&jwt.ValidationErrorNotValidYet != 0 { - return nil, &constant.ErrTokenNotValidYet + return nil, constant.ErrTokenNotValidYet } else { - return nil, &constant.ErrTokenUnknown + return nil, constant.ErrTokenUnknown } } else { - return nil, &constant.ErrTokenNotValidYet + return nil, constant.ErrTokenNotValidYet } } else { if claims, ok := token.Claims.(*Claims); ok && token.Valid { //log.NewDebug("", claims.UID, claims.Platform) return claims, nil } - return nil, &constant.ErrTokenNotValidYet + return nil, constant.ErrTokenNotValidYet } } @@ -184,11 +184,11 @@ func ParseToken(tokensString, operationID string) (claims *Claims, err error) { errMsg := "GetClaimFromToken failed ErrTokenUnknown " + err.Error() log.Error(operationID, errMsg) } - //info := err.(constant.ErrInfo) - //if info == constant.ErrTokenUnknown { - // errMsg := "info == constant.ErrTokenUnknown " + err.Error() - // log.Error(operationID, errMsg) - //} + info := err.(constant.ErrInfo) + if info == constant.ErrTokenUnknown { + errMsg := "info == constant.ErrTokenUnknown " + err.Error() + log.Error(operationID, errMsg) + } e := errors.Unwrap(err) if errors.Is(e, constant.ErrTokenUnknown) { From 0fe838d58898802901ce194d8e305725dd0db009 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 21 Jun 2022 19:46:58 +0800 Subject: [PATCH 09/20] compose limit memory --- docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 0e180c442..4cc16b977 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -20,6 +20,7 @@ services: ports: - 37017:27017 container_name: mongo + command: --wiredTigerCacheSizeGB 5 volumes: - ./components/mongodb/data/db:/data/db - ./components/mongodb/data/logs:/data/logs From d99d7ac63cfd9d7828b55066881e1cd0303c180a Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 19:48:26 +0800 Subject: [PATCH 10/20] debug --- pkg/common/token_verify/jwt_token.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index d98824b14..40aba4a88 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -185,10 +185,7 @@ func ParseToken(tokensString, operationID string) (claims *Claims, err error) { log.Error(operationID, errMsg) } info := err.(constant.ErrInfo) - if info == constant.ErrTokenUnknown { - errMsg := "info == constant.ErrTokenUnknown " + err.Error() - log.Error(operationID, errMsg) - } + log.Error(operationID, "detail info , ", info.ErrCode, info.ErrMsg) e := errors.Unwrap(err) if errors.Is(e, constant.ErrTokenUnknown) { From 1a3b5d018a99faa71fb17d28204aa8c4d277e884 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 19:57:48 +0800 Subject: [PATCH 11/20] Handling token exceptions --- internal/msg_gateway/gate/ws_server.go | 21 +++++++++++++ pkg/common/token_verify/jwt_token.go | 42 +++++++++++++------------- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/internal/msg_gateway/gate/ws_server.go b/internal/msg_gateway/gate/ws_server.go index 26d1d052e..6f51ca993 100644 --- a/internal/msg_gateway/gate/ws_server.go +++ b/internal/msg_gateway/gate/ws_server.go @@ -292,9 +292,30 @@ 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 { + if errors.Is(err, constant.ErrTokenExpired) { + status = int(constant.ErrTokenExpired.ErrCode) + } + if errors.Is(err, constant.ErrTokenInvalid) { + status = int(constant.ErrTokenInvalid.ErrCode) + } + if errors.Is(err, constant.ErrTokenMalformed) { + status = int(constant.ErrTokenMalformed.ErrCode) + } + if errors.Is(err, constant.ErrTokenNotValidYet) { + status = int(constant.ErrTokenNotValidYet.ErrCode) + } if errors.Is(err, constant.ErrTokenUnknown) { status = int(constant.ErrTokenUnknown.ErrCode) } + if errors.Is(err, constant.ErrTokenKicked) { + status = int(constant.ErrTokenKicked.ErrCode) + } + if errors.Is(err, constant.ErrTokenDifferentPlatformID) { + status = int(constant.ErrTokenDifferentPlatformID.ErrCode) + } + if errors.Is(err, constant.ErrTokenDifferentUserID) { + status = int(constant.ErrTokenDifferentUserID.ErrCode) + } //switch errors.Cause(err) { //case constant.ErrTokenExpired: // status = int(constant.ErrTokenExpired.ErrCode) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 40aba4a88..474657b50 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -180,18 +180,18 @@ func ParseTokenGetUserID(token string, operationID string) (error, string) { func ParseToken(tokensString, operationID string) (claims *Claims, err error) { claims, err = GetClaimFromToken(tokensString) if err != nil { - if errors.Is(err, constant.ErrTokenUnknown) { - errMsg := "GetClaimFromToken failed ErrTokenUnknown " + err.Error() - log.Error(operationID, errMsg) - } - info := err.(constant.ErrInfo) - log.Error(operationID, "detail info , ", info.ErrCode, info.ErrMsg) - - e := errors.Unwrap(err) - if errors.Is(e, constant.ErrTokenUnknown) { - errMsg := "ParseToken failed ErrTokenUnknown " + e.Error() - log.Error(operationID, errMsg) - } + //if errors.Is(err, constant.ErrTokenUnknown) { + // errMsg := "GetClaimFromToken failed ErrTokenUnknown " + err.Error() + // log.Error(operationID, errMsg) + //} + //info := err.(constant.ErrInfo) + //log.Error(operationID, "detail info , ", info.ErrCode, info.ErrMsg) + // + //e := errors.Unwrap(err) + //if errors.Is(e, constant.ErrTokenUnknown) { + // errMsg := "ParseToken failed ErrTokenUnknown " + e.Error() + // log.Error(operationID, errMsg) + //} log.NewError(operationID, "token validate err", err.Error(), tokensString, "type ", reflect.TypeOf(err), "type2: ", reflect.TypeOf(e)) return nil, utils.Wrap(err, "") @@ -260,15 +260,15 @@ func WsVerifyToken(token, uid string, platformID string, operationID string) (bo argMsg := "token: " + token + " operationID: " + operationID + " userID: " + uid + " platformID: " + platformID claims, err := ParseToken(token, operationID) if err != nil { - if errors.Is(err, constant.ErrTokenUnknown) { - errMsg := "ParseToken failed ErrTokenUnknown " + err.Error() - log.Error(operationID, errMsg) - } - e := errors.Unwrap(err) - if errors.Is(e, constant.ErrTokenUnknown) { - errMsg := "ParseToken failed ErrTokenUnknown " + e.Error() - log.Error(operationID, errMsg) - } + //if errors.Is(err, constant.ErrTokenUnknown) { + // errMsg := "ParseToken failed ErrTokenUnknown " + err.Error() + // log.Error(operationID, errMsg) + //} + //e := errors.Unwrap(err) + //if errors.Is(e, constant.ErrTokenUnknown) { + // errMsg := "ParseToken failed ErrTokenUnknown " + e.Error() + // log.Error(operationID, errMsg) + //} errMsg := "parse token err " + err.Error() + argMsg return false, utils.Wrap(err, errMsg), errMsg From ac7c0015db36f9253927fb5126b2e315c3de671a Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 20:00:03 +0800 Subject: [PATCH 12/20] Handling token exceptions --- pkg/common/token_verify/jwt_token.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 474657b50..4490316b1 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -8,7 +8,6 @@ import ( "Open_IM/pkg/utils" go_redis "github.com/go-redis/redis/v8" "github.com/golang-jwt/jwt/v4" - "github.com/pkg/errors" "reflect" "time" ) From f34fedd82212115d5fef2b71b5ab57f4de85c89d Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 20:13:19 +0800 Subject: [PATCH 13/20] Handling token exceptions --- pkg/common/token_verify/jwt_token.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 4490316b1..5869dc48b 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -274,11 +274,11 @@ func WsVerifyToken(token, uid string, platformID string, operationID string) (bo } if claims.UID != uid { errMsg := " uid is not same to token uid " + " claims.UID " + claims.UID + argMsg - return false, utils.Wrap(&constant.ErrTokenDifferentUserID, 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.ErrTokenDifferentPlatformID, 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 af152aa9b9e25362584eaaa00df6ae283a55bf86 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 20:16:01 +0800 Subject: [PATCH 14/20] Handling token exceptions --- pkg/common/token_verify/jwt_token.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 5869dc48b..a2c0e4549 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -8,7 +8,6 @@ import ( "Open_IM/pkg/utils" go_redis "github.com/go-redis/redis/v8" "github.com/golang-jwt/jwt/v4" - "reflect" "time" ) @@ -192,7 +191,6 @@ func ParseToken(tokensString, operationID string) (claims *Claims, err error) { // log.Error(operationID, errMsg) //} - log.NewError(operationID, "token validate err", err.Error(), tokensString, "type ", reflect.TypeOf(err), "type2: ", reflect.TypeOf(e)) return nil, utils.Wrap(err, "") } From 910876f32335f80fa298d495c8517a5a5a27fe0a Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 20:25:13 +0800 Subject: [PATCH 15/20] Handling token exceptions --- pkg/common/token_verify/jwt_token.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index a2c0e4549..8785969c4 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -197,11 +197,11 @@ func ParseToken(tokensString, operationID string) (claims *Claims, err error) { m, err := commonDB.DB.GetTokenMapByUidPid(claims.UID, claims.Platform) if err != nil { log.NewError(operationID, "get token from redis err", err.Error(), tokensString) - return nil, utils.Wrap(&constant.ErrTokenInvalid, "get token from redis err") + return nil, utils.Wrap(constant.ErrTokenInvalid, "get token from redis err") } if m == nil { 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") + return nil, utils.Wrap(constant.ErrTokenInvalid, "get token from redis err") } if v, ok := m[tokensString]; ok { switch v { @@ -210,13 +210,13 @@ func ParseToken(tokensString, operationID string) (claims *Claims, err error) { return claims, nil 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 ") + return nil, utils.Wrap(constant.ErrTokenKicked, "this token has been kicked by other same terminal ") default: - return nil, utils.Wrap(&constant.ErrTokenUnknown, "") + return nil, utils.Wrap(constant.ErrTokenUnknown, "") } } log.NewError(operationID, "redis token map not find", constant.ErrTokenUnknown) - return nil, utils.Wrap(&constant.ErrTokenUnknown, "redis token map not find") + return nil, utils.Wrap(constant.ErrTokenUnknown, "redis token map not find") } //func MakeTheTokenInvalid(currentClaims *Claims, platformClass string) (bool, error) { @@ -254,7 +254,7 @@ func VerifyToken(token, uid string) (bool, error) { } func WsVerifyToken(token, uid string, platformID string, operationID string) (bool, error, string) { - argMsg := "token: " + token + " operationID: " + operationID + " userID: " + uid + " platformID: " + platformID + argMsg := "token: " + token + " operationID: " + operationID + " userID: " + uid + " platformID: " + constant.PlatformIDToName(utils.StringToInt(platformID) claims, err := ParseToken(token, operationID) if err != nil { //if errors.Is(err, constant.ErrTokenUnknown) { @@ -275,7 +275,7 @@ func WsVerifyToken(token, uid string, platformID string, operationID string) (bo 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 + errMsg := " platform is not same to token platform " + argMsg + " claims platformID " + claims.Platform return false, utils.Wrap(constant.ErrTokenDifferentPlatformID, errMsg), errMsg } log.NewDebug(operationID, utils.GetSelfFuncName(), " check ok ", claims.UID, uid, claims.Platform) From 9337d150b9cf721bbc9e1358e1aaf6c7ac85b4c7 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 20:25:34 +0800 Subject: [PATCH 16/20] Handling token exceptions --- pkg/common/token_verify/jwt_token.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 8785969c4..0d23cee31 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -254,7 +254,7 @@ func VerifyToken(token, uid string) (bool, error) { } func WsVerifyToken(token, uid string, platformID string, operationID string) (bool, error, string) { - argMsg := "token: " + token + " operationID: " + operationID + " userID: " + uid + " platformID: " + constant.PlatformIDToName(utils.StringToInt(platformID) + argMsg := "token: " + token + " operationID: " + operationID + " userID: " + uid + " platformID: " + constant.PlatformIDToName(utils.StringToInt(platformID)) claims, err := ParseToken(token, operationID) if err != nil { //if errors.Is(err, constant.ErrTokenUnknown) { From a62388759a2956cded17fdba65019cf4002f4920 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 21 Jun 2022 20:29:20 +0800 Subject: [PATCH 17/20] Handling token exceptions --- pkg/common/token_verify/jwt_token.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 0d23cee31..476c26a70 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -254,7 +254,7 @@ func VerifyToken(token, uid string) (bool, error) { } func WsVerifyToken(token, uid string, platformID string, operationID string) (bool, error, string) { - argMsg := "token: " + token + " operationID: " + operationID + " userID: " + uid + " platformID: " + constant.PlatformIDToName(utils.StringToInt(platformID)) + argMsg := "args: token: " + token + " operationID: " + operationID + " userID: " + uid + " platformID: " + constant.PlatformIDToName(utils.StringToInt(platformID)) claims, err := ParseToken(token, operationID) if err != nil { //if errors.Is(err, constant.ErrTokenUnknown) { @@ -271,11 +271,11 @@ func WsVerifyToken(token, uid string, platformID string, operationID string) (bo return false, utils.Wrap(err, errMsg), errMsg } if claims.UID != uid { - errMsg := " uid is not same to token uid " + " claims.UID " + claims.UID + argMsg + errMsg := " uid is not same to token uid " + argMsg + " claims.UID: " + claims.UID 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 + errMsg := " platform is not same to token platform " + argMsg + " claims platformID: " + claims.Platform return false, utils.Wrap(constant.ErrTokenDifferentPlatformID, errMsg), errMsg } log.NewDebug(operationID, utils.GetSelfFuncName(), " check ok ", claims.UID, uid, claims.Platform) From af7dde61d6bf1b0d8b9260143d6ae2aeba1170c9 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 21 Jun 2022 21:13:27 +0800 Subject: [PATCH 18/20] model update --- pkg/common/db/newRedisModel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/newRedisModel.go b/pkg/common/db/newRedisModel.go index da5ec2127..e8db10c12 100644 --- a/pkg/common/db/newRedisModel.go +++ b/pkg/common/db/newRedisModel.go @@ -95,7 +95,7 @@ func (d *DataBases) GetTokenMapByUidPid(userID, platformID string) (map[string]i } func (d *DataBases) SetTokenMapByUidPid(userID string, platformID int, m map[string]int) error { key := uidPidToken + userID + ":" + constant.PlatformIDToName(platformID) - return d.rdb.HMSet(context.Background(), key, m).Err() + return d.rdb.HSet(context.Background(), key, m).Err() } func (d *DataBases) DeleteTokenByUidPid(userID string, platformID int, fields []string) error { key := uidPidToken + userID + ":" + constant.PlatformIDToName(platformID) From 34fe9596a99459d4647a77ef09a8a61c8fad06b4 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 21 Jun 2022 21:22:35 +0800 Subject: [PATCH 19/20] test --- pkg/common/db/redisModel_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/common/db/redisModel_test.go b/pkg/common/db/redisModel_test.go index f90cd99cd..cd82aca03 100644 --- a/pkg/common/db/redisModel_test.go +++ b/pkg/common/db/redisModel_test.go @@ -16,7 +16,8 @@ func Test_SetTokenMapByUidPid(t *testing.T) { m["test1"] = 1 m["test2"] = 2 m["2332"] = 4 - _ = DB.SetTokenMapByUidPid("1234", 2, m) + err := DB.SetTokenMapByUidPid("1234", 2, m) + assert.Nil(t, err) } func Test_GetTokenMapByUidPid(t *testing.T) { From 2f2f72fe4b431dba269bcc8da226e5e5192e02d6 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 21 Jun 2022 21:27:00 +0800 Subject: [PATCH 20/20] test --- pkg/common/db/newRedisModel.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/common/db/newRedisModel.go b/pkg/common/db/newRedisModel.go index e8db10c12..f90ab6f2d 100644 --- a/pkg/common/db/newRedisModel.go +++ b/pkg/common/db/newRedisModel.go @@ -95,7 +95,11 @@ func (d *DataBases) GetTokenMapByUidPid(userID, platformID string) (map[string]i } func (d *DataBases) SetTokenMapByUidPid(userID string, platformID int, m map[string]int) error { key := uidPidToken + userID + ":" + constant.PlatformIDToName(platformID) - return d.rdb.HSet(context.Background(), key, m).Err() + mm := make(map[string]interface{}) + for k, v := range m { + mm[k] = v + } + return d.rdb.HSet(context.Background(), key, mm).Err() } func (d *DataBases) DeleteTokenByUidPid(userID string, platformID int, fields []string) error { key := uidPidToken + userID + ":" + constant.PlatformIDToName(platformID)