diff options
| author | zeripath <art27@cantab.net> | 2021-07-13 14:28:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-13 15:28:07 +0200 |
| commit | b82293270c7d2d36d79cb9c5731d07c3f5b33f6b (patch) | |
| tree | a79131e08ecf19cc8e642fcc032bfee0e30959c0 /modules/convert/convert.go | |
| parent | 67f135ca5ddfcab4391a00af4936d0260079cd97 (diff) | |
| download | gitea-b82293270c7d2d36d79cb9c5731d07c3f5b33f6b.tar.gz gitea-b82293270c7d2d36d79cb9c5731d07c3f5b33f6b.zip | |
Add option to provide signature for a token to verify key ownership (#14054)
* Add option to provide signed token to verify key ownership
Currently we will only allow a key to be matched to a user if it matches
an activated email address. This PR provides a different mechanism - if
the user provides a signature for automatically generated token (based
on the timestamp, user creation time, user ID, username and primary
email.
* Ensure verified keys can act for all active emails for the user
* Add code to mark keys as verified
* Slight UI adjustments
* Slight UI adjustments 2
* Simplify signature verification slightly
* fix postgres test
* add api routes
* handle swapped primary-keys
* Verify the no-reply address for verified keys
* Only add email addresses that are activated to keys
* Fix committer shortcut properly
* Restructure gpg_keys.go
* Use common Verification Token code
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'modules/convert/convert.go')
| -rw-r--r-- | modules/convert/convert.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/convert/convert.go b/modules/convert/convert.go index 0b2135c580..9a4714b4e0 100644 --- a/modules/convert/convert.go +++ b/modules/convert/convert.go @@ -191,6 +191,7 @@ func ToGPGKey(key *models.GPGKey) *api.GPGKey { CanEncryptComms: k.CanEncryptComms, CanEncryptStorage: k.CanEncryptStorage, CanCertify: k.CanSign, + Verified: k.Verified, } } emails := make([]*api.GPGKeyEmail, len(key.Emails)) @@ -210,6 +211,7 @@ func ToGPGKey(key *models.GPGKey) *api.GPGKey { CanEncryptComms: key.CanEncryptComms, CanEncryptStorage: key.CanEncryptStorage, CanCertify: key.CanSign, + Verified: key.Verified, } } |