diff options
| author | Anton Khimich <anton.khimich@gmail.com> | 2021-02-04 04:16:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-04 17:16:21 +0800 |
| commit | 80b1d02b2f631a9e68120715a82f7f41f203ef79 (patch) | |
| tree | adac8324961f81436ddb0a11ecc4bf93f9c99f1d /models/gpg_key.go | |
| parent | 3c965c3e308a9399b6598e9d0f545f4e31fc578d (diff) | |
| download | gitea-80b1d02b2f631a9e68120715a82f7f41f203ef79.tar.gz gitea-80b1d02b2f631a9e68120715a82f7f41f203ef79.zip | |
Fix gpg key deletion (#14561)
* Fix GPG key deletion when user is deleted
Per #14531, deleting a user account will delete the user's GPG keys
from the `gpg_key` table but not from `gpg_key_import`, which causes
an error when creating an account with the same email and attempting
to re-add the same key. This commit deletes all entries from
`gpg_key_import` that match any GPG key IDs belonging to the user.
* Format added code in models/user.go
* Create a new function for listing GPG keys and apply it
Create a new function `listGPGKeys` and replace a previous use
of `ListGPGKeys`. Thanks to @6543 for the patch.
Co-authored-by: Anton Khimich <anton.khimicha@mail.utoronto.ca>
Co-authored-by: 6543 <6543@obermui.de>
Diffstat (limited to 'models/gpg_key.go')
| -rw-r--r-- | models/gpg_key.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/models/gpg_key.go b/models/gpg_key.go index b944fdcbff..3e8ddd9621 100644 --- a/models/gpg_key.go +++ b/models/gpg_key.go @@ -65,7 +65,11 @@ func (key *GPGKey) AfterLoad(session *xorm.Session) { // ListGPGKeys returns a list of public keys belongs to given user. func ListGPGKeys(uid int64, listOptions ListOptions) ([]*GPGKey, error) { - sess := x.Where("owner_id=? AND primary_key_id=''", uid) + return listGPGKeys(x, uid, listOptions) +} + +func listGPGKeys(e Engine, uid int64, listOptions ListOptions) ([]*GPGKey, error) { + sess := e.Table(&GPGKey{}).Where("owner_id=? AND primary_key_id=''", uid) if listOptions.Page != 0 { sess = listOptions.setSessionPagination(sess) } |