Fix RPM/Debian signature key creation (#28352)

Fixes #28324

The name parameter can't contain some characters
(https://github.com/keybase/go-crypto/blob/master/openpgp/keys.go#L680)
but is optional. Therefore just use an empty string.

diff --git a/services/packages/debian/repository.go b/services/packages/debian/repository.go
index cbde53f9611defbe81180c0be921cac331a72cbe..fca3cf420320ad4fccb69d979b770a5c474b2571 100644 (file)
--- a/services/packages/debian/repository.go
+++ b/services/packages/debian/repository.go
@@ -67,7 +67,7 @@ func GetOrCreateKeyPair(ctx context.Context, ownerID int64) (string, string, err
 }
 
 func generateKeypair() (string, string, error) {
-       e, err := openpgp.NewEntity(setting.AppName, "Debian Registry", "", nil)
+       e, err := openpgp.NewEntity("", "Debian Registry", "", nil)
        if err != nil {
                return "", "", err
        }

diff --git a/services/packages/rpm/repository.go b/services/packages/rpm/repository.go
index 1d0dc83cae8563ab9b770900186af5f829ae7d0d..c9db0247f6d9f20ff6037787d3fff7bafe811f99 100644 (file)
--- a/services/packages/rpm/repository.go
+++ b/services/packages/rpm/repository.go
@@ -22,7 +22,6 @@ import (
        "code.gitea.io/gitea/modules/json"
        packages_module "code.gitea.io/gitea/modules/packages"
        rpm_module "code.gitea.io/gitea/modules/packages/rpm"
-       "code.gitea.io/gitea/modules/setting"
        "code.gitea.io/gitea/modules/util"
        packages_service "code.gitea.io/gitea/services/packages"
 
@@ -68,7 +67,7 @@ func GetOrCreateKeyPair(ctx context.Context, ownerID int64) (string, string, err
 }
 
 func generateKeypair() (string, string, error) {
-       e, err := openpgp.NewEntity(setting.AppName, "RPM Registry", "", nil)
+       e, err := openpgp.NewEntity("", "RPM Registry", "", nil)
        if err != nil {
                return "", "", err
        }
@@ -126,7 +125,7 @@ type packageData struct {
 
 type packageCache = map[*packages_model.PackageFile]*packageData
 
-// BuildSpecificRepositoryFiles builds metadata files for the repository
+// BuildRepositoryFiles builds metadata files for the repository
 func BuildRepositoryFiles(ctx context.Context, ownerID int64) error {
        pv, err := GetOrCreateRepositoryVersion(ctx, ownerID)
        if err != nil {