From 5e73c67d6744931c7cdb7df6a6d8f3f1ae913452 Mon Sep 17 00:00:00 2001 From: oliverpool Date: Wed, 15 May 2024 15:42:29 +0200 Subject: [PATCH] fix: hook post-receive for sha256 repos --- cmd/hook.go | 14 ++++++-------- models/repo/repo.go | 2 +- modules/git/object_format.go | 1 + modules/git/object_id.go | 20 ++++++++++++++------ modules/git/object_id_test.go | 24 ++++++++++++++++++++++++ modules/repository/push.go | 6 ++---- routers/private/hook_post_receive.go | 2 +- services/actions/notifier.go | 3 +-- 8 files changed, 50 insertions(+), 22 deletions(-) diff --git a/cmd/hook.go b/cmd/hook.go index 4f73f8e2b..f8184f969 100644 --- a/cmd/hook.go +++ b/cmd/hook.go @@ -316,12 +316,12 @@ func runHookUpdate(c *cli.Context) error { return nil } - // Deletion of the ref means that the new commit ID is only composed of '0'. - if strings.ContainsFunc(newCommitID, func(e rune) bool { return e != '0' }) { - return nil + // Empty new commit ID means deletion. + if git.IsEmptyCommitID(newCommitID, nil) { + return fail(ctx, fmt.Sprintf("The deletion of %s is skipped as it's an internal reference.", refFullName), "") } - return fail(ctx, fmt.Sprintf("The deletion of %s is skipped as it's an internal reference.", refFullName), "") + return nil } func runHookPostReceive(c *cli.Context) error { @@ -405,8 +405,7 @@ Forgejo or set your environment appropriately.`, "") newCommitIDs[count] = string(fields[1]) refFullNames[count] = git.RefName(fields[2]) - commitID, _ := git.NewIDFromString(newCommitIDs[count]) - if refFullNames[count] == git.BranchPrefix+"master" && !commitID.IsZero() && count == total { + if refFullNames[count] == git.BranchPrefix+"master" && !git.IsEmptyCommitID(newCommitIDs[count], nil) && count == total { masterPushed = true } count++ @@ -697,8 +696,7 @@ Forgejo or set your environment appropriately.`, "") if err != nil { return err } - commitID, _ := git.NewIDFromString(rs.OldOID) - if !commitID.IsZero() { + if !git.IsEmptyCommitID(rs.OldOID, nil) { err = writeDataPktLine(ctx, os.Stdout, []byte("option old-oid "+rs.OldOID)) if err != nil { return err diff --git a/models/repo/repo.go b/models/repo/repo.go index 86bd368d0..28471159d 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -329,7 +329,7 @@ func (repo *Repository) HTMLURL() string { // CommitLink make link to by commit full ID // note: won't check whether it's an right id func (repo *Repository) CommitLink(commitID string) (result string) { - if git.IsEmptyCommitID(commitID) { + if git.IsEmptyCommitID(commitID, nil) { result = "" } else { result = repo.Link() + "/commit/" + url.PathEscape(commitID) diff --git a/modules/git/object_format.go b/modules/git/object_format.go index c2fcf4c06..2b462589a 100644 --- a/modules/git/object_format.go +++ b/modules/git/object_format.go @@ -122,6 +122,7 @@ func (h Sha256ObjectFormatImpl) ComputeHash(t ObjectType, content []byte) Object var ( Sha1ObjectFormat ObjectFormat = Sha1ObjectFormatImpl{} Sha256ObjectFormat ObjectFormat = Sha256ObjectFormatImpl{} + // any addition must be reflected in IsEmptyCommitID ) var SupportedObjectFormats = []ObjectFormat{ diff --git a/modules/git/object_id.go b/modules/git/object_id.go index 4f8c39ee1..26736bb76 100644 --- a/modules/git/object_id.go +++ b/modules/git/object_id.go @@ -79,17 +79,25 @@ func NewIDFromString(hexHash string) (ObjectID, error) { return theObjectFormat.MustID(b), nil } -func IsEmptyCommitID(commitID string) bool { +// IsEmptyCommitID checks if an hexadecimal string represents an empty commit according to git (only '0'). +// If objectFormat is not nil, the length will be checked as well (otherwise the lenght must match the sha1 or sha256 length). +func IsEmptyCommitID(commitID string, objectFormat ObjectFormat) bool { if commitID == "" { return true } - - id, err := NewIDFromString(commitID) - if err != nil { + if objectFormat == nil { + if Sha1ObjectFormat.FullLength() != len(commitID) && Sha256ObjectFormat.FullLength() != len(commitID) { + return false + } + } else if objectFormat.FullLength() != len(commitID) { return false } - - return id.IsZero() + for _, c := range commitID { + if c != '0' { + return false + } + } + return true } // ComputeBlobHash compute the hash for a given blob content diff --git a/modules/git/object_id_test.go b/modules/git/object_id_test.go index 6f365d6b1..00a24e398 100644 --- a/modules/git/object_id_test.go +++ b/modules/git/object_id_test.go @@ -23,3 +23,27 @@ func TestIsValidSHAPattern(t *testing.T) { assert.Equal(t, "d5c6407415d85df49592672aa421aed39b9db5e3", ComputeBlobHash(Sha1ObjectFormat, []byte("same length blob")).String()) assert.Equal(t, "df0b5174ed06ae65aea40d43316bcbc21d82c9e3158ce2661df2ad28d7931dd6", ComputeBlobHash(Sha256ObjectFormat, []byte("some random blob")).String()) } + +func TestIsEmptyCommitID(t *testing.T) { + assert.True(t, IsEmptyCommitID("", nil)) + assert.True(t, IsEmptyCommitID("", Sha1ObjectFormat)) + assert.True(t, IsEmptyCommitID("", Sha256ObjectFormat)) + + assert.False(t, IsEmptyCommitID("79ee38a6416c1ede423ec7ee0a8639ceea4aad20", Sha1ObjectFormat)) + assert.True(t, IsEmptyCommitID("0000000000000000000000000000000000000000", nil)) + assert.True(t, IsEmptyCommitID("0000000000000000000000000000000000000000", Sha1ObjectFormat)) + assert.False(t, IsEmptyCommitID("0000000000000000000000000000000000000000", Sha256ObjectFormat)) + + assert.False(t, IsEmptyCommitID("00000000000000000000000000000000000000000", nil)) + + assert.False(t, IsEmptyCommitID("0f0b5174ed06ae65aea40d43316bcbc21d82c9e3158ce2661df2ad28d7931dd6", nil)) + assert.True(t, IsEmptyCommitID("0000000000000000000000000000000000000000000000000000000000000000", nil)) + assert.False(t, IsEmptyCommitID("0000000000000000000000000000000000000000000000000000000000000000", Sha1ObjectFormat)) + assert.True(t, IsEmptyCommitID("0000000000000000000000000000000000000000000000000000000000000000", Sha256ObjectFormat)) + + assert.False(t, IsEmptyCommitID("1", nil)) + assert.False(t, IsEmptyCommitID("0", nil)) + + assert.False(t, IsEmptyCommitID("010", nil)) + assert.False(t, IsEmptyCommitID("0 0", nil)) +} diff --git a/modules/repository/push.go b/modules/repository/push.go index 751ee83a0..66d0417ca 100644 --- a/modules/repository/push.go +++ b/modules/repository/push.go @@ -21,14 +21,12 @@ type PushUpdateOptions struct { // IsNewRef return true if it's a first-time push to a branch, tag or etc. func (opts *PushUpdateOptions) IsNewRef() bool { - commitID, err := git.NewIDFromString(opts.OldCommitID) - return err == nil && commitID.IsZero() + return git.IsEmptyCommitID(opts.OldCommitID, nil) } // IsDelRef return true if it's a deletion to a branch or tag func (opts *PushUpdateOptions) IsDelRef() bool { - commitID, err := git.NewIDFromString(opts.NewCommitID) - return err == nil && commitID.IsZero() + return git.IsEmptyCommitID(opts.NewCommitID, nil) } // IsUpdateRef return true if it's an update operation diff --git a/routers/private/hook_post_receive.go b/routers/private/hook_post_receive.go index 10b300f3d..b78f19d51 100644 --- a/routers/private/hook_post_receive.go +++ b/routers/private/hook_post_receive.go @@ -239,7 +239,7 @@ func HookPostReceive(ctx *gitea_context.PrivateContext) { } // If we've pushed a branch (and not deleted it) - if !git.IsEmptyCommitID(newCommitID) && refFullName.IsBranch() { + if !git.IsEmptyCommitID(newCommitID, nil) && refFullName.IsBranch() { // First ensure we have the repository loaded, we're allowed pulls requests and we can get the base repo if repo == nil { repo = loadRepository(ctx, ownerName, repoName) diff --git a/services/actions/notifier.go b/services/actions/notifier.go index 6551da39e..3a6dd9db5 100644 --- a/services/actions/notifier.go +++ b/services/actions/notifier.go @@ -515,8 +515,7 @@ func (*actionsNotifier) MergePullRequest(ctx context.Context, doer *user_model.U } func (n *actionsNotifier) PushCommits(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits) { - commitID, _ := git.NewIDFromString(opts.NewCommitID) - if commitID.IsZero() { + if git.IsEmptyCommitID(opts.NewCommitID, nil) { log.Trace("new commitID is empty") return }