mirror of
https://github.com/go-gitea/gitea
synced 2024-11-14 06:04:25 +00:00
66ee9b87f9
* Add require signed commit for protected branch * Fix fmt * Make editor show if they will be signed * bugfix * Add basic merge check and better information for CRUD * linting comment * Add descriptors to merge signing * Slight refactor * Slight improvement to appearances * Handle Merge API * manage CRUD API * Move error to error.go * Remove fix to delete.go * prep for merge * need to tolerate \r\n in message * check protected branch before trying to load it * Apply suggestions from code review Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com> * fix commit-reader Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
131 lines
3.4 KiB
Go
131 lines
3.4 KiB
Go
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package models
|
|
|
|
import (
|
|
"code.gitea.io/gitea/modules/git"
|
|
"code.gitea.io/gitea/modules/log"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
)
|
|
|
|
// SignMerge determines if we should sign a PR merge commit to the base repository
|
|
func (pr *PullRequest) SignMerge(u *User, tmpBasePath, baseCommit, headCommit string) (bool, string, error) {
|
|
if err := pr.GetBaseRepo(); err != nil {
|
|
log.Error("Unable to get Base Repo for pull request")
|
|
return false, "", err
|
|
}
|
|
repo := pr.BaseRepo
|
|
|
|
signingKey := signingKey(repo.RepoPath())
|
|
if signingKey == "" {
|
|
return false, "", &ErrWontSign{noKey}
|
|
}
|
|
rules := signingModeFromStrings(setting.Repository.Signing.Merges)
|
|
|
|
var gitRepo *git.Repository
|
|
var err error
|
|
|
|
for _, rule := range rules {
|
|
switch rule {
|
|
case never:
|
|
return false, "", &ErrWontSign{never}
|
|
case always:
|
|
break
|
|
case pubkey:
|
|
keys, err := ListGPGKeys(u.ID)
|
|
if err != nil {
|
|
return false, "", err
|
|
}
|
|
if len(keys) == 0 {
|
|
return false, "", &ErrWontSign{pubkey}
|
|
}
|
|
case twofa:
|
|
twofaModel, err := GetTwoFactorByUID(u.ID)
|
|
if err != nil {
|
|
return false, "", err
|
|
}
|
|
if twofaModel == nil {
|
|
return false, "", &ErrWontSign{twofa}
|
|
}
|
|
case approved:
|
|
protectedBranch, err := GetProtectedBranchBy(repo.ID, pr.BaseBranch)
|
|
if err != nil {
|
|
return false, "", err
|
|
}
|
|
if protectedBranch == nil {
|
|
return false, "", &ErrWontSign{approved}
|
|
}
|
|
if protectedBranch.GetGrantedApprovalsCount(pr) < 1 {
|
|
return false, "", &ErrWontSign{approved}
|
|
}
|
|
case baseSigned:
|
|
if gitRepo == nil {
|
|
gitRepo, err = git.OpenRepository(tmpBasePath)
|
|
if err != nil {
|
|
return false, "", err
|
|
}
|
|
defer gitRepo.Close()
|
|
}
|
|
commit, err := gitRepo.GetCommit(baseCommit)
|
|
if err != nil {
|
|
return false, "", err
|
|
}
|
|
verification := ParseCommitWithSignature(commit)
|
|
if !verification.Verified {
|
|
return false, "", &ErrWontSign{baseSigned}
|
|
}
|
|
case headSigned:
|
|
if gitRepo == nil {
|
|
gitRepo, err = git.OpenRepository(tmpBasePath)
|
|
if err != nil {
|
|
return false, "", err
|
|
}
|
|
defer gitRepo.Close()
|
|
}
|
|
commit, err := gitRepo.GetCommit(headCommit)
|
|
if err != nil {
|
|
return false, "", err
|
|
}
|
|
verification := ParseCommitWithSignature(commit)
|
|
if !verification.Verified {
|
|
return false, "", &ErrWontSign{headSigned}
|
|
}
|
|
case commitsSigned:
|
|
if gitRepo == nil {
|
|
gitRepo, err = git.OpenRepository(tmpBasePath)
|
|
if err != nil {
|
|
return false, "", err
|
|
}
|
|
defer gitRepo.Close()
|
|
}
|
|
commit, err := gitRepo.GetCommit(headCommit)
|
|
if err != nil {
|
|
return false, "", err
|
|
}
|
|
verification := ParseCommitWithSignature(commit)
|
|
if !verification.Verified {
|
|
return false, "", &ErrWontSign{commitsSigned}
|
|
}
|
|
// need to work out merge-base
|
|
mergeBaseCommit, _, err := gitRepo.GetMergeBase("", baseCommit, headCommit)
|
|
if err != nil {
|
|
return false, "", err
|
|
}
|
|
commitList, err := commit.CommitsBeforeUntil(mergeBaseCommit)
|
|
if err != nil {
|
|
return false, "", err
|
|
}
|
|
for e := commitList.Front(); e != nil; e = e.Next() {
|
|
commit = e.Value.(*git.Commit)
|
|
verification := ParseCommitWithSignature(commit)
|
|
if !verification.Verified {
|
|
return false, "", &ErrWontSign{commitsSigned}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return true, signingKey, nil
|
|
}
|