Skip to content

Commit 9e0db1b

Browse files
authored
Fix rename branch permission bug (#32066)
The previous implementation requires admin permission to rename branches which should be write permission. Fix #31993
1 parent b594cec commit 9e0db1b

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

routers/web/web.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -1071,8 +1071,6 @@ func registerRoutes(m *web.Router) {
10711071
m.Post("/{id}/delete", repo_setting.DeleteProtectedBranchRulePost)
10721072
}, repo.MustBeNotEmpty)
10731073

1074-
m.Post("/rename_branch", web.Bind(forms.RenameBranchForm{}), context.RepoMustNotBeArchived(), repo_setting.RenameBranchPost)
1075-
10761074
m.Group("/tags", func() {
10771075
m.Get("", repo_setting.ProtectedTags)
10781076
m.Post("", web.Bind(forms.ProtectTagForm{}), context.RepoMustNotBeArchived(), repo_setting.NewProtectedTagPost)
@@ -1304,6 +1302,7 @@ func registerRoutes(m *web.Router) {
13041302
}, web.Bind(forms.NewBranchForm{}))
13051303
m.Post("/delete", repo.DeleteBranchPost)
13061304
m.Post("/restore", repo.RestoreBranchPost)
1305+
m.Post("/rename", web.Bind(forms.RenameBranchForm{}), repo_setting.RenameBranchPost)
13071306
}, context.RepoMustNotBeArchived(), reqRepoCodeWriter, repo.MustBeNotEmpty)
13081307

13091308
m.Combo("/fork").Get(repo.Fork).Post(web.Bind(forms.CreateRepoForm{}), repo.ForkPost)

templates/repo/branch/list.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@
240240
<div class="header">
241241
{{ctx.Locale.Tr "repo.settings.rename_branch"}}
242242
</div>
243-
<form class="ui form" action="{{$.Repository.Link}}/settings/rename_branch" method="post">
243+
<form class="ui form" action="{{$.Repository.Link}}/branches/rename" method="post">
244244
<div class="content">
245245
{{.CsrfTokenHtml}}
246246
<div class="field default-branch-warning">

tests/integration/rename_branch_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ func testRenameBranch(t *testing.T, u *url.URL) {
2828

2929
// get branch setting page
3030
session := loginUser(t, "user2")
31-
req := NewRequest(t, "GET", "/user2/repo1/settings/branches")
31+
req := NewRequest(t, "GET", "/user2/repo1/branches")
3232
resp := session.MakeRequest(t, req, http.StatusOK)
3333
htmlDoc := NewHTMLParser(t, resp.Body)
3434

35-
req = NewRequestWithValues(t, "POST", "/user2/repo1/settings/rename_branch", map[string]string{
35+
req = NewRequestWithValues(t, "POST", "/user2/repo1/branches/rename", map[string]string{
3636
"_csrf": htmlDoc.GetCSRF(),
3737
"from": "master",
3838
"to": "main",
@@ -76,7 +76,7 @@ func testRenameBranch(t *testing.T, u *url.URL) {
7676
assert.Equal(t, "branch2", branch2.Name)
7777

7878
// rename branch2 to branch1
79-
req = NewRequestWithValues(t, "POST", "/user2/repo1/settings/rename_branch", map[string]string{
79+
req = NewRequestWithValues(t, "POST", "/user2/repo1/branches/rename", map[string]string{
8080
"_csrf": htmlDoc.GetCSRF(),
8181
"from": "branch2",
8282
"to": "branch1",
@@ -103,7 +103,7 @@ func testRenameBranch(t *testing.T, u *url.URL) {
103103
assert.True(t, branch1.IsDeleted) // virtual deletion
104104

105105
// rename branch2 to branch1 again
106-
req = NewRequestWithValues(t, "POST", "/user2/repo1/settings/rename_branch", map[string]string{
106+
req = NewRequestWithValues(t, "POST", "/user2/repo1/branches/rename", map[string]string{
107107
"_csrf": htmlDoc.GetCSRF(),
108108
"from": "branch2",
109109
"to": "branch1",

0 commit comments

Comments
 (0)