A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
update captcha
aichya8c13e5bb492
diff --git a/internal/base/middleware/auth.go b/internal/base/middleware/auth.goindex c53a1151..5532a479 100644--- a/internal/base/middleware/auth.go+++ b/internal/base/middleware/auth.go@@ -202,6 +202,21 @@ func GetUserInfoFromContext(ctx *gin.Context) (u *entity.UserCacheInfo) {return u}+func GetUserIsAdminModerator(ctx *gin.Context) (isAdminModerator bool) {+ userInfo, exist := ctx.Get(ctxUUIDKey)+ if !exist {+ return false+ }+ u, ok := userInfo.(*entity.UserCacheInfo)+ if !ok {+ return false+ }+ if u.RoleID == role.RoleAdminID || u.RoleID == role.RoleModeratorID {+ return true+ }+ return false+}+func GetLoginUserIDInt64FromContext(ctx *gin.Context) (userID int64) {userIDStr := GetLoginUserIDFromContext(ctx)return converter.StringToInt64(userIDStr)diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.goindex 6ec63afd..9dbc1483 100644--- a/internal/controller/answer_controller.go+++ b/internal/controller/answer_controller.go@@ -56,15 +56,17 @@ func (ac *AnswerController) RemoveAnswer(ctx *gin.Context) {}req.ID = uid.DeShortID(req.ID)req.UserID = middleware.GetLoginUserIDFromContext(ctx)-- captchaPass := ac.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionDelete, req.UserID, req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := ac.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionDelete, req.UserID, req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}objectOwner := ac.rankService.CheckOperationObjectOwner(ctx, req.UserID, req.ID)@@ -82,7 +84,9 @@ func (ac *AnswerController) RemoveAnswer(ctx *gin.Context) {}err = ac.answerService.RemoveAnswer(ctx, req)- ac.actionService.ActionRecordAdd(ctx, entity.CaptchaActionDelete, req.UserID)+ if !isAdmin {+ ac.actionService.ActionRecordAdd(ctx, entity.CaptchaActionDelete, req.UserID)+ }handler.HandleResponse(ctx, err, nil)}@@ -132,15 +136,17 @@ func (ac *AnswerController) Add(ctx *gin.Context) {}req.QuestionID = uid.DeShortID(req.QuestionID)req.UserID = middleware.GetLoginUserIDFromContext(ctx)-- captchaPass := ac.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionAnswer, req.UserID, req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := ac.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionAnswer, req.UserID, req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}can, err := ac.rankService.CheckOperationPermission(ctx, req.UserID, permission.AnswerAdd, "")@@ -158,7 +164,9 @@ func (ac *AnswerController) Add(ctx *gin.Context) {handler.HandleResponse(ctx, err, nil)return}- ac.actionService.ActionRecordAdd(ctx, entity.CaptchaActionAnswer, req.UserID)+ if !isAdmin {+ ac.actionService.ActionRecordAdd(ctx, entity.CaptchaActionAnswer, req.UserID)+ }info, questionInfo, has, err := ac.answerService.Get(ctx, answerID, req.UserID)if err != nil {handler.HandleResponse(ctx, err, nil)@@ -209,15 +217,17 @@ func (ac *AnswerController) Update(ctx *gin.Context) {}req.UserID = middleware.GetLoginUserIDFromContext(ctx)req.QuestionID = uid.DeShortID(req.QuestionID)-- captchaPass := ac.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionEdit, req.UserID, req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := ac.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionEdit, req.UserID, req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}canList, err := ac.rankService.CheckOperationPermissions(ctx, req.UserID, []string{@@ -242,8 +252,9 @@ func (ac *AnswerController) Update(ctx *gin.Context) {handler.HandleResponse(ctx, err, nil)return}-- ac.actionService.ActionRecordAdd(ctx, entity.CaptchaActionEdit, req.UserID)+ if !isAdmin {+ ac.actionService.ActionRecordAdd(ctx, entity.CaptchaActionEdit, req.UserID)+ }_, _, _, err = ac.answerService.Get(ctx, req.ID, req.UserID)if err != nil {handler.HandleResponse(ctx, err, nil)diff --git a/internal/controller/comment_controller.go b/internal/controller/comment_controller.goindex 9495ebf7..5efdfa8b 100644--- a/internal/controller/comment_controller.go+++ b/internal/controller/comment_controller.go@@ -54,15 +54,17 @@ func (cc *CommentController) AddComment(ctx *gin.Context) {}req.ObjectID = uid.DeShortID(req.ObjectID)req.UserID = middleware.GetLoginUserIDFromContext(ctx)-- captchaPass := cc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionComment, req.UserID, req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := cc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionComment, req.UserID, req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}canList, err := cc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{@@ -83,7 +85,9 @@ func (cc *CommentController) AddComment(ctx *gin.Context) {}resp, err := cc.commentService.AddComment(ctx, req)- cc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionComment, req.UserID)+ if !isAdmin {+ cc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionComment, req.UserID)+ }handler.HandleResponse(ctx, err, resp)}@@ -104,14 +108,17 @@ func (cc *CommentController) RemoveComment(ctx *gin.Context) {}req.UserID = middleware.GetLoginUserIDFromContext(ctx)- captchaPass := cc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionDelete, req.UserID, req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := cc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionDelete, req.UserID, req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}can, err := cc.rankService.CheckOperationPermission(ctx, req.UserID, permission.CommentDelete, req.CommentID)if err != nil {@@ -124,8 +131,9 @@ func (cc *CommentController) RemoveComment(ctx *gin.Context) {}err = cc.commentService.RemoveComment(ctx, req)- cc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionDelete, req.UserID)-+ if !isAdmin {+ cc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionDelete, req.UserID)+ }handler.HandleResponse(ctx, err, nil)}@@ -147,15 +155,17 @@ func (cc *CommentController) UpdateComment(ctx *gin.Context) {req.UserID = middleware.GetLoginUserIDFromContext(ctx)req.IsAdmin = middleware.GetIsAdminFromContext(ctx)-- captchaPass := cc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionEdit, req.UserID, req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := cc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionEdit, req.UserID, req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}canList, err := cc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{@@ -181,7 +191,9 @@ func (cc *CommentController) UpdateComment(ctx *gin.Context) {}resp, err := cc.commentService.UpdateComment(ctx, req)- cc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionEdit, req.UserID)+ if !isAdmin {+ cc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionEdit, req.UserID)+ }handler.HandleResponse(ctx, err, resp)}diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.goindex 8b69ec9a..0fb6b391 100644--- a/internal/controller/question_controller.go+++ b/internal/controller/question_controller.go@@ -64,15 +64,17 @@ func (qc *QuestionController) RemoveQuestion(ctx *gin.Context) {req.ID = uid.DeShortID(req.ID)req.UserID = middleware.GetLoginUserIDFromContext(ctx)req.IsAdmin = middleware.GetIsAdminFromContext(ctx)-- captchaPass := qc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionDelete, req.UserID, req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := qc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionDelete, req.UserID, req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}can, err := qc.rankService.CheckOperationPermission(ctx, req.UserID, permission.QuestionDelete, req.ID)@@ -84,9 +86,10 @@ func (qc *QuestionController) RemoveQuestion(ctx *gin.Context) {handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)return}-err = qc.questionService.RemoveQuestion(ctx, req)- qc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionDelete, req.UserID)+ if !isAdmin {+ qc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionDelete, req.UserID)+ }handler.HandleResponse(ctx, err, nil)}@@ -329,14 +332,17 @@ func (qc *QuestionController) AddQuestion(ctx *gin.Context) {}req.UserID = middleware.GetLoginUserIDFromContext(ctx)- captchaPass := qc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionQuestion, req.UserID, req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := qc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionQuestion, req.UserID, req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}canList, requireRanks, err := qc.rankService.CheckOperationPermissionsForRanks(ctx, req.UserID, []string{@@ -402,7 +408,9 @@ func (qc *QuestionController) AddQuestion(ctx *gin.Context) {handler.HandleResponse(ctx, errors.BadRequest(reason.RequestFormatError), errFields)return}- qc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionQuestion, req.UserID)+ if !isAdmin {+ qc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionQuestion, req.UserID)+ }handler.HandleResponse(ctx, err, resp)}@@ -527,15 +535,17 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {}req.ID = uid.DeShortID(req.ID)req.UserID = middleware.GetLoginUserIDFromContext(ctx)-- captchaPass := qc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionEdit, req.UserID, req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := qc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionEdit, req.UserID, req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}canList, requireRanks, err := qc.rankService.CheckOperationPermissionsForRanks(ctx, req.UserID, []string{@@ -589,7 +599,9 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {handler.HandleResponse(ctx, err, resp)return}- qc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionEdit, req.UserID)+ if !isAdmin {+ qc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionEdit, req.UserID)+ }handler.HandleResponse(ctx, nil, &schema.UpdateQuestionResp{WaitForReview: !req.NoNeedReview})}@@ -611,15 +623,17 @@ func (qc *QuestionController) UpdateQuestionInviteUser(ctx *gin.Context) {}req.ID = uid.DeShortID(req.ID)req.UserID = middleware.GetLoginUserIDFromContext(ctx)-- captchaPass := qc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionInvitationAnswer, req.UserID, req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := qc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionInvitationAnswer, req.UserID, req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}canList, err := qc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{@@ -645,7 +659,9 @@ func (qc *QuestionController) UpdateQuestionInviteUser(ctx *gin.Context) {handler.HandleResponse(ctx, err, nil)return}- qc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionInvitationAnswer, req.UserID)+ if !isAdmin {+ qc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionInvitationAnswer, req.UserID)+ }handler.HandleResponse(ctx, nil, nil)}diff --git a/internal/controller/report_controller.go b/internal/controller/report_controller.goindex 7f76f166..6b8a3ab2 100644--- a/internal/controller/report_controller.go+++ b/internal/controller/report_controller.go@@ -55,15 +55,17 @@ func (rc *ReportController) AddReport(ctx *gin.Context) {}req.ObjectID = uid.DeShortID(req.ObjectID)req.UserID = middleware.GetLoginUserIDFromContext(ctx)-- captchaPass := rc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionReport, req.UserID, req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := rc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionReport, req.UserID, req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}can, err := rc.rankService.CheckOperationPermission(ctx, req.UserID, permission.ReportAdd, "")@@ -77,6 +79,8 @@ func (rc *ReportController) AddReport(ctx *gin.Context) {}err = rc.reportService.AddReport(ctx, req)- rc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionReport, req.UserID)+ if !isAdmin {+ rc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionReport, req.UserID)+ }handler.HandleResponse(ctx, err, nil)}diff --git a/internal/controller/search_controller.go b/internal/controller/search_controller.goindex fb4c19e7..b9df6e7a 100644--- a/internal/controller/search_controller.go+++ b/internal/controller/search_controller.go@@ -52,18 +52,23 @@ func (sc *SearchController) Search(ctx *gin.Context) {if dto.UserID != "" {unit = dto.UserID}- captchaPass := sc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionSearch, unit, dto.CaptchaID, dto.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := sc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionSearch, unit, dto.CaptchaID, dto.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}resp, total, extra, err := sc.searchService.Search(ctx, &dto)- sc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionSearch, unit)+ if !isAdmin {+ sc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionSearch, unit)+ }handler.HandleResponse(ctx, err, schema.SearchListResp{Total: total,SearchResp: resp,diff --git a/internal/controller/user_controller.go b/internal/controller/user_controller.goindex 7d8dec84..4571de16 100644--- a/internal/controller/user_controller.go+++ b/internal/controller/user_controller.go@@ -106,15 +106,17 @@ func (uc *UserController) UserEmailLogin(ctx *gin.Context) {if handler.BindAndCheck(ctx, req) {return}-- captchaPass := uc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionEmail, ctx.ClientIP(), req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := uc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionEmail, ctx.ClientIP(), req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}resp, err := uc.userService.EmailLogin(ctx, req)@@ -127,7 +129,9 @@ func (uc *UserController) UserEmailLogin(ctx *gin.Context) {handler.HandleResponse(ctx, errors.BadRequest(reason.EmailOrPasswordWrong), errFields)return}- uc.actionService.ActionRecordDel(ctx, entity.CaptchaActionEmail, ctx.ClientIP())+ if !isAdmin {+ uc.actionService.ActionRecordDel(ctx, entity.CaptchaActionEmail, ctx.ClientIP())+ }handler.HandleResponse(ctx, nil, resp)}@@ -145,14 +149,17 @@ func (uc *UserController) RetrievePassWord(ctx *gin.Context) {if handler.BindAndCheck(ctx, req) {return}- captchaPass := uc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionEmail, ctx.ClientIP(), req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := uc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionEmail, ctx.ClientIP(), req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}err := uc.userService.RetrievePassWord(ctx, req)handler.HandleResponse(ctx, err, nil)@@ -234,14 +241,17 @@ func (uc *UserController) UserRegisterByEmail(ctx *gin.Context) {return}req.IP = ctx.ClientIP()- captchaPass := uc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionEmail, req.IP, req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := uc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionEmail, req.IP, req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}resp, errFields, err := uc.userService.UserRegisterByEmail(ctx, req)@@ -309,15 +319,17 @@ func (uc *UserController) UserVerifyEmailSend(ctx *gin.Context) {handler.HandleResponse(ctx, errors.Unauthorized(reason.UnauthorizedError), nil)return}-- captchaPass := uc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionEmail, ctx.ClientIP(), req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := uc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionEmail, ctx.ClientIP(), req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}err := uc.userService.UserVerifyEmailSend(ctx, userInfo.UserID)@@ -341,20 +353,22 @@ func (uc *UserController) UserModifyPassWord(ctx *gin.Context) {}req.UserID = middleware.GetLoginUserIDFromContext(ctx)req.AccessToken = middleware.ExtractToken(ctx)-- captchaPass := uc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionPassword, req.UserID,- req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return- }- _, err := uc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionPassword, req.UserID)- if err != nil {- log.Error(err)+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := uc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionPassword, req.UserID,+ req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }+ _, err := uc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionPassword, req.UserID)+ if err != nil {+ log.Error(err)+ }}oldPassVerification, err := uc.userService.UserModifyPassWordVerification(ctx, req)@@ -445,9 +459,16 @@ func (uc *UserController) ActionRecord(ctx *gin.Context) {return}req.IP = ctx.ClientIP()+ resp := &schema.ActionRecordResp{}+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if isAdmin {+ resp.Verify = false+ handler.HandleResponse(ctx, nil, resp)+ } else {+ resp, err := uc.actionService.ActionRecord(ctx, req)+ handler.HandleResponse(ctx, err, resp)+ }- resp, err := uc.actionService.ActionRecord(ctx, req)- handler.HandleResponse(ctx, err, resp)}// UserRegisterCaptcha godoc@@ -515,22 +536,26 @@ func (uc *UserController) UserChangeEmailSendCode(ctx *gin.Context) {handler.HandleResponse(ctx, errors.BadRequest(reason.EmailIllegalDomainError), nil)return}-- captchaPass := uc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionPassword, req.UserID, req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := uc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionPassword, req.UserID, req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}resp, err := uc.userService.UserChangeEmailSendCode(ctx, req)if err != nil {handler.HandleResponse(ctx, err, resp)return}- uc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionPassword, req.UserID)+ if !isAdmin {+ uc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionPassword, req.UserID)+ }handler.HandleResponse(ctx, err, nil)}diff --git a/internal/controller/vote_controller.go b/internal/controller/vote_controller.goindex b0b59d41..74ea2f02 100644--- a/internal/controller/vote_controller.go+++ b/internal/controller/vote_controller.go@@ -53,15 +53,17 @@ func (vc *VoteController) VoteUp(ctx *gin.Context) {}req.ObjectID = uid.DeShortID(req.ObjectID)req.UserID = middleware.GetLoginUserIDFromContext(ctx)-- captchaPass := vc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionVote, req.UserID, req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := vc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionVote, req.UserID, req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}can, needRank, err := vc.rankService.CheckVotePermission(ctx, req.UserID, req.ObjectID, true)@@ -75,7 +77,9 @@ func (vc *VoteController) VoteUp(ctx *gin.Context) {handler.HandleResponse(ctx, errors.Forbidden(reason.NoEnoughRankToOperate).WithMsg(msg), nil)return}- vc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionVote, req.UserID)+ if !isAdmin {+ vc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionVote, req.UserID)+ }resp, err := vc.VoteService.VoteUp(ctx, req)if err != nil {handler.HandleResponse(ctx, err, schema.ErrTypeToast)@@ -101,15 +105,17 @@ func (vc *VoteController) VoteDown(ctx *gin.Context) {}req.ObjectID = uid.DeShortID(req.ObjectID)req.UserID = middleware.GetLoginUserIDFromContext(ctx)-- captchaPass := vc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionVote, req.UserID, req.CaptchaID, req.CaptchaCode)- if !captchaPass {- errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{- ErrorField: "captcha_code",- ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),- })- handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)- return+ isAdmin := middleware.GetUserIsAdminModerator(ctx)+ if !isAdmin {+ captchaPass := vc.actionService.ActionRecordVerifyCaptcha(ctx, entity.CaptchaActionVote, req.UserID, req.CaptchaID, req.CaptchaCode)+ if !captchaPass {+ errFields := append([]*validator.FormErrorField{}, &validator.FormErrorField{+ ErrorField: "captcha_code",+ ErrorMsg: translator.Tr(handler.GetLang(ctx), reason.CaptchaVerificationFailed),+ })+ handler.HandleResponse(ctx, errors.BadRequest(reason.CaptchaVerificationFailed), errFields)+ return+ }}can, needRank, err := vc.rankService.CheckVotePermission(ctx, req.UserID, req.ObjectID, false)if err != nil {@@ -122,7 +128,9 @@ func (vc *VoteController) VoteDown(ctx *gin.Context) {handler.HandleResponse(ctx, errors.Forbidden(reason.NoEnoughRankToOperate).WithMsg(msg), nil)return}- vc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionVote, req.UserID)+ if !isAdmin {+ vc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionVote, req.UserID)+ }resp, err := vc.VoteService.VoteDown(ctx, req)if err != nil {handler.HandleResponse(ctx, err, schema.ErrTypeToast)diff --git a/internal/schema/user_schema.go b/internal/schema/user_schema.goindex eea04303..7ae77151 100644--- a/internal/schema/user_schema.go+++ b/internal/schema/user_schema.go@@ -326,7 +326,7 @@ type UserNoticeSetResp struct {type ActionRecordReq struct {// action- Action string `validate:"required,oneof=login e_mail find_pass modify_pass" form:"action"`+ Action string `validate:"required,oneof=email password edit_userinfo question answer comment edit invitation_answer search report delete vote" form:"action"`IP string `json:"-"`}