mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-14 05:01:13 +00:00
5561e80b04
If a repository has git config --add push.pushOption submit=".sourcehut/*.yml" it failed when pushed because of the unknown submit push option. It will be ignored instead. Filtering out the push options is done in an earlier stage, when the hook command runs, before it submits the options map to the private endpoint. * move all the push options logic to modules/git/pushoptions * add 100% test coverage for modules/git/pushoptions Test coverage for the code paths from which code was moved to the modules/git/pushoptions package: * cmd/hook.go:runHookPreReceive * routers/private/hook_pre_receive.go:validatePushOptions tests/integration/git_push_test.go:TestOptionsGitPush runs through both. The test verifying the option is rejected was removed and, if added again, will fail because the option is now ignored instead of being rejected. * cmd/hook.go:runHookProcReceive * services/agit/agit.go:ProcReceive tests/integration/git_test.go: doCreateAgitFlowPull runs through both. It uses variations of AGit related push options. * cmd/hook.go:runHookPostReceive * routers/private/hook_post_receive.go:HookPostReceive tests/integration/git_test.go:doPushCreate called by TestGit/HTTP/sha1/PushCreate runs through both. Note that although it provides coverage for this code path it does not use push options. Fixes: https://codeberg.org/forgejo/forgejo/issues/3651
368 lines
13 KiB
Go
368 lines
13 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package private
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/http"
|
|
"strconv"
|
|
"time"
|
|
|
|
"code.gitea.io/gitea/models/db"
|
|
git_model "code.gitea.io/gitea/models/git"
|
|
issues_model "code.gitea.io/gitea/models/issues"
|
|
pull_model "code.gitea.io/gitea/models/pull"
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/cache"
|
|
"code.gitea.io/gitea/modules/git"
|
|
"code.gitea.io/gitea/modules/git/pushoptions"
|
|
"code.gitea.io/gitea/modules/gitrepo"
|
|
"code.gitea.io/gitea/modules/log"
|
|
"code.gitea.io/gitea/modules/private"
|
|
repo_module "code.gitea.io/gitea/modules/repository"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
timeutil "code.gitea.io/gitea/modules/timeutil"
|
|
"code.gitea.io/gitea/modules/util"
|
|
"code.gitea.io/gitea/modules/web"
|
|
gitea_context "code.gitea.io/gitea/services/context"
|
|
repo_service "code.gitea.io/gitea/services/repository"
|
|
)
|
|
|
|
// HookPostReceive updates services and users
|
|
func HookPostReceive(ctx *gitea_context.PrivateContext) {
|
|
opts := web.GetForm(ctx).(*private.HookOptions)
|
|
|
|
// We don't rely on RepoAssignment here because:
|
|
// a) we don't need the git repo in this function
|
|
// OUT OF DATE: we do need the git repo to sync the branch to the db now.
|
|
// b) our update function will likely change the repository in the db so we will need to refresh it
|
|
// c) we don't always need the repo
|
|
|
|
ownerName := ctx.Params(":owner")
|
|
repoName := ctx.Params(":repo")
|
|
|
|
// defer getting the repository at this point - as we should only retrieve it if we're going to call update
|
|
var (
|
|
repo *repo_model.Repository
|
|
gitRepo *git.Repository
|
|
)
|
|
defer gitRepo.Close() // it's safe to call Close on a nil pointer
|
|
|
|
updates := make([]*repo_module.PushUpdateOptions, 0, len(opts.OldCommitIDs))
|
|
wasEmpty := false
|
|
|
|
for i := range opts.OldCommitIDs {
|
|
refFullName := opts.RefFullNames[i]
|
|
|
|
// Only trigger activity updates for changes to branches or
|
|
// tags. Updates to other refs (eg, refs/notes, refs/changes,
|
|
// or other less-standard refs spaces are ignored since there
|
|
// may be a very large number of them).
|
|
if refFullName.IsBranch() || refFullName.IsTag() {
|
|
if repo == nil {
|
|
repo = loadRepository(ctx, ownerName, repoName)
|
|
if ctx.Written() {
|
|
// Error handled in loadRepository
|
|
return
|
|
}
|
|
wasEmpty = repo.IsEmpty
|
|
}
|
|
|
|
option := &repo_module.PushUpdateOptions{
|
|
RefFullName: refFullName,
|
|
OldCommitID: opts.OldCommitIDs[i],
|
|
NewCommitID: opts.NewCommitIDs[i],
|
|
PusherID: opts.UserID,
|
|
PusherName: opts.UserName,
|
|
RepoUserName: ownerName,
|
|
RepoName: repoName,
|
|
TimeNano: time.Now().UnixNano(),
|
|
}
|
|
updates = append(updates, option)
|
|
if repo.IsEmpty && (refFullName.BranchName() == "master" || refFullName.BranchName() == "main") {
|
|
// put the master/main branch first
|
|
// FIXME: It doesn't always work, since the master/main branch may not be the first batch of updates.
|
|
// If the user pushes many branches at once, the Git hook will call the internal API in batches, rather than all at once.
|
|
// See https://github.com/go-gitea/gitea/blob/cb52b17f92e2d2293f7c003649743464492bca48/cmd/hook.go#L27
|
|
// If the user executes `git push origin --all` and pushes more than 30 branches, the master/main may not be the default branch.
|
|
copy(updates[1:], updates)
|
|
updates[0] = option
|
|
}
|
|
}
|
|
}
|
|
|
|
if repo != nil && len(updates) > 0 {
|
|
branchesToSync := make([]*repo_module.PushUpdateOptions, 0, len(updates))
|
|
for _, update := range updates {
|
|
if !update.RefFullName.IsBranch() {
|
|
continue
|
|
}
|
|
if repo == nil {
|
|
repo = loadRepository(ctx, ownerName, repoName)
|
|
if ctx.Written() {
|
|
return
|
|
}
|
|
wasEmpty = repo.IsEmpty
|
|
}
|
|
|
|
if update.IsDelRef() {
|
|
if err := git_model.AddDeletedBranch(ctx, repo.ID, update.RefFullName.BranchName(), update.PusherID); err != nil {
|
|
log.Error("Failed to add deleted branch: %s/%s Error: %v", ownerName, repoName, err)
|
|
ctx.JSON(http.StatusInternalServerError, private.HookPostReceiveResult{
|
|
Err: fmt.Sprintf("Failed to add deleted branch: %s/%s Error: %v", ownerName, repoName, err),
|
|
})
|
|
return
|
|
}
|
|
} else {
|
|
branchesToSync = append(branchesToSync, update)
|
|
}
|
|
}
|
|
if len(branchesToSync) > 0 {
|
|
var err error
|
|
gitRepo, err = gitrepo.OpenRepository(ctx, repo)
|
|
if err != nil {
|
|
log.Error("Failed to open repository: %s/%s Error: %v", ownerName, repoName, err)
|
|
ctx.JSON(http.StatusInternalServerError, private.HookPostReceiveResult{
|
|
Err: fmt.Sprintf("Failed to open repository: %s/%s Error: %v", ownerName, repoName, err),
|
|
})
|
|
return
|
|
}
|
|
|
|
var (
|
|
branchNames = make([]string, 0, len(branchesToSync))
|
|
commitIDs = make([]string, 0, len(branchesToSync))
|
|
)
|
|
for _, update := range branchesToSync {
|
|
branchNames = append(branchNames, update.RefFullName.BranchName())
|
|
commitIDs = append(commitIDs, update.NewCommitID)
|
|
}
|
|
|
|
if err := repo_service.SyncBranchesToDB(ctx, repo.ID, opts.UserID, branchNames, commitIDs, gitRepo.GetCommit); err != nil {
|
|
ctx.JSON(http.StatusInternalServerError, private.HookPostReceiveResult{
|
|
Err: fmt.Sprintf("Failed to sync branch to DB in repository: %s/%s Error: %v", ownerName, repoName, err),
|
|
})
|
|
return
|
|
}
|
|
}
|
|
|
|
if err := repo_service.PushUpdates(updates); err != nil {
|
|
log.Error("Failed to Update: %s/%s Total Updates: %d", ownerName, repoName, len(updates))
|
|
for i, update := range updates {
|
|
log.Error("Failed to Update: %s/%s Update: %d/%d: Branch: %s", ownerName, repoName, i, len(updates), update.RefFullName.BranchName())
|
|
}
|
|
log.Error("Failed to Update: %s/%s Error: %v", ownerName, repoName, err)
|
|
|
|
ctx.JSON(http.StatusInternalServerError, private.HookPostReceiveResult{
|
|
Err: fmt.Sprintf("Failed to Update: %s/%s Error: %v", ownerName, repoName, err),
|
|
})
|
|
return
|
|
}
|
|
}
|
|
|
|
// handle pull request merging, a pull request action should push at least 1 commit
|
|
if opts.PushTrigger == repo_module.PushTriggerPRMergeToBase {
|
|
handlePullRequestMerging(ctx, opts, ownerName, repoName, updates)
|
|
if ctx.Written() {
|
|
return
|
|
}
|
|
}
|
|
|
|
// Handle Push Options
|
|
if !opts.GetGitPushOptions().Empty() {
|
|
// load the repository
|
|
if repo == nil {
|
|
repo = loadRepository(ctx, ownerName, repoName)
|
|
if ctx.Written() {
|
|
// Error handled in loadRepository
|
|
return
|
|
}
|
|
wasEmpty = repo.IsEmpty
|
|
}
|
|
|
|
repo.IsPrivate = opts.GetGitPushOptions().GetBool(pushoptions.RepoPrivate, repo.IsPrivate)
|
|
repo.IsTemplate = opts.GetGitPushOptions().GetBool(pushoptions.RepoTemplate, repo.IsTemplate)
|
|
if err := repo_model.UpdateRepositoryCols(ctx, repo, "is_private", "is_template"); err != nil {
|
|
log.Error("Failed to Update: %s/%s Error: %v", ownerName, repoName, err)
|
|
ctx.JSON(http.StatusInternalServerError, private.HookPostReceiveResult{
|
|
Err: fmt.Sprintf("Failed to Update: %s/%s Error: %v", ownerName, repoName, err),
|
|
})
|
|
}
|
|
}
|
|
|
|
results := make([]private.HookPostReceiveBranchResult, 0, len(opts.OldCommitIDs))
|
|
|
|
// We have to reload the repo in case its state is changed above
|
|
repo = nil
|
|
var baseRepo *repo_model.Repository
|
|
|
|
// Now handle the pull request notification trailers
|
|
for i := range opts.OldCommitIDs {
|
|
refFullName := opts.RefFullNames[i]
|
|
newCommitID := opts.NewCommitIDs[i]
|
|
|
|
// post update for agit pull request
|
|
// FIXME: use pr.Flow to test whether it's an Agit PR or a GH PR
|
|
if git.SupportProcReceive && refFullName.IsPull() {
|
|
if repo == nil {
|
|
repo = loadRepository(ctx, ownerName, repoName)
|
|
if ctx.Written() {
|
|
return
|
|
}
|
|
}
|
|
|
|
pullIndex, _ := strconv.ParseInt(refFullName.PullName(), 10, 64)
|
|
if pullIndex <= 0 {
|
|
continue
|
|
}
|
|
|
|
pr, err := issues_model.GetPullRequestByIndex(ctx, repo.ID, pullIndex)
|
|
if err != nil && !issues_model.IsErrPullRequestNotExist(err) {
|
|
log.Error("Failed to get PR by index %v Error: %v", pullIndex, err)
|
|
ctx.JSON(http.StatusInternalServerError, private.Response{
|
|
Err: fmt.Sprintf("Failed to get PR by index %v Error: %v", pullIndex, err),
|
|
})
|
|
return
|
|
}
|
|
if pr == nil {
|
|
continue
|
|
}
|
|
|
|
results = append(results, private.HookPostReceiveBranchResult{
|
|
Message: setting.Git.PullRequestPushMessage && repo.AllowsPulls(ctx),
|
|
Create: false,
|
|
Branch: "",
|
|
URL: fmt.Sprintf("%s/pulls/%d", repo.HTMLURL(), pr.Index),
|
|
})
|
|
continue
|
|
}
|
|
|
|
// If we've pushed a branch (and not deleted it)
|
|
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)
|
|
if ctx.Written() {
|
|
return
|
|
}
|
|
|
|
baseRepo = repo
|
|
|
|
if repo.IsFork {
|
|
if err := repo.GetBaseRepo(ctx); err != nil {
|
|
log.Error("Failed to get Base Repository of Forked repository: %-v Error: %v", repo, err)
|
|
ctx.JSON(http.StatusInternalServerError, private.HookPostReceiveResult{
|
|
Err: fmt.Sprintf("Failed to get Base Repository of Forked repository: %-v Error: %v", repo, err),
|
|
RepoWasEmpty: wasEmpty,
|
|
})
|
|
return
|
|
}
|
|
if repo.BaseRepo.AllowsPulls(ctx) {
|
|
baseRepo = repo.BaseRepo
|
|
}
|
|
}
|
|
|
|
if !baseRepo.AllowsPulls(ctx) {
|
|
// We can stop there's no need to go any further
|
|
ctx.JSON(http.StatusOK, private.HookPostReceiveResult{
|
|
RepoWasEmpty: wasEmpty,
|
|
})
|
|
return
|
|
}
|
|
}
|
|
|
|
branch := refFullName.BranchName()
|
|
|
|
// If our branch is the default branch of an unforked repo - there's no PR to create or refer to
|
|
if !repo.IsFork && branch == baseRepo.DefaultBranch {
|
|
results = append(results, private.HookPostReceiveBranchResult{})
|
|
continue
|
|
}
|
|
|
|
pr, err := issues_model.GetUnmergedPullRequest(ctx, repo.ID, baseRepo.ID, branch, baseRepo.DefaultBranch, issues_model.PullRequestFlowGithub)
|
|
if err != nil && !issues_model.IsErrPullRequestNotExist(err) {
|
|
log.Error("Failed to get active PR in: %-v Branch: %s to: %-v Branch: %s Error: %v", repo, branch, baseRepo, baseRepo.DefaultBranch, err)
|
|
ctx.JSON(http.StatusInternalServerError, private.HookPostReceiveResult{
|
|
Err: fmt.Sprintf(
|
|
"Failed to get active PR in: %-v Branch: %s to: %-v Branch: %s Error: %v", repo, branch, baseRepo, baseRepo.DefaultBranch, err),
|
|
RepoWasEmpty: wasEmpty,
|
|
})
|
|
return
|
|
}
|
|
|
|
if pr == nil {
|
|
if repo.IsFork {
|
|
branch = fmt.Sprintf("%s:%s", repo.OwnerName, branch)
|
|
}
|
|
results = append(results, private.HookPostReceiveBranchResult{
|
|
Message: setting.Git.PullRequestPushMessage && baseRepo.AllowsPulls(ctx),
|
|
Create: true,
|
|
Branch: branch,
|
|
URL: fmt.Sprintf("%s/compare/%s...%s", baseRepo.HTMLURL(), util.PathEscapeSegments(baseRepo.DefaultBranch), util.PathEscapeSegments(branch)),
|
|
})
|
|
} else {
|
|
results = append(results, private.HookPostReceiveBranchResult{
|
|
Message: setting.Git.PullRequestPushMessage && baseRepo.AllowsPulls(ctx),
|
|
Create: false,
|
|
Branch: branch,
|
|
URL: fmt.Sprintf("%s/pulls/%d", baseRepo.HTMLURL(), pr.Index),
|
|
})
|
|
}
|
|
}
|
|
}
|
|
ctx.JSON(http.StatusOK, private.HookPostReceiveResult{
|
|
Results: results,
|
|
RepoWasEmpty: wasEmpty,
|
|
})
|
|
}
|
|
|
|
func loadContextCacheUser(ctx context.Context, id int64) (*user_model.User, error) {
|
|
return cache.GetWithContextCache(ctx, "hook_post_receive_user", id, func() (*user_model.User, error) {
|
|
return user_model.GetUserByID(ctx, id)
|
|
})
|
|
}
|
|
|
|
// handlePullRequestMerging handle pull request merging, a pull request action should push at least 1 commit
|
|
func handlePullRequestMerging(ctx *gitea_context.PrivateContext, opts *private.HookOptions, ownerName, repoName string, updates []*repo_module.PushUpdateOptions) {
|
|
if len(updates) == 0 {
|
|
ctx.JSON(http.StatusInternalServerError, private.HookPostReceiveResult{
|
|
Err: fmt.Sprintf("Pushing a merged PR (pr:%d) no commits pushed ", opts.PullRequestID),
|
|
})
|
|
return
|
|
}
|
|
|
|
pr, err := issues_model.GetPullRequestByID(ctx, opts.PullRequestID)
|
|
if err != nil {
|
|
log.Error("GetPullRequestByID[%d]: %v", opts.PullRequestID, err)
|
|
ctx.JSON(http.StatusInternalServerError, private.HookPostReceiveResult{Err: "GetPullRequestByID failed"})
|
|
return
|
|
}
|
|
|
|
pusher, err := loadContextCacheUser(ctx, opts.UserID)
|
|
if err != nil {
|
|
log.Error("Failed to Update: %s/%s Error: %v", ownerName, repoName, err)
|
|
ctx.JSON(http.StatusInternalServerError, private.HookPostReceiveResult{Err: "Load pusher user failed"})
|
|
return
|
|
}
|
|
|
|
pr.MergedCommitID = updates[len(updates)-1].NewCommitID
|
|
pr.MergedUnix = timeutil.TimeStampNow()
|
|
pr.Merger = pusher
|
|
pr.MergerID = pusher.ID
|
|
err = db.WithTx(ctx, func(ctx context.Context) error {
|
|
// Removing an auto merge pull and ignore if not exist
|
|
if err := pull_model.DeleteScheduledAutoMerge(ctx, pr.ID); err != nil && !db.IsErrNotExist(err) {
|
|
return fmt.Errorf("DeleteScheduledAutoMerge[%d]: %v", opts.PullRequestID, err)
|
|
}
|
|
if _, err := pr.SetMerged(ctx); err != nil {
|
|
return fmt.Errorf("SetMerged failed: %s/%s Error: %v", ownerName, repoName, err)
|
|
}
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
log.Error("Failed to update PR to merged: %v", err)
|
|
ctx.JSON(http.StatusInternalServerError, private.HookPostReceiveResult{Err: "Failed to update PR to merged"})
|
|
}
|
|
}
|