set default key format to openpgp

Author: ChristopherHX

models/asymkey/key.go

@@ -0,0 +1,16 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package git
+
+const (
+	// KeyTypeOpenPGP is the key type for GPG keys
+	KeyTypeOpenPGP = "openpgp"
+	// KeyTypeSSH is the key type for SSH keys
+	KeyTypeSSH = "ssh"
+)
+
+type SigningKey struct {
+	KeyID  string
+	Format string
+}

modules/git/key.go

@@ -14,7 +14,7 @@ import (
 
 // LoadPublicKeyContent will load the key from gpg
 func (gpgSettings *GPGSettings) LoadPublicKeyContent() error {
-	if gpgSettings.Format == "ssh" {
+	if gpgSettings.Format == KeyTypeOpenPGP {
 		content, err := os.ReadFile(gpgSettings.KeyID)
 		if err != nil {
 			return fmt.Errorf("unable to read SSH public key file: %s, %w", gpgSettings.KeyID, err)
@@ -53,7 +53,7 @@ func (repo *Repository) GetDefaultPublicGPGKey(forceUpdate bool) (*GPGSettings,
 	signingKey, _, _ := NewCommand("config", "--get", "user.signingkey").RunStdString(repo.Ctx, &RunOpts{Dir: repo.Path})
 	gpgSettings.KeyID = strings.TrimSpace(signingKey)
 
-	format, _, _ := NewCommand("config", "--get", "gpg.format").RunStdString(repo.Ctx, &RunOpts{Dir: repo.Path})
+	format, _, _ := NewCommand("config", "--default", KeyTypeOpenPGP, "--get", "gpg.format").RunStdString(repo.Ctx, &RunOpts{Dir: repo.Path})
 	gpgSettings.Format = strings.TrimSpace(format)
 
 	defaultEmail, _, _ := NewCommand("config", "--get", "user.email").RunStdString(repo.Ctx, &RunOpts{Dir: repo.Path})

modules/git/repo_gpg.go

@@ -255,6 +255,7 @@ var (
 			SigningKey:        "default",
 			SigningName:       "",
 			SigningEmail:      "",
+			SigningFormat:     "openpgp",
 			InitialCommit:     []string{"always"},
 			CRUDActions:       []string{"pubkey", "twofa", "parentsigned"},
 			Merges:            []string{"pubkey", "twofa", "basesigned", "commitssigned"},

modules/setting/repository.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 
+	"code.gitea.io/gitea/modules/git"
 	asymkey_service "code.gitea.io/gitea/services/asymkey"
 	"code.gitea.io/gitea/services/context"
 )
@@ -56,7 +57,7 @@ func SigningKey(ctx *context.APIContext) {
 		ctx.APIErrorInternal(err)
 		return
 	}
-	if format == "ssh" {
+	if format != git.KeyTypeOpenPGP {
 		ctx.APIErrorNotFound(errors.New("SSH keys are used for signing, not GPG"))
 		return
 	}
@@ -111,7 +112,7 @@ func SigningKeySSH(ctx *context.APIContext) {
 		ctx.APIErrorInternal(err)
 		return
 	}
-	if format != "ssh" {
+	if format != git.KeyTypeSSH {
 		ctx.APIErrorNotFound(errors.New("GPG keys are used for signing, not SSH"))
 		return
 	}

routers/api/v1/misc/signing.go

@@ -414,7 +414,7 @@ func ParseCommitWithSSHSignature(ctx context.Context, c *git.Commit, committer *
 
 	defaultReason := asymkey_model.NoKeyFound
 
-	if setting.Repository.Signing.SigningFormat == "ssh" && setting.Repository.Signing.SigningKey != "" && setting.Repository.Signing.SigningKey != "default" && setting.Repository.Signing.SigningKey != "none" {
+	if setting.Repository.Signing.SigningFormat == git.KeyTypeSSH && setting.Repository.Signing.SigningKey != "" && setting.Repository.Signing.SigningKey != "default" && setting.Repository.Signing.SigningKey != "none" {
 		// OK we should try the default key
 		gpgSettings := git.GPGSettings{
 			Sign:   true,
@@ -442,7 +442,7 @@ func ParseCommitWithSSHSignature(ctx context.Context, c *git.Commit, committer *
 	}
 
 	defaultGPGSettings, err := c.GetRepositoryDefaultPublicGPGKey(false)
-	if defaultGPGSettings.Format == "ssh" {
+	if defaultGPGSettings.Format == git.KeyTypeSSH {
 		if err != nil {
 			log.Error("Error getting default public gpg key: %v", err)
 		} else if defaultGPGSettings == nil {