diff options
| author | Gusted <postmaster@gusted.xyz> | 2022-12-30 05:53:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-30 12:53:05 +0800 |
| commit | b76970f2e45d04d363fd6897439f111db24e4bca (patch) | |
| tree | 9c85abeaf18b6560e092c7a08d3e07249da20df9 /models | |
| parent | a609cae9fbdda5612da9e2ad84dd9afbcf2028ef (diff) | |
| download | gitea-b76970f2e45d04d363fd6897439f111db24e4bca.tar.gz gitea-b76970f2e45d04d363fd6897439f111db24e4bca.zip | |
Fix key signature error page (#22229)
- When the GPG key contains an error, such as an invalid signature or an
email address that does not match the user.A page will be shown that
says you must provide a signature for the token.
- This page had two errors: one had the wrong translation key and the
other tried to use an undefined variable
[`.PaddedKeyID`](https://github.com/go-gitea/gitea/blob/e81ccc406bf723a5a58d685e7782f281736affd4/models/asymkey/gpg_key.go#L65-L72),
which is a function implemented on the `GPGKey` struct, given that we
don't have that, we use
[`KeyID`](https://github.com/go-gitea/gitea/blob/e81ccc406bf723a5a58d685e7782f281736affd4/routers/web/user/setting/keys.go#L102)
which is [the fingerprint of the
publickey](https://pkg.go.dev/golang.org/x/crypto/openpgp/packet#PublicKey.KeyIdString)
and is a valid way for opengpg to refer to a key.
Before:
After:
Co-authored-by: zeripath <art27@cantab.net>
Diffstat (limited to 'models')
| -rw-r--r-- | models/asymkey/gpg_key.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/models/asymkey/gpg_key.go b/models/asymkey/gpg_key.go index ecd9041e65..be019184eb 100644 --- a/models/asymkey/gpg_key.go +++ b/models/asymkey/gpg_key.go @@ -64,11 +64,16 @@ func (key *GPGKey) AfterLoad(session *xorm.Session) { // PaddedKeyID show KeyID padded to 16 characters func (key *GPGKey) PaddedKeyID() string { - if len(key.KeyID) > 15 { - return key.KeyID + return PaddedKeyID(key.KeyID) +} + +// PaddedKeyID show KeyID padded to 16 characters +func PaddedKeyID(keyID string) string { + if len(keyID) > 15 { + return keyID } zeros := "0000000000000000" - return zeros[0:16-len(key.KeyID)] + key.KeyID + return zeros[0:16-len(keyID)] + keyID } // ListGPGKeys returns a list of public keys belongs to given user. |