diff options
| author | zeripath <art27@cantab.net> | 2019-10-16 14:42:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-16 14:42:42 +0100 |
| commit | fcb535c5c3b6b782d9242028fed4cd8c027c4e41 (patch) | |
| tree | 49c49fd1f040b9dcd600ec8e381df80532bc2701 /templates/repo/commits_table.tmpl | |
| parent | 1b72690cb82302b24f41d2beaa5df5592709f4d3 (diff) | |
| download | gitea-fcb535c5c3b6b782d9242028fed4cd8c027c4e41.tar.gz gitea-fcb535c5c3b6b782d9242028fed4cd8c027c4e41.zip | |
Sign merges, CRUD, Wiki and Repository initialisation with gpg key (#7631)
This PR fixes #7598 by providing a configurable way of signing commits across the Gitea instance. Per repository configurability and import/generation of trusted secure keys is not provided by this PR - from a security PoV that's probably impossible to do properly. Similarly web-signing, that is asking the user to sign something, is not implemented - this could be done at a later stage however.
## Features
- [x] If commit.gpgsign is set in .gitconfig sign commits and files created through repofiles. (merges should already have been signed.)
- [x] Verify commits signed with the default gpg as valid
- [x] Signer, Committer and Author can all be different
- [x] Allow signer to be arbitrarily different - We still require the key to have an activated email on Gitea. A more complete implementation would be to use a keyserver and mark external-or-unactivated with an "unknown" trust level icon.
- [x] Add a signing-key.gpg endpoint to get the default gpg pub key if available
- Rather than add a fake web-flow user I've added this as an endpoint on /api/v1/signing-key.gpg
- [x] Try to match the default key with a user on gitea - this is done at verification time
- [x] Make things configurable?
- app.ini configuration done
- [x] when checking commits are signed need to check if they're actually verifiable too
- [x] Add documentation
I have decided that adjusting the docker to create a default gpg key is not the correct thing to do and therefore have not implemented this.
Diffstat (limited to 'templates/repo/commits_table.tmpl')
| -rw-r--r-- | templates/repo/commits_table.tmpl | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index e11bbee0e8..09a2c072b1 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -56,12 +56,21 @@ {{end}} </td> <td class="sha"> - <a rel="nofollow" class="ui sha label {{if .Signature}} isSigned {{if .Verification.Verified }} isVerified {{end}}{{end}}" href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{.ID}}"> + <a rel="nofollow" class="ui sha label {{if .Signature}} isSigned {{if .Verification.Verified }} isVerified {{else if .Verification.Warning}} isWarning {{end}}{{end}}" href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{.ID}}"> {{ShortSha .ID.String}} {{if .Signature}} <div class="ui detail icon button"> {{if .Verification.Verified}} - <i title="{{.Verification.Reason}}" class="lock green icon"></i> + {{if ne .Verification.SigningUser.ID 0}} + <i title="{{.Verification.Reason}}" class="lock green icon"></i> + {{else}} + <i title="{{.Verification.Reason}}" class="icons"> + <i class="green lock icon"></i> + <i class="tiny inverted cog icon centerlock"></i> + </i> + {{end}} + {{else if .Verification.Warning}} + <i title="{{$.i18n.Tr .Verification.Reason}}" class="red unlock icon"></i> {{else}} <i title="{{$.i18n.Tr .Verification.Reason}}" class="unlock icon"></i> {{end}} |