mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-01 15:19:09 +01:00
2ca4862f8b
Previously, the repo wiki was hardcoded to use `master` as its branch,
this change makes it possible to use `main` (or something else, governed
by `[repository].DEFAULT_BRANCH`, a setting that already exists and
defaults to `main`).
The way it is done is that a new column is added to the `repository`
table: `wiki_branch`. The migration will make existing repositories
default to `master`, for compatibility's sake, even if they don't have a
Wiki (because it's easier to do that). Newly created repositories will
default to `[repository].DEFAULT_BRANCH` instead.
The Wiki service was updated to use the branch name stored in the
database, and fall back to the default if it is empty.
Old repositories with Wikis using the older `master` branch will have
the option to do a one-time transition to `main`, available via the
repository settings in the "Danger Zone". This option will only be
available for repositories that have the internal wiki enabled, it is
not empty, and the wiki branch is not `[repository].DEFAULT_BRANCH`.
When migrating a repository with a Wiki, Forgejo will use the same
branch name for the wiki as the source repository did. If that's not the
same as the default, the option to normalize it will be available after
the migration's done.
Additionally, the `/api/v1/{owner}/{repo}` endpoint was updated: it will
now include the wiki branch name in `GET` requests, and allow changing
the wiki branch via `PATCH`.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
(cherry picked from commit d87c526d2a
)
331 lines
9.8 KiB
Go
331 lines
9.8 KiB
Go
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package wiki
|
|
|
|
import (
|
|
"math/rand"
|
|
"strings"
|
|
"testing"
|
|
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
"code.gitea.io/gitea/models/unittest"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/git"
|
|
"code.gitea.io/gitea/modules/gitrepo"
|
|
|
|
_ "code.gitea.io/gitea/models/actions"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestMain(m *testing.M) {
|
|
unittest.MainTest(m)
|
|
}
|
|
|
|
func TestWebPathSegments(t *testing.T) {
|
|
a := WebPathSegments("a%2Fa/b+c/d-e/f-g.-")
|
|
assert.EqualValues(t, []string{"a/a", "b c", "d e", "f-g"}, a)
|
|
}
|
|
|
|
func TestUserTitleToWebPath(t *testing.T) {
|
|
type test struct {
|
|
Expected string
|
|
UserTitle string
|
|
}
|
|
for _, test := range []test{
|
|
{"unnamed", ""},
|
|
{"unnamed", "."},
|
|
{"unnamed", ".."},
|
|
{"wiki-name", "wiki name"},
|
|
{"title.md.-", "title.md"},
|
|
{"wiki-name.-", "wiki-name"},
|
|
{"the+wiki-name.-", "the wiki-name"},
|
|
{"a%2Fb", "a/b"},
|
|
{"a%25b", "a%b"},
|
|
} {
|
|
assert.EqualValues(t, test.Expected, UserTitleToWebPath("", test.UserTitle))
|
|
}
|
|
}
|
|
|
|
func TestWebPathToDisplayName(t *testing.T) {
|
|
type test struct {
|
|
Expected string
|
|
WebPath WebPath
|
|
}
|
|
for _, test := range []test{
|
|
{"wiki name", "wiki-name"},
|
|
{"wiki-name", "wiki-name.-"},
|
|
{"name with / slash", "name-with %2F slash"},
|
|
{"name with % percent", "name-with %25 percent"},
|
|
{"2000-01-02 meeting", "2000-01-02+meeting.-.md"},
|
|
{"a b", "a%20b.md"},
|
|
} {
|
|
_, displayName := WebPathToUserTitle(test.WebPath)
|
|
assert.EqualValues(t, test.Expected, displayName)
|
|
}
|
|
}
|
|
|
|
func TestWebPathToGitPath(t *testing.T) {
|
|
type test struct {
|
|
Expected string
|
|
WikiName WebPath
|
|
}
|
|
for _, test := range []test{
|
|
{"wiki-name.md", "wiki%20name"},
|
|
{"wiki-name.md", "wiki+name"},
|
|
{"wiki name.md", "wiki%20name.md"},
|
|
{"wiki%20name.md", "wiki%2520name.md"},
|
|
{"2000-01-02-meeting.md", "2000-01-02+meeting"},
|
|
{"2000-01-02 meeting.-.md", "2000-01-02%20meeting.-"},
|
|
} {
|
|
assert.EqualValues(t, test.Expected, WebPathToGitPath(test.WikiName))
|
|
}
|
|
}
|
|
|
|
func TestGitPathToWebPath(t *testing.T) {
|
|
type test struct {
|
|
Expected string
|
|
Filename string
|
|
}
|
|
for _, test := range []test{
|
|
{"hello-world", "hello-world.md"}, // this shouldn't happen, because it should always have a ".-" suffix
|
|
{"hello-world", "hello world.md"},
|
|
{"hello-world.-", "hello-world.-.md"},
|
|
{"hello+world.-", "hello world.-.md"},
|
|
{"symbols-%2F", "symbols %2F.md"},
|
|
} {
|
|
name, err := GitPathToWebPath(test.Filename)
|
|
assert.NoError(t, err)
|
|
assert.EqualValues(t, test.Expected, name)
|
|
}
|
|
for _, badFilename := range []string{
|
|
"nofileextension",
|
|
"wrongfileextension.txt",
|
|
} {
|
|
_, err := GitPathToWebPath(badFilename)
|
|
assert.Error(t, err)
|
|
assert.True(t, repo_model.IsErrWikiInvalidFileName(err))
|
|
}
|
|
_, err := GitPathToWebPath("badescaping%%.md")
|
|
assert.Error(t, err)
|
|
assert.False(t, repo_model.IsErrWikiInvalidFileName(err))
|
|
}
|
|
|
|
func TestUserWebGitPathConsistency(t *testing.T) {
|
|
maxLen := 20
|
|
b := make([]byte, maxLen)
|
|
for i := 0; i < 1000; i++ {
|
|
l := rand.Intn(maxLen)
|
|
for j := 0; j < l; j++ {
|
|
r := rand.Intn(0x80-0x20) + 0x20
|
|
b[j] = byte(r)
|
|
}
|
|
|
|
userTitle := strings.TrimSpace(string(b[:l]))
|
|
if userTitle == "" || userTitle == "." || userTitle == ".." {
|
|
continue
|
|
}
|
|
webPath := UserTitleToWebPath("", userTitle)
|
|
gitPath := WebPathToGitPath(webPath)
|
|
|
|
webPath1, _ := GitPathToWebPath(gitPath)
|
|
_, userTitle1 := WebPathToUserTitle(webPath1)
|
|
gitPath1 := WebPathToGitPath(webPath1)
|
|
|
|
assert.EqualValues(t, userTitle, userTitle1, "UserTitle for userTitle: %q", userTitle)
|
|
assert.EqualValues(t, webPath, webPath1, "WebPath for userTitle: %q", userTitle)
|
|
assert.EqualValues(t, gitPath, gitPath1, "GitPath for userTitle: %q", userTitle)
|
|
}
|
|
}
|
|
|
|
func TestRepository_InitWiki(t *testing.T) {
|
|
unittest.PrepareTestEnv(t)
|
|
// repo1 already has a wiki
|
|
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
|
assert.NoError(t, InitWiki(git.DefaultContext, repo1))
|
|
|
|
// repo2 does not already have a wiki
|
|
repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
|
|
assert.NoError(t, InitWiki(git.DefaultContext, repo2))
|
|
assert.True(t, repo2.HasWiki())
|
|
}
|
|
|
|
func TestRepository_AddWikiPage(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
const wikiContent = "This is the wiki content"
|
|
const commitMsg = "Commit message"
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
|
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
|
for _, userTitle := range []string{
|
|
"Another page",
|
|
"Here's a <tag> and a/slash",
|
|
} {
|
|
t.Run("test wiki exist: "+userTitle, func(t *testing.T) {
|
|
webPath := UserTitleToWebPath("", userTitle)
|
|
assert.NoError(t, AddWikiPage(git.DefaultContext, doer, repo, webPath, wikiContent, commitMsg))
|
|
// Now need to show that the page has been added:
|
|
gitRepo, err := gitrepo.OpenWikiRepository(git.DefaultContext, repo)
|
|
if !assert.NoError(t, err) {
|
|
return
|
|
}
|
|
defer gitRepo.Close()
|
|
masterTree, err := gitRepo.GetTree("master")
|
|
assert.NoError(t, err)
|
|
gitPath := WebPathToGitPath(webPath)
|
|
entry, err := masterTree.GetTreeEntryByPath(gitPath)
|
|
assert.NoError(t, err)
|
|
assert.EqualValues(t, gitPath, entry.Name(), "%s not added correctly", userTitle)
|
|
})
|
|
}
|
|
|
|
t.Run("check wiki already exist", func(t *testing.T) {
|
|
t.Parallel()
|
|
// test for already-existing wiki name
|
|
err := AddWikiPage(git.DefaultContext, doer, repo, "Home", wikiContent, commitMsg)
|
|
assert.Error(t, err)
|
|
assert.True(t, repo_model.IsErrWikiAlreadyExist(err))
|
|
})
|
|
|
|
t.Run("check wiki reserved name", func(t *testing.T) {
|
|
t.Parallel()
|
|
// test for reserved wiki name
|
|
err := AddWikiPage(git.DefaultContext, doer, repo, "_edit", wikiContent, commitMsg)
|
|
assert.Error(t, err)
|
|
assert.True(t, repo_model.IsErrWikiReservedName(err))
|
|
})
|
|
}
|
|
|
|
func TestRepository_EditWikiPage(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
const newWikiContent = "This is the new content"
|
|
const commitMsg = "Commit message"
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
|
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
|
for _, newWikiName := range []string{
|
|
"Home", // same name as before
|
|
"New home",
|
|
"New/name/with/slashes",
|
|
} {
|
|
webPath := UserTitleToWebPath("", newWikiName)
|
|
unittest.PrepareTestEnv(t)
|
|
assert.NoError(t, EditWikiPage(git.DefaultContext, doer, repo, "Home", webPath, newWikiContent, commitMsg))
|
|
|
|
// Now need to show that the page has been added:
|
|
gitRepo, err := gitrepo.OpenWikiRepository(git.DefaultContext, repo)
|
|
assert.NoError(t, err)
|
|
masterTree, err := gitRepo.GetTree("master")
|
|
assert.NoError(t, err)
|
|
gitPath := WebPathToGitPath(webPath)
|
|
entry, err := masterTree.GetTreeEntryByPath(gitPath)
|
|
assert.NoError(t, err)
|
|
assert.EqualValues(t, gitPath, entry.Name(), "%s not edited correctly", newWikiName)
|
|
|
|
if newWikiName != "Home" {
|
|
_, err := masterTree.GetTreeEntryByPath("Home.md")
|
|
assert.Error(t, err)
|
|
}
|
|
gitRepo.Close()
|
|
}
|
|
}
|
|
|
|
func TestRepository_DeleteWikiPage(t *testing.T) {
|
|
unittest.PrepareTestEnv(t)
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
|
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
|
assert.NoError(t, DeleteWikiPage(git.DefaultContext, doer, repo, "Home"))
|
|
|
|
// Now need to show that the page has been added:
|
|
gitRepo, err := gitrepo.OpenWikiRepository(git.DefaultContext, repo)
|
|
if !assert.NoError(t, err) {
|
|
return
|
|
}
|
|
defer gitRepo.Close()
|
|
masterTree, err := gitRepo.GetTree("master")
|
|
assert.NoError(t, err)
|
|
gitPath := WebPathToGitPath("Home")
|
|
_, err = masterTree.GetTreeEntryByPath(gitPath)
|
|
assert.Error(t, err)
|
|
}
|
|
|
|
func TestPrepareWikiFileName(t *testing.T) {
|
|
unittest.PrepareTestEnv(t)
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
|
gitRepo, err := gitrepo.OpenWikiRepository(git.DefaultContext, repo)
|
|
if !assert.NoError(t, err) {
|
|
return
|
|
}
|
|
defer gitRepo.Close()
|
|
|
|
tests := []struct {
|
|
name string
|
|
arg string
|
|
existence bool
|
|
wikiPath string
|
|
wantErr bool
|
|
}{{
|
|
name: "add suffix",
|
|
arg: "Home",
|
|
existence: true,
|
|
wikiPath: "Home.md",
|
|
wantErr: false,
|
|
}, {
|
|
name: "test special chars",
|
|
arg: "home of and & or wiki page!",
|
|
existence: false,
|
|
wikiPath: "home-of-and-%26-or-wiki-page%21.md",
|
|
wantErr: false,
|
|
}}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
webPath := UserTitleToWebPath("", tt.arg)
|
|
existence, newWikiPath, err := prepareGitPath(gitRepo, "master", webPath)
|
|
if (err != nil) != tt.wantErr {
|
|
assert.NoError(t, err)
|
|
return
|
|
}
|
|
if existence != tt.existence {
|
|
if existence {
|
|
t.Errorf("expect to find no escaped file but we detect one")
|
|
} else {
|
|
t.Errorf("expect to find an escaped file but we could not detect one")
|
|
}
|
|
}
|
|
assert.EqualValues(t, tt.wikiPath, newWikiPath)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestPrepareWikiFileName_FirstPage(t *testing.T) {
|
|
unittest.PrepareTestEnv(t)
|
|
|
|
// Now create a temporaryDirectory
|
|
tmpDir := t.TempDir()
|
|
|
|
err := git.InitRepository(git.DefaultContext, tmpDir, true, git.Sha1ObjectFormat.Name())
|
|
assert.NoError(t, err)
|
|
|
|
gitRepo, err := git.OpenRepository(git.DefaultContext, tmpDir)
|
|
if !assert.NoError(t, err) {
|
|
return
|
|
}
|
|
defer gitRepo.Close()
|
|
|
|
existence, newWikiPath, err := prepareGitPath(gitRepo, "master", "Home")
|
|
assert.False(t, existence)
|
|
assert.NoError(t, err)
|
|
assert.EqualValues(t, "Home.md", newWikiPath)
|
|
}
|
|
|
|
func TestWebPathConversion(t *testing.T) {
|
|
assert.Equal(t, "path/wiki", WebPathToURLPath(WebPath("path/wiki")))
|
|
assert.Equal(t, "wiki", WebPathToURLPath(WebPath("wiki")))
|
|
assert.Equal(t, "", WebPathToURLPath(WebPath("")))
|
|
}
|
|
|
|
func TestWebPathFromRequest(t *testing.T) {
|
|
assert.Equal(t, WebPath("a%2Fb"), WebPathFromRequest("a/b"))
|
|
assert.Equal(t, WebPath("a"), WebPathFromRequest("a"))
|
|
assert.Equal(t, WebPath("b"), WebPathFromRequest("a/../b"))
|
|
}
|