diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 1061c5fb2..95b9b0f39 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -115,7 +115,18 @@ func (s *groupServer) Run() { log.NewInfo("", "group rpc success") } +func OperationID(ctx context.Context) string { + s, _ := ctx.Value("operationID").(string) + return s +} + +func OpUserID(ctx context.Context) string { + s, _ := ctx.Value("opUserID").(string) + return s +} + func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupReq) (*pbGroup.CreateGroupResp, error) { + resp := &pbGroup.CreateGroupResp{GroupInfo: &open_im_sdk.GroupInfo{}} if err := token_verify.CheckAccessV2(ctx, req.OpUserID, req.OwnerUserID); err != nil { return nil, err @@ -133,17 +144,17 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR userIDs = append(userIDs, req.OwnerUserID) } if groupOwnerNum != 1 { - return nil, utils.Wrap(&constant.ErrArgs, "") + return nil, utils.Wrap(constant.ErrArgs, "") } if utils.IsRepeatStringSlice(userIDs) { - return nil, utils.Wrap(&constant.ErrArgs, "") + return nil, utils.Wrap(constant.ErrArgs, "") } users, err := rocksCache.GetUserInfoFromCacheBatch(ctx, userIDs) if err != nil { return nil, err } if len(users) != len(userIDs) { - return nil, utils.Wrap(&constant.ErrArgs, "") + return nil, utils.Wrap(constant.ErrArgs, "") } userMap := make(map[string]*imdb.User) for i, user := range users { @@ -272,15 +283,15 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite resp := &pbGroup.InviteUserToGroupResp{} if !imdb.IsExistGroupMember(req.GroupID, req.OpUserID) && !token_verify.IsManagerUserID(req.OpUserID) { - constant.SetErrorForResp(&constant.ErrIdentity, resp.CommonResp) - return nil, utils.Wrap(&constant.ErrIdentity, "") + constant.SetErrorForResp(constant.ErrIdentity, resp.CommonResp) + return nil, utils.Wrap(constant.ErrIdentity, "") } groupInfo, err := (*imdb.Group)(nil).Take(ctx, req.GroupID) if err != nil { return nil, err } if groupInfo.Status == constant.GroupStatusDismissed { - return nil, utils.Wrap(&constant.ErrDismissedAlready, "") + return nil, utils.Wrap(constant.ErrDismissedAlready, "") } if groupInfo.NeedVerification == constant.AllNeedVerification && !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) && !token_verify.IsManagerUserID(req.OpUserID) { @@ -463,7 +474,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou return nil, err } if opInfo.RoleLevel == constant.GroupOrdinaryUsers { - return nil, utils.Wrap(&constant.ErrNoPermission, "") + return nil, utils.Wrap(constant.ErrNoPermission, "") } else if opInfo.RoleLevel == constant.GroupOwner { opFlag = 2 //owner } else { @@ -477,7 +488,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou if len(req.KickedUserIDList) == 0 { //log.NewError(req.OperationID, "failed, kick list 0") //return &pbGroup.KickGroupMemberResp{ErrCode: constant.ErrArgs.ErrCode, ErrMsg: constant.ErrArgs.ErrMsg}, nil - return nil, utils.Wrap(&constant.ErrArgs, "") + return nil, utils.Wrap(constant.ErrArgs, "") } if err := s.DelGroupAndUserCache(ctx, req.GroupID, req.KickedUserIDList); err != nil { return nil, err @@ -584,7 +595,7 @@ func FillGroupInfoByGroupID(operationID, groupID string, groupInfo *open_im_sdk. } if group.Status == constant.GroupStatusDismissed { log.Debug(operationID, " group constant.GroupStatusDismissed ", group.GroupID) - return utils.Wrap(&constant.ErrDismissedAlready, "") + return utils.Wrap(constant.ErrDismissedAlready, "") } return utils.Wrap(cp.GroupDBCopyOpenIM(groupInfo, group), "") } @@ -611,7 +622,7 @@ func (s *groupServer) GetGroupApplicationList(ctx context.Context, req *pbGroup. node := open_im_sdk.GroupRequest{UserInfo: &open_im_sdk.PublicUserInfo{}, GroupInfo: &open_im_sdk.GroupInfo{}} err := FillGroupInfoByGroupID(req.OperationID, v.GroupID, node.GroupInfo) if err != nil { - if !errors.Is(errors.Unwrap(err), &constant.ErrDismissedAlready) { + if !errors.Is(errors.Unwrap(err), constant.ErrDismissedAlready) { errResult = err } continue @@ -655,7 +666,7 @@ func CheckPermission(ctx context.Context, groupID string, userID string) (err er trace_log.SetCtxInfo(ctx, utils.GetSelfFuncName(), err, "groupID", groupID, "userID", userID) }() if !token_verify.IsManagerUserID(userID) && !imdb.IsGroupOwnerAdmin(groupID, userID) { - return utils.Wrap(&constant.ErrNoPermission, utils.GetSelfFuncName()) + return utils.Wrap(constant.ErrNoPermission, utils.GetSelfFuncName()) } return nil } @@ -729,7 +740,7 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup } else if req.HandleResult == constant.GroupResponseRefuse { chat.GroupApplicationRejectedNotification(req) } else { - return nil, utils.Wrap(&constant.ErrArgs, "") + return nil, utils.Wrap(constant.ErrArgs, "") } return resp, nil } @@ -745,8 +756,8 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) return nil, err } if groupInfo.Status == constant.GroupStatusDismissed { - constant.SetErrorForResp(&constant.ErrDismissedAlready, resp.CommonResp) - return nil, utils.Wrap(&constant.ErrDismissedAlready, "") + constant.SetErrorForResp(constant.ErrDismissedAlready, resp.CommonResp) + return nil, utils.Wrap(constant.ErrDismissedAlready, "") } if groupInfo.NeedVerification == constant.Directly { @@ -795,7 +806,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) chat.MemberEnterDirectlyNotification(req.GroupID, req.OpUserID, req.OperationID) return resp, nil } else { - constant.SetErrorForResp(&constant.ErrGroupTypeNotSupport, resp.CommonResp) + constant.SetErrorForResp(constant.ErrGroupTypeNotSupport, resp.CommonResp) return resp, nil } } @@ -868,14 +879,14 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf resp := &pbGroup.SetGroupInfoResp{} if !hasAccess(req) { - return nil, utils.Wrap(&constant.ErrIdentity, "") + return nil, utils.Wrap(constant.ErrIdentity, "") } group, err := imdb.GetGroupInfoByGroupID(req.GroupInfoForSet.GroupID) if err != nil { return nil, err } if group.Status == constant.GroupStatusDismissed { - return nil, utils.Wrap(&constant.ErrDismissedAlready, "") + return nil, utils.Wrap(constant.ErrDismissedAlready, "") } var changedType int32 @@ -987,7 +998,7 @@ func (s *groupServer) TransferGroupOwner(ctx context.Context, req *pbGroup.Trans return nil, err } if groupInfo.Status == constant.GroupStatusDismissed { - return nil, utils.Wrap(&constant.ErrDismissedAlready, "") + return nil, utils.Wrap(constant.ErrDismissedAlready, "") } if req.OldOwnerUserID == req.NewOwnerUserID { @@ -1123,7 +1134,7 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou resp := &pbGroup.DismissGroupResp{} if !token_verify.IsManagerUserID(req.OpUserID) && !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) { - return nil, utils.Wrap(&constant.ErrIdentity, "") + return nil, utils.Wrap(constant.ErrIdentity, "") } if err := rocksCache.DelGroupInfoFromCache(ctx, req.GroupID); err != nil { @@ -1257,7 +1268,7 @@ func (s *groupServer) MuteGroup(ctx context.Context, req *pbGroup.MuteGroupReq) //errMsg := req.OperationID + "opFlag == 0 " + req.GroupID + req.OpUserID //log.Error(req.OperationID, errMsg) //return &pbGroup.MuteGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}}, nil - return nil, utils.Wrap(&constant.ErrNoPermission, "") + return nil, utils.Wrap(constant.ErrNoPermission, "") } //mutedInfo, err := imdb.GetGroupMemberInfoByGroupIDAndUserID(req.GroupID, req.UserID) @@ -1325,7 +1336,7 @@ func (s *groupServer) SetGroupMemberNickname(ctx context.Context, req *pbGroup.S resp := &pbGroup.SetGroupMemberNicknameResp{} if req.OpUserID != req.UserID && !token_verify.IsManagerUserID(req.OpUserID) { - return nil, utils.Wrap(&constant.ErrIdentity, "") + return nil, utils.Wrap(constant.ErrIdentity, "") } cbReq := &pbGroup.SetGroupMemberInfoReq{ GroupID: req.GroupID, diff --git a/pkg/common/log/logrus.go b/pkg/common/log/logrus.go index 0c8156edb..b6d016142 100644 --- a/pkg/common/log/logrus.go +++ b/pkg/common/log/logrus.go @@ -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, diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index ef7e18a65..47b48a0a9 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -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, ""