IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-08 11:05:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/errcode' into errcode

Browse Source 
# Conflicts:
#	pkg/common/constant/errors.go
This commit is contained in:
skiffer-git
2023-01-12 16:48:59 +08:00
parent 3720134fbd 4e96e77d26
commit 425ba5946f
3 changed files with 57 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/common/log/logrus.go
+10 -1
View File
@@ -22,7 +22,8 @@ var ctxLogger *Logger
type Logger struct {
*logrus.Logger
Pid int
Pid int
Type string
}
func init() {
@@ -58,6 +59,7 @@ func ctxLoggerInit(moduleName string) *Logger {
return &Logger{
ctxLogger,
os.Getpid(),
"ctxLogger",
}
}
@@ -95,6 +97,7 @@ func loggerInit(moduleName string) *Logger {
return &Logger{
logger,
os.Getpid(),
"",
}
}
func NewLfsHook(rotationTime time.Duration, maxRemainNum uint, moduleName string) logrus.Hook {
@@ -239,11 +242,13 @@ func ShowLog(ctx context.Context) {
OperationID := trace_log.GetOperationID(ctx)
if ctx.Value(trace_log.TraceLogKey).(*trace_log.ApiInfo).GinCtx != nil {
ctxLogger.WithFields(logrus.Fields{
"Type": ctxLogger.Type,
"OperationID": OperationID,
"PID": ctxLogger.Pid,
}).Infoln("api: ", t.ApiName)
} else {
ctxLogger.WithFields(logrus.Fields{
"Type": ctxLogger.Type,
"OperationID": OperationID,
"PID": ctxLogger.Pid,
}).Infoln("rpc: ", t.ApiName)
@@ -251,6 +256,7 @@ func ShowLog(ctx context.Context) {
for _, v := range *t.Funcs {
if v.Err != nil {
ctxLogger.WithFields(logrus.Fields{
"Type": ctxLogger.Type,
"OperationID": OperationID,
"PID": ctxLogger.Pid,
"FilePath": v.File,
@@ -259,18 +265,21 @@ func ShowLog(ctx context.Context) {
switch v.LogLevel {
case logrus.InfoLevel:
ctxLogger.WithFields(logrus.Fields{
"Type": ctxLogger.Type,
"OperationID": OperationID,
"PID": ctxLogger.Pid,
"FilePath": v.File,
}).Infoln("func: ", v.FuncName, " args: ", v.Args)
case logrus.DebugLevel:
ctxLogger.WithFields(logrus.Fields{
"Type": ctxLogger.Type,
"OperationID": OperationID,
"PID": ctxLogger.Pid,
"FilePath": v.File,
}).Debugln("func: ", v.FuncName, " args: ", v.Args)
case logrus.WarnLevel:
ctxLogger.WithFields(logrus.Fields{
"Type": ctxLogger.Type,
"OperationID": OperationID,
"PID": ctxLogger.Pid,
"FilePath": v.File,
pkg/common/token_verify/jwt_token.go
+15 -15
View File
@@ -104,22 +104,22 @@ func GetClaimFromToken(tokensString string) (*Claims, error) {
if err != nil {
if ve, ok := err.(*jwt.ValidationError); ok {
if ve.Errors&jwt.ValidationErrorMalformed != 0 {
return nil, utils.Wrap(&constant.ErrTokenMalformed, "")
return nil, utils.Wrap(constant.ErrTokenMalformed, "")
} else if ve.Errors&jwt.ValidationErrorExpired != 0 {
return nil, utils.Wrap(&constant.ErrTokenExpired, "")
return nil, utils.Wrap(constant.ErrTokenExpired, "")
} else if ve.Errors&jwt.ValidationErrorNotValidYet != 0 {
return nil, utils.Wrap(&constant.ErrTokenNotValidYet, "")
return nil, utils.Wrap(constant.ErrTokenNotValidYet, "")
} else {
return nil, utils.Wrap(&constant.ErrTokenUnknown, "")
return nil, utils.Wrap(constant.ErrTokenUnknown, "")
}
} else {
return nil, utils.Wrap(&constant.ErrTokenUnknown, "")
return nil, utils.Wrap(constant.ErrTokenUnknown, "")
}
} else {
if claims, ok := token.Claims.(*Claims); ok && token.Valid {
return claims, nil
}
return nil, utils.Wrap(&constant.ErrTokenUnknown, "")
return nil, utils.Wrap(constant.ErrTokenUnknown, "")
}
}
@@ -162,7 +162,7 @@ func CheckAccessV2(ctx context.Context, OpUserID string, OwnerUserID string) (er
if OpUserID == OwnerUserID {
return nil
}
return utils.Wrap(&constant.ErrIdentity, open_utils.GetSelfFuncName())
return utils.Wrap(constant.ErrIdentity, open_utils.GetSelfFuncName())
}
func GetUserIDFromToken(token string, operationID string) (bool, string, string) {
@@ -211,11 +211,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(), claims.UID, claims.Platform)
return nil, utils.Wrap(&constant.ErrTokenNotExist, "get token from redis err")
return nil, utils.Wrap(constant.ErrTokenNotExist, "get token from redis err")
}
if m == nil {
log.NewError(operationID, "get token from redis err, not in redis ", "m is nil ", claims.UID, claims.Platform)
return nil, utils.Wrap(&constant.ErrTokenNotExist, "get token from redis err")
return nil, utils.Wrap(constant.ErrTokenNotExist, "get token from redis err")
}
if v, ok := m[tokensString]; ok {
switch v {
@@ -224,13 +224,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.ErrTokenNotExist, tokensString)
return nil, utils.Wrap(&constant.ErrTokenNotExist, "redis token map not find")
return nil, utils.Wrap(constant.ErrTokenNotExist, "redis token map not find")
}
//func MakeTheTokenInvalid(currentClaims *Claims, platformClass string) (bool, error) {
@@ -260,7 +260,7 @@ func VerifyToken(token, uid string) (bool, error) {
return false, utils.Wrap(err, "ParseToken failed")
}
if claims.UID != uid {
return false, &constant.ErrTokenUnknown
return false, constant.ErrTokenUnknown
}
log.NewDebug("", claims.UID, claims.Platform)
@@ -286,11 +286,11 @@ func WsVerifyToken(token, uid string, platformID string, operationID string) (bo
}
if claims.UID != uid {
errMsg := " uid is not same to token uid " + argMsg + " claims.UID: " + claims.UID
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, ""