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 1/8] 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 2/8] 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 3/8] 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 4/8] 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 5/8] 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 6/8] 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 7/8] 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 8/8] 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)