mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-23 15:53:07 -05:00
[BUG] Fix panic on too high page number
- Fixes a panic where the file history router would panic if the page number was set to a page where no commits would be returned. It now returns a 404 in such case. - Regresion ofa5b1c1b0b3
- Panic log provided by @algernon. - Minimal integration test added. Co-authored-by: Gergely Nagy <forgejo@gergo.csillger.hu> (cherry picked from commit6a49e3f468
)
This commit is contained in:
parent
f385c66a47
commit
6837da596e
2 changed files with 24 additions and 0 deletions
|
@ -242,6 +242,12 @@ func FileHistory(ctx *context.Context) {
|
||||||
ctx.ServerError("CommitsByFileAndRange", err)
|
ctx.ServerError("CommitsByFileAndRange", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(commits) == 0 {
|
||||||
|
ctx.NotFound("CommitsByFileAndRange", nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
oldestCommit := commits[len(commits)-1]
|
oldestCommit := commits[len(commits)-1]
|
||||||
|
|
||||||
renamedFiles, err := git.GetCommitFileRenames(ctx, ctx.Repo.GitRepo.Path, oldestCommit.ID.String())
|
renamedFiles, err := git.GetCommitFileRenames(ctx, ctx.Repo.GitRepo.Path, oldestCommit.ID.String())
|
||||||
|
|
|
@ -1022,3 +1022,21 @@ func TestRepoCodeSearchForm(t *testing.T) {
|
||||||
testSearchForm(t, true)
|
testSearchForm(t, true)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestFileHistoryPager(t *testing.T) {
|
||||||
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
|
t.Run("Normal page number", func(t *testing.T) {
|
||||||
|
defer tests.PrintCurrentTest(t)()
|
||||||
|
|
||||||
|
req := NewRequest(t, "GET", "/user2/repo1/commits/branch/master/README.md?page=1")
|
||||||
|
MakeRequest(t, req, http.StatusOK)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("Too high page number", func(t *testing.T) {
|
||||||
|
defer tests.PrintCurrentTest(t)()
|
||||||
|
|
||||||
|
req := NewRequest(t, "GET", "/user2/repo1/commits/branch/master/README.md?page=9999")
|
||||||
|
MakeRequest(t, req, http.StatusNotFound)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue