diff options
| author | KN4CK3R <admin@oldschoolhack.me> | 2023-12-05 01:48:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-05 00:48:01 +0000 |
| commit | dfa77ac0205d53ac6de45e25c13e122592739bd4 (patch) | |
| tree | 47b0379377f46134617ce56cb620fa8c7b06878d | |
| parent | b3c258828f11d6c5900f8209a46ea93482c93519 (diff) | |
| download | gitea-dfa77ac0205d53ac6de45e25c13e122592739bd4.tar.gz gitea-dfa77ac0205d53ac6de45e25c13e122592739bd4.zip | |
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.
| -rw-r--r-- | services/packages/debian/repository.go | 2 | ||||
| -rw-r--r-- | services/packages/rpm/repository.go | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/services/packages/debian/repository.go b/services/packages/debian/repository.go index cbde53f961..fca3cf4203 100644 --- 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 1d0dc83cae..c9db0247f6 100644 --- 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 { |