Go-Gitea
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge df88c51256 into 28debdbe00

pull/33631/merge
Bartlomiej Komendarczuk 2025-06-15 00:44:25 +02:00 committed by GitHub
parent 28debdbe00 df88c51256
commit 5ab68c003b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
models/asymkey/gpg_key.go
View File

@ -164,13 +164,17 @@ func parseGPGKey(ctx context.Context, ownerID int64, e *openpgp.Entity, verified
if ident.Revoked(time.Now()) { if ident.Revoked(time.Now()) {
continue continue
} }
email := strings.ToLower(strings.TrimSpace(ident.UserId.Email)) emailAddr := &user_model.EmailAddress{
Email: ident.UserId.Email,
LowerEmail: strings.ToLower(strings.TrimSpace(ident.UserId.Email)),
IsActivated: false,
}
for _, e := range userEmails { for _, e := range userEmails {
if e.IsActivated && e.LowerEmail == email { if e.LowerEmail == emailAddr.LowerEmail {
emails = append(emails, e) emailAddr.IsActivated = true
break
} }
} }
emails = append(emails, emailAddr)
} }
if !verified { if !verified {

2
options/locale/locale_en-US.ini
View File

@ -847,6 +847,8 @@ add_new_principal = Add Principal
ssh_key_been_used = This SSH key has already been added to the server. ssh_key_been_used = This SSH key has already been added to the server.
ssh_key_name_used = An SSH key with same name already exists on your account. ssh_key_name_used = An SSH key with same name already exists on your account.
ssh_principal_been_used = This principal has already been added to the server. ssh_principal_been_used = This principal has already been added to the server.
gpg_email_addresses = Email addresses:
gpg_email_unverified = Unverified
gpg_key_id_used = A public GPG key with same ID already exists. gpg_key_id_used = A public GPG key with same ID already exists.
gpg_no_key_email_found = This GPG key does not match any activated email address associated with your account. It may still be added if you sign the provided token. gpg_no_key_email_found = This GPG key does not match any activated email address associated with your account. It may still be added if you sign the provided token.
gpg_key_matched_identities = Matched Identities: gpg_key_matched_identities = Matched Identities:

2
templates/user/settings/keys_gpg.tmpl
View File

@ -56,7 +56,7 @@
<span class="flex-text-block" data-tooltip-content="{{ctx.Locale.Tr "settings.gpg_key_verified_long"}}">{{svg "octicon-verified"}} <strong>{{ctx.Locale.Tr "settings.gpg_key_verified"}}</strong></span> <span class="flex-text-block" data-tooltip-content="{{ctx.Locale.Tr "settings.gpg_key_verified_long"}}">{{svg "octicon-verified"}} <strong>{{ctx.Locale.Tr "settings.gpg_key_verified"}}</strong></span>
{{end}} {{end}}
{{if .Emails}} {{if .Emails}}
<span class="flex-text-block" data-tooltip-content="{{ctx.Locale.Tr "settings.gpg_key_matched_identities_long"}}">{{svg "octicon-mail"}} {{ctx.Locale.Tr "settings.gpg_key_matched_identities"}} {{range .Emails}}<strong>{{.Email}} </strong>{{end}}</span> <span class="flex-text-block" data-tooltip-content="{{ctx.Locale.Tr "settings.gpg_key_matched_identities_long"}}">{{svg "octicon-mail"}} {{ctx.Locale.Tr "settings.gpg_email_addresses"}} {{range .Emails}}<strong>{{.Email}} </strong> {{if not .IsActivated}}<span class="ui label">{{ctx.Locale.Tr "settings.gpg_email_unverified"}}</span>{{end}}{{end}}</span>
{{end}} {{end}}
<div class="flex-item-body"> <div class="flex-item-body">
<b>{{ctx.Locale.Tr "settings.key_id"}}:</b> {{.PaddedKeyID}} <b>{{ctx.Locale.Tr "settings.key_id"}}:</b> {{.PaddedKeyID}}