From 3bdf9eae01a40ac9dcafdb956861c8a13f3cf917 Mon Sep 17 00:00:00 2001
From: Giteabot <teabot@gitea.io>
Date: Tue, 28 May 2024 18:47:11 +0800
Subject: [PATCH 1/2] Add missed return after `ctx.ServerError` (#31130)
(#31133)
Backport #31130 by @lunny
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit e6bacf1fed57e33fcbbb7d57782bfc5daa8f2fee)
---
routers/api/v1/repo/mirror.go | 1 +
routers/web/admin/repos.go | 1 +
routers/web/auth/auth.go | 1 +
routers/web/org/projects.go | 1 +
routers/web/repo/editor.go | 1 +
5 files changed, 5 insertions(+)
diff --git a/routers/api/v1/repo/mirror.go b/routers/api/v1/repo/mirror.go
index 864644e1ef..b959a2b332 100644
--- a/routers/api/v1/repo/mirror.go
+++ b/routers/api/v1/repo/mirror.go
@@ -384,6 +384,7 @@ func CreatePushMirror(ctx *context.APIContext, mirrorOption *api.CreatePushMirro
if err = mirror_service.AddPushMirrorRemote(ctx, pushMirror, address); err != nil {
if err := repo_model.DeletePushMirrors(ctx, repo_model.PushMirrorOptions{ID: pushMirror.ID, RepoID: pushMirror.RepoID}); err != nil {
ctx.ServerError("DeletePushMirrors", err)
+ return
}
ctx.ServerError("AddPushMirrorRemote", err)
return
diff --git a/routers/web/admin/repos.go b/routers/web/admin/repos.go
index ddf4440167..d0339fdd93 100644
--- a/routers/web/admin/repos.go
+++ b/routers/web/admin/repos.go
@@ -94,6 +94,7 @@ func UnadoptedRepos(ctx *context.Context) {
repoNames, count, err := repo_service.ListUnadoptedRepositories(ctx, q, &opts)
if err != nil {
ctx.ServerError("ListUnadoptedRepositories", err)
+ return
}
ctx.Data["Dirs"] = repoNames
pager := context.NewPagination(count, opts.PageSize, opts.Page, 5)
diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go
index 1c55256db4..cb88560233 100644
--- a/routers/web/auth/auth.go
+++ b/routers/web/auth/auth.go
@@ -841,6 +841,7 @@ func ActivateEmail(ctx *context.Context) {
if email := user_model.VerifyActiveEmailCode(ctx, code, emailStr); email != nil {
if err := user_model.ActivateEmail(ctx, email); err != nil {
ctx.ServerError("ActivateEmail", err)
+ return
}
log.Trace("Email activated: %s", email.Email)
diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go
index 5105dbff8e..12edd964d2 100644
--- a/routers/web/org/projects.go
+++ b/routers/web/org/projects.go
@@ -571,6 +571,7 @@ func MoveIssues(ctx *context.Context) {
form := &movedIssuesForm{}
if err = json.NewDecoder(ctx.Req.Body).Decode(&form); err != nil {
ctx.ServerError("DecodeMovedIssuesForm", err)
+ return
}
issueIDs := make([]int64, 0, len(form.Issues))
diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go
index e8439cb40e..00c3d880a9 100644
--- a/routers/web/repo/editor.go
+++ b/routers/web/repo/editor.go
@@ -604,6 +604,7 @@ func DeleteFilePost(ctx *context.Context) {
} else {
ctx.ServerError("DeleteRepoFile", err)
}
+ return
}
ctx.Flash.Success(ctx.Tr("repo.editor.file_delete_success", ctx.Repo.TreePath))
From 7bd9597803a26655c7bb3d18e0694d2e680c2b37 Mon Sep 17 00:00:00 2001
From: Giteabot <teabot@gitea.io>
Date: Mon, 20 May 2024 10:54:53 +0800
Subject: [PATCH 2/2] Missed return on error part of: Fix bug on avatar
(#31008) (#31019)
Backport #31008 by @lunny
Extract from #30995
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 8446caa813f676398411d3544cc05a42fd708cd1)
---
routers/api/v1/org/avatar.go | 2 ++
routers/api/v1/user/avatar.go | 2 ++
2 files changed, 4 insertions(+)
diff --git a/routers/api/v1/org/avatar.go b/routers/api/v1/org/avatar.go
index e34c68dfc9..f11eb6c1cd 100644
--- a/routers/api/v1/org/avatar.go
+++ b/routers/api/v1/org/avatar.go
@@ -46,6 +46,7 @@ func UpdateAvatar(ctx *context.APIContext) {
err = user_service.UploadAvatar(ctx, ctx.Org.Organization.AsUser(), content)
if err != nil {
ctx.Error(http.StatusInternalServerError, "UploadAvatar", err)
+ return
}
ctx.Status(http.StatusNoContent)
@@ -72,6 +73,7 @@ func DeleteAvatar(ctx *context.APIContext) {
err := user_service.DeleteAvatar(ctx, ctx.Org.Organization.AsUser())
if err != nil {
ctx.Error(http.StatusInternalServerError, "DeleteAvatar", err)
+ return
}
ctx.Status(http.StatusNoContent)
diff --git a/routers/api/v1/user/avatar.go b/routers/api/v1/user/avatar.go
index f912296228..30ccb63587 100644
--- a/routers/api/v1/user/avatar.go
+++ b/routers/api/v1/user/avatar.go
@@ -39,6 +39,7 @@ func UpdateAvatar(ctx *context.APIContext) {
err = user_service.UploadAvatar(ctx, ctx.Doer, content)
if err != nil {
ctx.Error(http.StatusInternalServerError, "UploadAvatar", err)
+ return
}
ctx.Status(http.StatusNoContent)
@@ -57,6 +58,7 @@ func DeleteAvatar(ctx *context.APIContext) {
err := user_service.DeleteAvatar(ctx, ctx.Doer)
if err != nil {
ctx.Error(http.StatusInternalServerError, "DeleteAvatar", err)
+ return
}
ctx.Status(http.StatusNoContent)