mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-06-19 07:30:50 +00:00
Currently the `POST /repos/{owner}/{repo}/contents` API endpoint accepts request without any `ChangeFileOperation.SHA`, unlike stated by the doc:
33eee199cf/modules/structs/repo_file.go (L80-L81)
This PR adds:
- some more (already passing) tests around this function
- a new (failing) test to show this wrong behavior
- a fix (note that this is a breaking change for clients exploiting this bug)
- an update for all the existing tests
<!--start release-notes-assistant-->
## Release notes
<!--URL:https://codeberg.org/forgejo/forgejo-->
- Breaking bug fixes
- [PR](https://codeberg.org/forgejo/forgejo/pulls/8139): <!--number 8139 --><!--line 0 --><!--description QVBJOiBlbmZvcmNlIHNoYSByZXF1aXJlbWVudCBvbiBgUE9TVCAvcmVwb3Mve293bmVyfS97cmVwb30vY29udGVudHNg-->API: enforce sha requirement on `POST /repos/{owner}/{repo}/contents`<!--description-->
<!--end release-notes-assistant-->
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8139
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: oliverpool <git@olivier.pfad.fr>
Co-committed-by: oliverpool <git@olivier.pfad.fr>
125 lines
3.4 KiB
Go
125 lines
3.4 KiB
Go
// Copyright 2024 The Forgejo Authors. All rights reserved.
|
||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||
|
||
package e2e
|
||
|
||
import (
|
||
"fmt"
|
||
"strings"
|
||
"testing"
|
||
"time"
|
||
|
||
unit_model "forgejo.org/models/unit"
|
||
"forgejo.org/models/unittest"
|
||
user_model "forgejo.org/models/user"
|
||
"forgejo.org/modules/git"
|
||
"forgejo.org/modules/indexer/stats"
|
||
files_service "forgejo.org/services/repository/files"
|
||
"forgejo.org/tests"
|
||
|
||
"github.com/stretchr/testify/assert"
|
||
"github.com/stretchr/testify/require"
|
||
)
|
||
|
||
// first entry represents filename
|
||
// the following entries define the full file content over time
|
||
type FileChanges struct {
|
||
Filename string
|
||
CommitMsg string
|
||
Versions []string
|
||
}
|
||
|
||
// put your Git repo declarations in here
|
||
// feel free to amend the helper function below or use the raw variant directly
|
||
func DeclareGitRepos(t *testing.T) func() {
|
||
cleanupFunctions := []func(){
|
||
newRepo(t, 2, "diff-test", []FileChanges{{
|
||
Filename: "testfile",
|
||
Versions: []string{"hello", "hallo", "hola", "native", "ubuntu-latest", "- runs-on: ubuntu-latest", "- runs-on: debian-latest"},
|
||
}}),
|
||
newRepo(t, 2, "language-stats-test", []FileChanges{{
|
||
Filename: "main.rs",
|
||
Versions: []string{"fn main() {", "println!(\"Hello World!\");", "}"},
|
||
}}),
|
||
newRepo(t, 2, "mentions-highlighted", []FileChanges{
|
||
{
|
||
Filename: "history1.md",
|
||
Versions: []string{""},
|
||
CommitMsg: "A commit message which mentions @user2 in the title\nand has some additional text which mentions @user1",
|
||
},
|
||
{
|
||
Filename: "history2.md",
|
||
Versions: []string{""},
|
||
CommitMsg: "Another commit which mentions @user1 in the title\nand @user2 in the text",
|
||
},
|
||
}),
|
||
newRepo(t, 2, "unicode-escaping", []FileChanges{{
|
||
Filename: "a-file",
|
||
Versions: []string{"{a}{а}"},
|
||
}}),
|
||
// add your repo declarations here
|
||
}
|
||
|
||
return func() {
|
||
for _, cleanup := range cleanupFunctions {
|
||
cleanup()
|
||
}
|
||
}
|
||
}
|
||
|
||
func newRepo(t *testing.T, userID int64, repoName string, fileChanges []FileChanges) func() {
|
||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: userID})
|
||
somerepo, _, cleanupFunc := tests.CreateDeclarativeRepo(t, user, repoName,
|
||
[]unit_model.Type{unit_model.TypeCode, unit_model.TypeIssues}, nil,
|
||
nil,
|
||
)
|
||
|
||
var lastCommitID string
|
||
for _, file := range fileChanges {
|
||
for i, version := range file.Versions {
|
||
operation := "update"
|
||
if i == 0 {
|
||
operation = "create"
|
||
}
|
||
|
||
// default to unique commit messages
|
||
commitMsg := file.CommitMsg
|
||
if commitMsg == "" {
|
||
commitMsg = fmt.Sprintf("Patch: %s-%d", file.Filename, i+1)
|
||
}
|
||
|
||
resp, err := files_service.ChangeRepoFiles(git.DefaultContext, somerepo, user, &files_service.ChangeRepoFilesOptions{
|
||
Files: []*files_service.ChangeRepoFile{{
|
||
Operation: operation,
|
||
TreePath: file.Filename,
|
||
ContentReader: strings.NewReader(version),
|
||
}},
|
||
Message: commitMsg,
|
||
OldBranch: "main",
|
||
NewBranch: "main",
|
||
Author: &files_service.IdentityOptions{
|
||
Name: user.Name,
|
||
Email: user.Email,
|
||
},
|
||
Committer: &files_service.IdentityOptions{
|
||
Name: user.Name,
|
||
Email: user.Email,
|
||
},
|
||
Dates: &files_service.CommitDateOptions{
|
||
Author: time.Now(),
|
||
Committer: time.Now(),
|
||
},
|
||
LastCommitID: lastCommitID,
|
||
})
|
||
require.NoError(t, err)
|
||
assert.NotEmpty(t, resp)
|
||
|
||
lastCommitID = resp.Commit.SHA
|
||
}
|
||
}
|
||
|
||
err := stats.UpdateRepoIndexer(somerepo)
|
||
require.NoError(t, err)
|
||
|
||
return cleanupFunc
|
||
}
|