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 /templates | |
| 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 'templates')
| -rw-r--r-- | templates/user/settings/keys_gpg.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index fe6c0bbeb1..0968069c3a 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -18,7 +18,7 @@ <p>{{.locale.Tr "settings.gpg_token_required"}}</p> </div> <div class="field"> - <label for="token">{{.locale.Tr "setting.gpg_token"}} + <label for="token">{{.locale.Tr "settings.gpg_token"}} <input readonly="" value="{{.TokenToSign}}"> <div class="help"> <p>{{.locale.Tr "settings.gpg_token_help"}}</p> |