lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure default gpg settings not nil and found commits have reference to repo (#8604) 

* Ensure defaultGPGSettings not nil

* Ensure that coerced commits gain a reference to the repo

* Add warning if trying to get defaultgpgsetting on an unattached commit
release/v1.15
zeripath 2019-10-20 23:26:36 +01:00 committed by GitHub
parent c8f3146cd5
commit 28f60bb5cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/gpg_key.go
View File

@ -682,6 +682,8 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification {
defaultGPGSettings, err := c.GetRepositoryDefaultPublicGPGKey(false) defaultGPGSettings, err := c.GetRepositoryDefaultPublicGPGKey(false)
if err != nil { if err != nil {
log.Error("Error getting default public gpg key: %v", err) log.Error("Error getting default public gpg key: %v", err)
} else if defaultGPGSettings == nil {
log.Warn("Unable to get defaultGPGSettings for unattached commit: %s", c.ID.String())
} else if defaultGPGSettings.Sign { } else if defaultGPGSettings.Sign {
if commitVerification := verifyWithGPGSettings(defaultGPGSettings, sig, c.Signature.Payload, committer, keyID); commitVerification != nil { if commitVerification := verifyWithGPGSettings(defaultGPGSettings, sig, c.Signature.Payload, committer, keyID); commitVerification != nil {
if commitVerification.Reason == BadSignature { if commitVerification.Reason == BadSignature {

1
modules/git/commit_info.go
View File

@ -72,6 +72,7 @@ func (tes Entries) GetCommitsInfo(commit *Commit, treePath string, cache LastCom
treeCommit = commit treeCommit = commit
} else if rev, ok := revs[""]; ok { } else if rev, ok := revs[""]; ok {
treeCommit = convertCommit(rev) treeCommit = convertCommit(rev)
treeCommit.repo = commit.repo
} }
return commitsInfo, treeCommit, nil return commitsInfo, treeCommit, nil
} }