Merge pull request '[FEAT]: Allow forking without a repo ID' (#2310) from algernon/forgejo:f/repo/fork-route into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2310 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org> Reviewed-by: Gusted <gusted@noreply.codeberg.org>
This commit is contained in:
commit
98e7753ade
4 changed files with 130 additions and 48 deletions
|
@ -115,21 +115,21 @@ func getRepository(ctx *context.Context, repoID int64) *repo_model.Repository {
|
||||||
return repo
|
return repo
|
||||||
}
|
}
|
||||||
|
|
||||||
func getForkRepository(ctx *context.Context) *repo_model.Repository {
|
func updateForkRepositoryInContext(ctx *context.Context, forkRepo *repo_model.Repository) bool {
|
||||||
forkRepo := getRepository(ctx, ctx.ParamsInt64(":repoid"))
|
if forkRepo == nil {
|
||||||
if ctx.Written() {
|
ctx.NotFound("No repository in context", nil)
|
||||||
return nil
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
if forkRepo.IsEmpty {
|
if forkRepo.IsEmpty {
|
||||||
log.Trace("Empty repository %-v", forkRepo)
|
log.Trace("Empty repository %-v", forkRepo)
|
||||||
ctx.NotFound("getForkRepository", nil)
|
ctx.NotFound("updateForkRepositoryInContext", nil)
|
||||||
return nil
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := forkRepo.LoadOwner(ctx); err != nil {
|
if err := forkRepo.LoadOwner(ctx); err != nil {
|
||||||
ctx.ServerError("LoadOwner", err)
|
ctx.ServerError("LoadOwner", err)
|
||||||
return nil
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.Data["repo_name"] = forkRepo.Name
|
ctx.Data["repo_name"] = forkRepo.Name
|
||||||
|
@ -142,7 +142,7 @@ func getForkRepository(ctx *context.Context) *repo_model.Repository {
|
||||||
ownedOrgs, err := organization.GetOrgsCanCreateRepoByUserID(ctx, ctx.Doer.ID)
|
ownedOrgs, err := organization.GetOrgsCanCreateRepoByUserID(ctx, ctx.Doer.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.ServerError("GetOrgsCanCreateRepoByUserID", err)
|
ctx.ServerError("GetOrgsCanCreateRepoByUserID", err)
|
||||||
return nil
|
return false
|
||||||
}
|
}
|
||||||
var orgs []*organization.Organization
|
var orgs []*organization.Organization
|
||||||
for _, org := range ownedOrgs {
|
for _, org := range ownedOrgs {
|
||||||
|
@ -170,7 +170,7 @@ func getForkRepository(ctx *context.Context) *repo_model.Repository {
|
||||||
traverseParentRepo, err = repo_model.GetRepositoryByID(ctx, traverseParentRepo.ForkID)
|
traverseParentRepo, err = repo_model.GetRepositoryByID(ctx, traverseParentRepo.ForkID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.ServerError("GetRepositoryByID", err)
|
ctx.ServerError("GetRepositoryByID", err)
|
||||||
return nil
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -184,7 +184,7 @@ func getForkRepository(ctx *context.Context) *repo_model.Repository {
|
||||||
} else {
|
} else {
|
||||||
ctx.Data["CanForkRepo"] = false
|
ctx.Data["CanForkRepo"] = false
|
||||||
ctx.Flash.Error(ctx.Tr("repo.fork_no_valid_owners"), true)
|
ctx.Flash.Error(ctx.Tr("repo.fork_no_valid_owners"), true)
|
||||||
return nil
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
branches, err := git_model.FindBranchNames(ctx, git_model.FindBranchOptions{
|
branches, err := git_model.FindBranchNames(ctx, git_model.FindBranchOptions{
|
||||||
|
@ -198,14 +198,19 @@ func getForkRepository(ctx *context.Context) *repo_model.Repository {
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.ServerError("FindBranchNames", err)
|
ctx.ServerError("FindBranchNames", err)
|
||||||
return nil
|
return false
|
||||||
}
|
}
|
||||||
ctx.Data["Branches"] = append([]string{ctx.Repo.Repository.DefaultBranch}, branches...)
|
ctx.Data["Branches"] = append([]string{ctx.Repo.Repository.DefaultBranch}, branches...)
|
||||||
|
|
||||||
return forkRepo
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fork render repository fork page
|
// ForkByID redirects (with 301 Moved Permanently) to the repository's `/fork` page
|
||||||
|
func ForkByID(ctx *context.Context) {
|
||||||
|
ctx.Redirect(ctx.Repo.Repository.Link()+"/fork", http.StatusMovedPermanently)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fork renders the repository fork page
|
||||||
func Fork(ctx *context.Context) {
|
func Fork(ctx *context.Context) {
|
||||||
ctx.Data["Title"] = ctx.Tr("new_fork")
|
ctx.Data["Title"] = ctx.Tr("new_fork")
|
||||||
|
|
||||||
|
@ -217,8 +222,7 @@ func Fork(ctx *context.Context) {
|
||||||
ctx.Flash.Error(msg, true)
|
ctx.Flash.Error(msg, true)
|
||||||
}
|
}
|
||||||
|
|
||||||
getForkRepository(ctx)
|
if !updateForkRepositoryInContext(ctx, ctx.Repo.Repository) {
|
||||||
if ctx.Written() {
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -236,8 +240,8 @@ func ForkPost(ctx *context.Context) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
forkRepo := getForkRepository(ctx)
|
forkRepo := ctx.Repo.Repository
|
||||||
if ctx.Written() {
|
if !updateForkRepositoryInContext(ctx, forkRepo) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -967,10 +967,7 @@ func registerRoutes(m *web.Route) {
|
||||||
m.Post("/create", web.Bind(forms.CreateRepoForm{}), repo.CreatePost)
|
m.Post("/create", web.Bind(forms.CreateRepoForm{}), repo.CreatePost)
|
||||||
m.Get("/migrate", repo.Migrate)
|
m.Get("/migrate", repo.Migrate)
|
||||||
m.Post("/migrate", web.Bind(forms.MigrateRepoForm{}), repo.MigratePost)
|
m.Post("/migrate", web.Bind(forms.MigrateRepoForm{}), repo.MigratePost)
|
||||||
m.Group("/fork", func() {
|
m.Get("/fork/{repoid}", context.RepoIDAssignment(), context.UnitTypes(), reqRepoCodeReader, repo.ForkByID)
|
||||||
m.Combo("/{repoid}").Get(repo.Fork).
|
|
||||||
Post(web.Bind(forms.CreateRepoForm{}), repo.ForkPost)
|
|
||||||
}, context.RepoIDAssignment(), context.UnitTypes(), reqRepoCodeReader)
|
|
||||||
m.Get("/search", repo.SearchRepo)
|
m.Get("/search", repo.SearchRepo)
|
||||||
}, reqSignIn)
|
}, reqSignIn)
|
||||||
|
|
||||||
|
@ -1148,6 +1145,8 @@ func registerRoutes(m *web.Route) {
|
||||||
|
|
||||||
// Grouping for those endpoints that do require authentication
|
// Grouping for those endpoints that do require authentication
|
||||||
m.Group("/{username}/{reponame}", func() {
|
m.Group("/{username}/{reponame}", func() {
|
||||||
|
m.Combo("/fork", reqRepoCodeReader).Get(repo.Fork).
|
||||||
|
Post(web.Bind(forms.CreateRepoForm{}), repo.ForkPost)
|
||||||
m.Group("/issues", func() {
|
m.Group("/issues", func() {
|
||||||
m.Group("/new", func() {
|
m.Group("/new", func() {
|
||||||
m.Combo("").Get(context.RepoRef(), repo.NewIssue).
|
m.Combo("").Get(context.RepoRef(), repo.NewIssue).
|
||||||
|
|
|
@ -82,7 +82,7 @@
|
||||||
{{/*else is not required here, because the button shouldn't link to any site if you can't create a fork*/}}
|
{{/*else is not required here, because the button shouldn't link to any site if you can't create a fork*/}}
|
||||||
{{end}}
|
{{end}}
|
||||||
{{else if not $.UserAndOrgForks}}
|
{{else if not $.UserAndOrgForks}}
|
||||||
href="{{AppSubUrl}}/repo/fork/{{.ID}}"
|
href="{{$.RepoLink}}/fork"
|
||||||
{{else}}
|
{{else}}
|
||||||
data-modal="#fork-repo-modal"
|
data-modal="#fork-repo-modal"
|
||||||
{{end}}
|
{{end}}
|
||||||
|
@ -103,7 +103,7 @@
|
||||||
</div>
|
</div>
|
||||||
{{if $.CanSignedUserFork}}
|
{{if $.CanSignedUserFork}}
|
||||||
<div class="divider"></div>
|
<div class="divider"></div>
|
||||||
<a href="{{AppSubUrl}}/repo/fork/{{.ID}}">{{ctx.Locale.Tr "repo.fork_to_different_account"}}</a>
|
<a href="{{$.RepoLink}}/fork">{{ctx.Locale.Tr "repo.fork_to_different_account"}}</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -7,36 +7,36 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
|
"net/url"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"code.gitea.io/gitea/models/db"
|
||||||
|
repo_model "code.gitea.io/gitea/models/repo"
|
||||||
"code.gitea.io/gitea/models/unittest"
|
"code.gitea.io/gitea/models/unittest"
|
||||||
user_model "code.gitea.io/gitea/models/user"
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
|
repo_service "code.gitea.io/gitea/services/repository"
|
||||||
"code.gitea.io/gitea/tests"
|
"code.gitea.io/gitea/tests"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func testRepoFork(t *testing.T, session *TestSession, ownerName, repoName, forkOwnerName, forkRepoName string) *httptest.ResponseRecorder {
|
func testRepoFork(t *testing.T, session *TestSession, ownerName, repoName, forkOwnerName, forkRepoName string) *httptest.ResponseRecorder {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
forkOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: forkOwnerName})
|
forkOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: forkOwnerName})
|
||||||
|
|
||||||
// Step0: check the existence of the to-fork repo
|
// Step0: check the existence of the to-fork repo
|
||||||
req := NewRequestf(t, "GET", "/%s/%s", forkOwnerName, forkRepoName)
|
req := NewRequestf(t, "GET", "/%s/%s", forkOwnerName, forkRepoName)
|
||||||
session.MakeRequest(t, req, http.StatusNotFound)
|
session.MakeRequest(t, req, http.StatusNotFound)
|
||||||
|
|
||||||
// Step1: go to the main page of repo
|
// Step1: visit the /fork page
|
||||||
req = NewRequestf(t, "GET", "/%s/%s", ownerName, repoName)
|
forkURL := fmt.Sprintf("/%s/%s/fork", ownerName, repoName)
|
||||||
|
req = NewRequest(t, "GET", forkURL)
|
||||||
resp := session.MakeRequest(t, req, http.StatusOK)
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
||||||
|
|
||||||
// Step2: click the fork button
|
// Step2: fill the form of the forking
|
||||||
htmlDoc := NewHTMLParser(t, resp.Body)
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
||||||
link, exists := htmlDoc.doc.Find("a.ui.button[href^=\"/repo/fork/\"]").Attr("href")
|
link, exists := htmlDoc.doc.Find(fmt.Sprintf("form.ui.form[action=\"%s\"]", forkURL)).Attr("action")
|
||||||
assert.True(t, exists, "The template has changed")
|
|
||||||
req = NewRequest(t, "GET", link)
|
|
||||||
resp = session.MakeRequest(t, req, http.StatusOK)
|
|
||||||
|
|
||||||
// Step3: fill the form of the forking
|
|
||||||
htmlDoc = NewHTMLParser(t, resp.Body)
|
|
||||||
link, exists = htmlDoc.doc.Find("form.ui.form[action^=\"/repo/fork/\"]").Attr("action")
|
|
||||||
assert.True(t, exists, "The template has changed")
|
assert.True(t, exists, "The template has changed")
|
||||||
_, exists = htmlDoc.doc.Find(fmt.Sprintf(".owner.dropdown .item[data-value=\"%d\"]", forkOwner.ID)).Attr("data-value")
|
_, exists = htmlDoc.doc.Find(fmt.Sprintf(".owner.dropdown .item[data-value=\"%d\"]", forkOwner.ID)).Attr("data-value")
|
||||||
assert.True(t, exists, fmt.Sprintf("Fork owner '%s' is not present in select box", forkOwnerName))
|
assert.True(t, exists, fmt.Sprintf("Fork owner '%s' is not present in select box", forkOwnerName))
|
||||||
|
@ -47,29 +47,108 @@ func testRepoFork(t *testing.T, session *TestSession, ownerName, repoName, forkO
|
||||||
})
|
})
|
||||||
session.MakeRequest(t, req, http.StatusSeeOther)
|
session.MakeRequest(t, req, http.StatusSeeOther)
|
||||||
|
|
||||||
// Step4: check the existence of the forked repo
|
// Step3: check the existence of the forked repo
|
||||||
req = NewRequestf(t, "GET", "/%s/%s", forkOwnerName, forkRepoName)
|
req = NewRequestf(t, "GET", "/%s/%s", forkOwnerName, forkRepoName)
|
||||||
resp = session.MakeRequest(t, req, http.StatusOK)
|
resp = session.MakeRequest(t, req, http.StatusOK)
|
||||||
|
|
||||||
return resp
|
return resp
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func testRepoForkLegacyRedirect(t *testing.T, session *TestSession, ownerName, repoName string) {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: ownerName})
|
||||||
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerID: owner.ID, Name: repoName})
|
||||||
|
|
||||||
|
// Visit the /repo/fork/:id url
|
||||||
|
req := NewRequestf(t, "GET", "/repo/fork/%d", repo.ID)
|
||||||
|
resp := session.MakeRequest(t, req, http.StatusMovedPermanently)
|
||||||
|
|
||||||
|
assert.Equal(t, repo.Link()+"/fork", resp.Header().Get("Location"))
|
||||||
|
}
|
||||||
|
|
||||||
func TestRepoFork(t *testing.T) {
|
func TestRepoFork(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
||||||
session := loginUser(t, "user1")
|
user5 := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user5"})
|
||||||
testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
|
session := loginUser(t, user5.Name)
|
||||||
|
|
||||||
|
t.Run("by name", func(t *testing.T) {
|
||||||
|
defer tests.PrintCurrentTest(t)()
|
||||||
|
defer func() {
|
||||||
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerID: user5.ID, Name: "repo1"})
|
||||||
|
repo_service.DeleteRepository(db.DefaultContext, user5, repo, false)
|
||||||
|
}()
|
||||||
|
testRepoFork(t, session, "user2", "repo1", "user5", "repo1")
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("legacy redirect", func(t *testing.T) {
|
||||||
|
defer tests.PrintCurrentTest(t)()
|
||||||
|
testRepoForkLegacyRedirect(t, session, "user2", "repo1")
|
||||||
|
|
||||||
|
t.Run("private 404", func(t *testing.T) {
|
||||||
|
defer tests.PrintCurrentTest(t)()
|
||||||
|
|
||||||
|
// Make sure the repo we try to fork is private
|
||||||
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 31, IsPrivate: true})
|
||||||
|
|
||||||
|
// user5 does not have access to user2/repo20
|
||||||
|
req := NewRequestf(t, "GET", "/repo/fork/%d", repo.ID) // user2/repo20
|
||||||
|
session.MakeRequest(t, req, http.StatusNotFound)
|
||||||
|
})
|
||||||
|
t.Run("authenticated private redirect", func(t *testing.T) {
|
||||||
|
defer tests.PrintCurrentTest(t)()
|
||||||
|
|
||||||
|
// Make sure the repo we try to fork is private
|
||||||
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 31, IsPrivate: true})
|
||||||
|
|
||||||
|
// user1 has access to user2/repo20
|
||||||
|
session := loginUser(t, "user1")
|
||||||
|
req := NewRequestf(t, "GET", "/repo/fork/%d", repo.ID) // user2/repo20
|
||||||
|
session.MakeRequest(t, req, http.StatusMovedPermanently)
|
||||||
|
})
|
||||||
|
t.Run("no code unit", func(t *testing.T) {
|
||||||
|
defer tests.PrintCurrentTest(t)()
|
||||||
|
|
||||||
|
// Make sure the repo we try to fork is private.
|
||||||
|
// We're also choosing user15/big_test_private_2, becase it has the Code unit disabled.
|
||||||
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 20, IsPrivate: true})
|
||||||
|
|
||||||
|
// user1, even though an admin, can't fork a repo without a code unit.
|
||||||
|
session := loginUser(t, "user1")
|
||||||
|
req := NewRequestf(t, "GET", "/repo/fork/%d", repo.ID) // user15/big_test_private_2
|
||||||
|
session.MakeRequest(t, req, http.StatusNotFound)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestRepoForkToOrg(t *testing.T) {
|
func TestRepoForkToOrg(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
||||||
session := loginUser(t, "user2")
|
session := loginUser(t, "user2")
|
||||||
testRepoFork(t, session, "user2", "repo1", "org3", "repo1")
|
org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "org3"})
|
||||||
|
|
||||||
// Check that no more forking is allowed as user2 owns repository
|
t.Run("by name", func(t *testing.T) {
|
||||||
// and org3 organization that owner user2 is also now has forked this repository
|
defer tests.PrintCurrentTest(t)()
|
||||||
req := NewRequest(t, "GET", "/user2/repo1")
|
defer func() {
|
||||||
resp := session.MakeRequest(t, req, http.StatusOK)
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerID: org3.ID, Name: "repo1"})
|
||||||
htmlDoc := NewHTMLParser(t, resp.Body)
|
repo_service.DeleteRepository(db.DefaultContext, org3, repo, false)
|
||||||
_, exists := htmlDoc.doc.Find("a.ui.button[href^=\"/repo/fork/\"]").Attr("href")
|
}()
|
||||||
assert.False(t, exists, "Forking should not be allowed anymore")
|
|
||||||
|
testRepoFork(t, session, "user2", "repo1", "org3", "repo1")
|
||||||
|
|
||||||
|
// Check that no more forking is allowed as user2 owns repository
|
||||||
|
// and org3 organization that owner user2 is also now has forked this repository
|
||||||
|
req := NewRequest(t, "GET", "/user2/repo1")
|
||||||
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
||||||
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
||||||
|
_, exists := htmlDoc.doc.Find("a.ui.button[href^=\"/fork\"]").Attr("href")
|
||||||
|
assert.False(t, exists, "Forking should not be allowed anymore")
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("legacy redirect", func(t *testing.T) {
|
||||||
|
defer tests.PrintCurrentTest(t)()
|
||||||
|
|
||||||
|
testRepoForkLegacyRedirect(t, session, "user2", "repo1")
|
||||||
|
})
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue