From 070118d39b428f5c92816627b200dd84dd0c847b Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 6 Jun 2026 20:39:26 +0800 Subject: [PATCH] fix abuses --- routers/api/v1/admin/user.go | 4 ++-- routers/api/v1/api.go | 4 ++-- routers/api/v1/packages/package.go | 2 +- routers/api/v1/repo/pull.go | 4 ++-- routers/api/v1/shared/action.go | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 7667f4bf170..e656f963144 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -289,7 +289,7 @@ func DeleteUser(ctx *context.APIContext) { // "$ref": "#/responses/validationError" if ctx.ContextUser.IsOrganization() { - ctx.APIError(http.StatusUnprocessableEntity, fmt.Sprintf("%s is an organization not a user", ctx.ContextUser.Name)) + ctx.APIError(http.StatusUnprocessableEntity, "not an organization") return } @@ -551,7 +551,7 @@ func RenameUser(ctx *context.APIContext) { // "$ref": "#/responses/validationError" if ctx.ContextUser.IsOrganization() { - ctx.APIError(http.StatusUnprocessableEntity, fmt.Sprintf("%s is an organization not a user", ctx.ContextUser.Name)) + ctx.APIError(http.StatusUnprocessableEntity, "not an organization") return } diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index d172f638f16..4248faea5d4 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -734,14 +734,14 @@ func mustEnableWiki(ctx *context.APIContext) { // FIXME: for consistency, maybe most mustNotBeArchived checks should be replaced with mustEnableEditor func mustNotBeArchived(ctx *context.APIContext) { if ctx.Repo.Repository.IsArchived { - ctx.APIError(http.StatusLocked, fmt.Sprintf("%s is archived", ctx.Repo.Repository.FullName())) + ctx.APIError(http.StatusLocked, "repo is archived") return } } func mustEnableEditor(ctx *context.APIContext) { if !ctx.Repo.Repository.CanEnableEditor() { - ctx.APIError(http.StatusLocked, fmt.Sprintf("%s is not allowed to edit", ctx.Repo.Repository.FullName())) + ctx.APIError(http.StatusLocked, "repo is not allowed to edit") return } } diff --git a/routers/api/v1/packages/package.go b/routers/api/v1/packages/package.go index 5b3d819e66a..d06d2a636b8 100644 --- a/routers/api/v1/packages/package.go +++ b/routers/api/v1/packages/package.go @@ -329,7 +329,7 @@ func GetLatestPackageVersion(ctx *context.APIContext) { return } if len(pvs) == 0 { - ctx.APIError(http.StatusNotFound, err.Error()) + ctx.APIErrorNotFound() return } diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go index 1eb5cc6fca3..54e7b78a1b4 100644 --- a/routers/api/v1/repo/pull.go +++ b/routers/api/v1/repo/pull.go @@ -1230,7 +1230,7 @@ func UpdatePullRequest(ctx *context.APIContext) { } if pr.HasMerged { - ctx.APIError(http.StatusUnprocessableEntity, err.Error()) + ctx.APIError(http.StatusUnprocessableEntity, "pull request is already merged") return } @@ -1240,7 +1240,7 @@ func UpdatePullRequest(ctx *context.APIContext) { } if pr.Issue.IsClosed { - ctx.APIError(http.StatusUnprocessableEntity, err.Error()) + ctx.APIError(http.StatusUnprocessableEntity, "pull request is already closed") return } diff --git a/routers/api/v1/shared/action.go b/routers/api/v1/shared/action.go index 3b7f666acc7..a69a8cd2667 100644 --- a/routers/api/v1/shared/action.go +++ b/routers/api/v1/shared/action.go @@ -53,7 +53,7 @@ func ListJobs(ctx *context.APIContext, ownerID, repoID, runID int64, runAttemptI for _, status := range ctx.FormStrings("status") { values, err := convertToInternal(status) if err != nil { - ctx.APIError(http.StatusBadRequest, fmt.Sprintf("Invalid status %s", status)) + ctx.APIError(http.StatusBadRequest, "invalid status") return } opts.Statuses = append(opts.Statuses, values...) @@ -155,7 +155,7 @@ func ListRuns(ctx *context.APIContext, ownerID, repoID int64) { for _, status := range ctx.FormStrings("status") { values, err := convertToInternal(status) if err != nil { - ctx.APIError(http.StatusBadRequest, fmt.Sprintf("Invalid status %s", status)) + ctx.APIError(http.StatusBadRequest, "invalid status") return } opts.Status = append(opts.Status, values...)