Merge branch 'main' into rspack

Author: techknowlogick

cmd/dump.go

@@ -265,6 +265,7 @@ func runDump(ctx context.Context, cmd *cli.Command) error {
 		excludes = append(excludes, setting.LFS.Storage.Path)
 		excludes = append(excludes, setting.Attachment.Storage.Path)
 		excludes = append(excludes, setting.Packages.Storage.Path)
+		excludes = append(excludes, setting.RepoArchive.Storage.Path)
 		excludes = append(excludes, setting.Log.RootPath)
 		if err := dumper.AddRecursiveExclude("data", setting.AppDataPath, excludes); err != nil {
 			fatal("Failed to include data directory: %v", err)

models/asymkey/gpg_key_commit_verification.go

@@ -25,7 +25,7 @@ type CommitVerification struct {
 	SigningUser    *user_model.User // if Verified, then SigningUser is non-nil
 	CommittingUser *user_model.User // if Verified, then CommittingUser is non-nil
 	SigningEmail   string
-	SigningKey     *GPGKey
+	SigningKey     *GPGKey // FIXME: need to refactor it to a new name like "SigningGPGKey", it is also used in some templates
 	SigningSSHKey  *PublicKey
 	TrustStatus    string
 }

models/asymkey/key_display.go

@@ -0,0 +1,37 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package asymkey
+
+import (
+	"os"
+
+	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/setting"
+)
+
+func GetDisplaySigningKey(key *git.SigningKey) string {
+	if key == nil || key.Format == "" {
+		return ""
+	}
+
+	switch key.Format {
+	case git.SigningKeyFormatOpenPGP:
+		return key.KeyID
+	case git.SigningKeyFormatSSH:
+		content, err := os.ReadFile(key.KeyID)
+		if err != nil {
+			log.Error("Unable to read SSH key %s: %v", key.KeyID, err)
+			return "(Unable to read SSH key)"
+		}
+		display, err := CalcFingerprint(string(content))
+		if err != nil {
+			log.Error("Unable to calculate fingerprint for SSH key %s: %v", key.KeyID, err)
+			return "(Unable to calculate fingerprint for SSH key)"
+		}
+		return display
+	}
+	setting.PanicInDevOrTesting("Unknown signing key format: %s", key.Format)
+	return "(Unknown key format)"
+}

modules/git/key.go

@@ -3,13 +3,24 @@
 
 package git
 
+import "code.gitea.io/gitea/modules/setting"
+
 // Based on https://git-scm.com/docs/git-config#Documentation/git-config.txt-gpgformat
 const (
 	SigningKeyFormatOpenPGP = "openpgp" // for GPG keys, the expected default of git cli
 	SigningKeyFormatSSH     = "ssh"
 )
 
+// SigningKey represents an instance key info which will be used to sign git commits.
+// FIXME: need to refactor it to a new name, this name conflicts with the variable names for "asymkey.GPGKey" in many places.
 type SigningKey struct {
 	KeyID  string
 	Format string
 }
+
+func (s *SigningKey) String() string {
+	// Do not expose KeyID
+	// In case the key is a file path and the struct is rendered in a template, then the server path will be exposed.
+	setting.PanicInDevOrTesting("don't call SigningKey.String() - it exposes the KeyID which might be a local file path")
+	return "SigningKey:" + s.Format
+}

options/locale/locale_ga-IE.ini

@@ -3729,10 +3729,14 @@ swift.install=Cuir an pacáiste i do <code>chomhad Package.swift</code>:
 swift.install2=agus reáchtáil an t-ordú seo a leanas:
 vagrant.install=Chun bosca Vagrant a chur leis, reáchtáil an t-ordú seo a leanas:
 settings.link=Nasc an pacáiste seo le stóras
+settings.link.description=Má nascann tú pacáiste le stórlann, beidh an pacáiste le feiceáil i liosta pacáistí an stórlainne. Ní féidir ach stórlanna faoin úinéir céanna a nascadh. Má fhágtar an réimse folamh, bainfear an nasc.
 settings.link.select=Roghnaigh Stóras
 settings.link.button=Nuashonraigh Nasc Stórais
 settings.link.success=D'éirigh le nasc an stórais a nuashonrú.
 settings.link.error=Theip ar an nasc stóras a nuashonrú.
+settings.link.repo_not_found=Níor aimsíodh an stóras %s.
+settings.unlink.error=Theip ar nasc an stórais a bhaint.
+settings.unlink.success=Baineadh an nasc chuig an stóras go rathúil.
 settings.delete=Scrios pacáiste
 settings.delete.description=Tá pacáiste a scriosadh buan agus ní féidir é a chur ar ais.
 settings.delete.notice=Tá tú ar tí %s (%s) a scriosadh. Tá an oibríocht seo dochúlaithe, an bhfuil tú cinnte?

options/locale/locale_pt-PT.ini

@@ -3599,7 +3599,7 @@ no_subscriptions=Sem subscrições
 default_key=Assinado com a chave padrão
 error.extract_sign=Falhou ao extrair a assinatura
 error.generate_hash=Falhou ao gerar o <i>hash</i> do cometimento
-error.no_committer_account=Não existe qualquer conta ligada ao endereço de email de quem cometeu
+error.no_committer_account=Não existe qualquer conta vinculada ao endereço de email de quem cometeu
 error.no_gpg_keys_found=Não foi encontrada uma chave conhecida para esta assinatura, na base de dados
 error.not_signed_commit=Não é um cometimento assinado
 error.failed_retrieval_gpg_keys=Falhou ao obter uma chave ligada à conta de quem cometeu
@@ -3617,7 +3617,7 @@ desc=Gerir pacotes do repositório.
 empty=Ainda não há pacotes.
 no_metadata=Sem metadados.
 empty.documentation=Para obter mais informação sobre o registo de pacotes, veja <a target="_blank" rel="noopener noreferrer" href="%s">a documentação</a>.
-empty.repo=Carregou um pacote mas este não é apresentado aqui? Vá às <a href="%[1]s">configurações do pacote</a> e ligue-o a este repositório.
+empty.repo=Carregou um pacote mas este não é apresentado aqui? Vá às <a href="%[1]s">configurações do pacote</a> e vincule-o a este repositório.
 registry.documentation=Para mais informação sobre o registo %s, veja <a target="_blank" rel="noopener noreferrer" href="%s">a documentação</a>.
 filter.type=Tipo
 filter.type.all=Todos
@@ -3729,10 +3729,14 @@ swift.install=Adicione o pacote no seu ficheiro <code>Package.swift</code>:
 swift.install2=e execute o seguinte comando:
 vagrant.install=Para adicionar uma máquina virtual Vagrant, execute o seguinte comando:
 settings.link=Vincular este pacote a um repositório
+settings.link.description=Se você vincular um pacote a um repositório, o pacote será listado na lista de pacotes do repositório. Apenas os repositórios do mesmo dono podem ser vinculados. Deixar o campo em branco irá remover o vínculo.
 settings.link.select=Escolha o repositório
 settings.link.button=Modificar vínculo ao repositório
-settings.link.success=A ligação ao repositório foi modificada com sucesso.
+settings.link.success=O vínculo ao repositório foi modificado com sucesso.
 settings.link.error=Falhou a modificação do vínculo ao repositório.
+settings.link.repo_not_found=O repositório %s não foi encontrado.
+settings.unlink.error=Falhou a remoção do vínculo ao repositório.
+settings.unlink.success=O vínculo ao repositório foi removido com sucesso.
 settings.delete=Eliminar pacote
 settings.delete.description=Eliminar o pacote é permanente e não pode ser desfeito.
 settings.delete.notice=Está prestes a eliminar %s (%s). Esta operação é irreversível. Tem a certeza?

routers/web/repo/issue_view.go

@@ -12,6 +12,7 @@ import (
 	"strconv"
 
 	activities_model "code.gitea.io/gitea/models/activities"
+	asymkey_model "code.gitea.io/gitea/models/asymkey"
 	"code.gitea.io/gitea/models/db"
 	git_model "code.gitea.io/gitea/models/git"
 	issues_model "code.gitea.io/gitea/models/issues"
@@ -494,7 +495,7 @@ func preparePullViewSigning(ctx *context.Context, issue *issues_model.Issue) {
 	if ctx.Doer != nil {
 		sign, key, _, err := asymkey_service.SignMerge(ctx, pull, ctx.Doer, pull.BaseRepo.RepoPath(), pull.BaseBranch, pull.GetGitHeadRefName())
 		ctx.Data["WillSign"] = sign
-		ctx.Data["SigningKey"] = key
+		ctx.Data["SigningKeyMergeDisplay"] = asymkey_model.GetDisplaySigningKey(key)
 		if err != nil {
 			if asymkey_service.IsErrWontSign(err) {
 				ctx.Data["WontSignReason"] = err.(*asymkey_service.ErrWontSign).Reason

services/context/repo.go

@@ -14,6 +14,7 @@ import (
 	"path"
 	"strings"
 
+	asymkey_model "code.gitea.io/gitea/models/asymkey"
 	"code.gitea.io/gitea/models/db"
 	git_model "code.gitea.io/gitea/models/git"
 	issues_model "code.gitea.io/gitea/models/issues"
@@ -99,7 +100,7 @@ type CommitFormOptions struct {
 	UserCanPush              bool
 	RequireSigned            bool
 	WillSign                 bool
-	SigningKey               *git.SigningKey
+	SigningKeyFormDisplay    string
 	WontSignReason           string
 	CanCreatePullRequest     bool
 	CanCreateBasePullRequest bool
@@ -139,7 +140,7 @@ func PrepareCommitFormOptions(ctx *Context, doer *user_model.User, targetRepo *r
 		protectionRequireSigned = protectedBranch.RequireSignedCommits
 	}
 
-	willSign, signKeyID, _, err := asymkey_service.SignCRUDAction(ctx, targetRepo.RepoPath(), doer, targetRepo.RepoPath(), refName.String())
+	willSign, signKey, _, err := asymkey_service.SignCRUDAction(ctx, targetRepo.RepoPath(), doer, targetRepo.RepoPath(), refName.String())
 	wontSignReason := ""
 	if asymkey_service.IsErrWontSign(err) {
 		wontSignReason = string(err.(*asymkey_service.ErrWontSign).Reason)
@@ -156,14 +157,14 @@ func PrepareCommitFormOptions(ctx *Context, doer *user_model.User, targetRepo *r
 	canCreatePullRequest := targetRepo.UnitEnabled(ctx, unit_model.TypePullRequests) || canCreateBasePullRequest
 
 	opts := &CommitFormOptions{
-		TargetRepo:        targetRepo,
-		WillSubmitToFork:  submitToForkedRepo,
-		CanCommitToBranch: canCommitToBranch,
-		UserCanPush:       canPushWithProtection,
-		RequireSigned:     protectionRequireSigned,
-		WillSign:          willSign,
-		SigningKey:        signKeyID,
-		WontSignReason:    wontSignReason,
+		TargetRepo:            targetRepo,
+		WillSubmitToFork:      submitToForkedRepo,
+		CanCommitToBranch:     canCommitToBranch,
+		UserCanPush:           canPushWithProtection,
+		RequireSigned:         protectionRequireSigned,
+		WillSign:              willSign,
+		SigningKeyFormDisplay: asymkey_model.GetDisplaySigningKey(signKey),
+		WontSignReason:        wontSignReason,
 
 		CanCreatePullRequest:     canCreatePullRequest,
 		CanCreateBasePullRequest: canCreateBasePullRequest,

templates/repo/commit_sign_badge.tmpl

@@ -8,7 +8,7 @@ so this template should be kept as small as possbile, DO NOT put large component
 */}}
 {{- $commit := $.Commit -}}
 {{- $commitBaseLink := $.CommitBaseLink -}}
-{{- $verification := $.CommitSignVerification -}}
+{{- $verification := $.CommitSignVerification -}}{{- /* asymkey.CommitVerification */ -}}
 
 {{- $extraClass := "" -}}
 {{- $verified := false -}}
@@ -50,7 +50,7 @@ so this template should be kept as small as possbile, DO NOT put large component
 
 	{{- if $verification.SigningSSHKey -}}
 		{{- $msgSigningKey = print (ctx.Locale.Tr "repo.commits.ssh_key_fingerprint") ": " $verification.SigningSSHKey.Fingerprint -}}
-	{{- else if $verification.SigningKey -}}
+	{{- else if $verification.SigningKey -}}{{- /* asymkey.GPGKey */ -}}
 		{{- $msgSigningKey = print (ctx.Locale.Tr "repo.commits.gpg_key_id") ": " $verification.SigningKey.PaddedKeyID -}}
 	{{- end -}}
 {{- end -}}

templates/repo/editor/commit_form.tmpl

@@ -1,13 +1,15 @@
 <div class="commit-form-wrapper">
 	{{ctx.AvatarUtils.Avatar .SignedUser 40 "commit-avatar"}}
 	<div class="commit-form avatar-content-left-arrow">
-		<h3>{{- if .CommitFormOptions.WillSign}}
-			<span title="{{ctx.Locale.Tr "repo.signing.will_sign" .CommitFormOptions.SigningKey}}">{{svg "octicon-lock" 24}}</span>
+		<h3>
+		{{- if .CommitFormOptions.WillSign}}
+			<span data-tooltip-content="{{ctx.Locale.Tr "repo.signing.will_sign" .CommitFormOptions.SigningKeyFormDisplay}}">{{svg "octicon-lock" 24}}</span>
 			{{ctx.Locale.Tr "repo.editor.commit_signed_changes"}}
 		{{- else}}
 			<span title="{{ctx.Locale.Tr (printf "repo.signing.wont_sign.%s" .CommitFormOptions.WontSignReason)}}">{{svg "octicon-unlock" 24}}</span>
 			{{ctx.Locale.Tr "repo.editor.commit_changes"}}
-		{{- end}}</h3>
+		{{- end}}
+		</h3>
 		<div class="field">
 			<input name="commit_summary" maxlength="100" placeholder="{{if .PageIsDelete}}{{ctx.Locale.Tr "repo.editor.delete" .TreePath}}{{else if .PageIsUpload}}{{ctx.Locale.Tr "repo.editor.upload_files_to_dir" .TreePath}}{{else if .IsNewFile}}{{ctx.Locale.Tr "repo.editor.add_tmpl"}}{{else if .PageIsPatch}}{{ctx.Locale.Tr "repo.editor.patch"}}{{else}}{{ctx.Locale.Tr "repo.editor.update" .TreePath}}{{end}}" value="{{.commit_summary}}" autofocus>
 		</div>