Skip to content

Commit e6395e1

Browse files
GiteaBotkemzeb
andauthored
Handle invalid target when creating releases using API (#31841) (#32043)
Backport #31841 by @kemzeb A 500 status code was thrown when passing a non-existent target to the create release API. This snapshot handles this error and instead throws a 404 status code. Discovered while working on #31840. Co-authored-by: Kemal Zebari <[email protected]>
1 parent 8a39a48 commit e6395e1

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed

routers/api/v1/repo/release.go

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"code.gitea.io/gitea/models/perm"
1313
repo_model "code.gitea.io/gitea/models/repo"
1414
"code.gitea.io/gitea/models/unit"
15+
"code.gitea.io/gitea/modules/git"
1516
api "code.gitea.io/gitea/modules/structs"
1617
"code.gitea.io/gitea/modules/web"
1718
"code.gitea.io/gitea/routers/api/v1/utils"
@@ -251,6 +252,8 @@ func CreateRelease(ctx *context.APIContext) {
251252
ctx.Error(http.StatusConflict, "ReleaseAlreadyExist", err)
252253
} else if models.IsErrProtectedTagName(err) {
253254
ctx.Error(http.StatusUnprocessableEntity, "ProtectedTagName", err)
255+
} else if git.IsErrNotExist(err) {
256+
ctx.Error(http.StatusNotFound, "ErrNotExist", fmt.Errorf("target \"%v\" not found: %w", rel.Target, err))
254257
} else {
255258
ctx.Error(http.StatusInternalServerError, "CreateRelease", err)
256259
}

services/release/release.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func createTag(ctx context.Context, gitRepo *git.Repository, rel *repo_model.Rel
6565

6666
commit, err := gitRepo.GetCommit(rel.Target)
6767
if err != nil {
68-
return false, fmt.Errorf("createTag::GetCommit[%v]: %w", rel.Target, err)
68+
return false, err
6969
}
7070

7171
if len(msg) > 0 {

tests/integration/api_releases_test.go

+18
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,24 @@ func TestAPICreateReleaseToDefaultBranchOnExistingTag(t *testing.T) {
208208
createNewReleaseUsingAPI(t, session, token, owner, repo, "v0.0.1", "", "v0.0.1", "test")
209209
}
210210

211+
func TestAPICreateReleaseGivenInvalidTarget(t *testing.T) {
212+
defer tests.PrepareTestEnv(t)()
213+
214+
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
215+
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
216+
session := loginUser(t, owner.LowerName)
217+
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
218+
219+
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/releases", owner.Name, repo.Name)
220+
req := NewRequestWithJSON(t, "POST", urlStr, &api.CreateReleaseOption{
221+
TagName: "i-point-to-an-invalid-target",
222+
Title: "Invalid Target",
223+
Target: "invalid-target",
224+
}).AddTokenAuth(token)
225+
226+
MakeRequest(t, req, http.StatusNotFound)
227+
}
228+
211229
func TestAPIGetLatestRelease(t *testing.T) {
212230
defer tests.PrepareTestEnv(t)()
213231

0 commit comments

Comments
 (0)