Protect default branch against deletion #11115
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e but now go-code take care of it too)
6543
force-pushed
the
prevent-default-branch-deletion-in-go-code
branch
from
4e1a99d
to
3e4411f
Compare
6543
changed the title
zeripath
reviewed
May 6, 2020
GiteaBot
added
the
lgtm/need 2
zeripath
reviewed
May 6, 2020
|
Also need to add to pre-receive hook |
--- a/routers/private/hook.go
+++ b/routers/private/hook.go
@@ -206,6 +206,14 @@ func HookPreReceive(ctx *macaron.Context, opts private.HookOptions) {
refFullName := opts.RefFullNames[i]
branchName := strings.TrimPrefix(refFullName, git.BranchPrefix)
+ if branchName == repo.DefaultBranch && newCommitID == git.EmptySHA {
+ log.Warn("Forbidden: Branch: %s is the default branch in %-v and cannot be deleted", branchName, repo)
+ ctx.JSON(http.StatusForbidden, map[string]interface{}{
+ "err": fmt.Sprintf("branch %s is the default branch and cannot be deleted", branchName),
+ })
+ return
+ }
+
protectBranch, err := models.GetProtectedBranchBy(repo.ID, branchName)
if err != nil {
log.Error("Unable to get protected branch: %s in %-v Error: %v", branchName, repo, err)
|
Codecov Report
@@ Coverage Diff @@
## master #11115 +/- ##
==========================================
- Coverage 43.86% 43.84% -0.02%
==========================================
Files 607 607
Lines 86909 86913 +4
==========================================
- Hits 38121 38110 -11
- Misses 44090 44100 +10
- Partials 4698 4703 +5
Continue to review full report at Codecov.
|
Signed-off-by: Andrew Thornton <[email protected]>
lafriks
reviewed
May 6, 2020
lafriks
approved these changes
May 6, 2020
GiteaBot
added
lgtm/need 1
Co-authored-by: Lauris BH <[email protected]>
zeripath
reviewed
May 6, 2020
GiteaBot
added
lgtm/done
zeripath
changed the title
ydelafollye
pushed a commit
to ydelafollye/gitea
that referenced
this pull request
Jul 31, 2020
Although default branch is not offered for deletion in the templates, we need to prevent it both at the router level and in the pre-receive hook. Co-authored-by: Andrew Thornton <[email protected]> Co-authored-by: Lauris BH <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Although default branch is not offered for deletion in the templates, we need to prevent it both at the router level and in the pre-receive hook.