handle scenario described in feedback

* move logic into a shared function

Author: ChristopherHX

models/asymkey/display_key.go

@@ -0,0 +1,23 @@
+package asymkey
+
+import (
+	"os"
+
+	"code.gitea.io/gitea/modules/git"
+)
+
+func GetDisplaySigningKey(key *git.SigningKey) (string, error) {
+	if key != nil {
+		switch key.Format {
+		case git.SigningKeyFormatOpenPGP:
+			return key.KeyID, nil
+		case git.SigningKeyFormatSSH:
+			content, readErr := os.ReadFile(key.KeyID)
+			if readErr != nil {
+				return "", readErr
+			}
+			return CalcFingerprint(string(content))
+		}
+	}
+	return "", nil
+}

routers/web/repo/issue_view.go

@@ -8,7 +8,6 @@ import (
 	"math/big"
 	"net/http"
 	"net/url"
-	"os"
 	"sort"
 	"strconv"
 
@@ -496,26 +495,11 @@ 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
-		if key != nil {
-			switch key.Format {
-			case git.SigningKeyFormatOpenPGP:
-				ctx.Data["SigningKey"] = key.KeyID
-			case git.SigningKeyFormatSSH:
-				content, readErr := os.ReadFile(key.KeyID)
-				if readErr != nil {
-					log.Error("Error whilst reading public key of pr %d in repo %s. Error: %v", pull.ID, pull.BaseRepo.FullName(), readErr)
-					ctx.Data["SigningKey"] = "Unknown"
-				} else {
-					var fingerprintErr error
-					ctx.Data["SigningKey"], fingerprintErr = asymkey_model.CalcFingerprint(string(content))
-					if fingerprintErr != nil {
-						log.Error("Error whilst generating public key fingerprint of pr %d in repo %s. Error: %v", pull.ID, pull.BaseRepo.FullName(), fingerprintErr)
-					} else {
-						ctx.Data["SigningKey"] = "Unknown"
-					}
-				}
-			}
+		displayKeyID, displayKeyIDErr := asymkey_model.GetDisplaySigningKey(key)
+		if displayKeyIDErr != nil {
+			log.Error("Error whilst getting the display keyID: %s", displayKeyIDErr.Error())
 		}
+		ctx.Data["SigningKey"] = displayKeyID
 		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
+	SigningKey               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)
@@ -155,14 +156,19 @@ func PrepareCommitFormOptions(ctx *Context, doer *user_model.User, targetRepo *r
 	canCreateBasePullRequest := targetRepo.BaseRepo != nil && targetRepo.BaseRepo.UnitEnabled(ctx, unit_model.TypePullRequests)
 	canCreatePullRequest := targetRepo.UnitEnabled(ctx, unit_model.TypePullRequests) || canCreateBasePullRequest
 
+	displayKeyID, displayKeyIDErr := asymkey_model.GetDisplaySigningKey(signKey)
+	if displayKeyIDErr != nil {
+		log.Error("Error whilst getting the display keyID: %s", displayKeyIDErr.Error())
+	}
+
 	opts := &CommitFormOptions{
 		TargetRepo:        targetRepo,
 		WillSubmitToFork:  submitToForkedRepo,
 		CanCommitToBranch: canCommitToBranch,
 		UserCanPush:       canPushWithProtection,
 		RequireSigned:     protectionRequireSigned,
 		WillSign:          willSign,
-		SigningKey:        signKeyID,
+		SigningKey:        displayKeyID,
 		WontSignReason:    wontSignReason,
 
 		CanCreatePullRequest:     canCreatePullRequest,