fix(asymkey): do not verify OpenPGP signatures with an SSH instance key, require git 2.18 (#39073)

mirror of https://github.com/go-gitea/gitea.git synced 2026-08-27 20:03:47 +00:00

With SIGNING_FORMAT = ssh the OpenPGP verification path builds its
GPGSettings from the instance signing key but leaves the format empty,
so it runs `gpg -a --export` on an SSH public key path. Depending on the
local gpg setup that either exports nothing, so an OpenPGP signed commit
reports gpg.error.generate_hash instead of a missing key, or it fails
outright and logs an export error for every such commit.

Both guards are needed. The first covers SIGNING_KEY set to a path with
SIGNING_FORMAT=ssh; the second covers the shipped default
SIGNING_KEY=default, where the format comes from git's own gpg.format
and never gets reconciled with the hardcoded "openpgp". Drop either one
and a working config goes back to broken.

Also raise minimum git version to 2.18 which was already required before this change.

Fixes: https://github.com/go-gitea/gitea/issues/37452
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>

This commit is contained in:

Artem Lytkin

2026-08-25 15:02:31 +03:00

committed by

GitHub

parent d17ccd4434

commit c8660364d9

9 changed files with 184 additions and 181 deletions

									
										modules/git/git.go
									
		+1
		-1
	
												View File
												
				@@ -24,7 +24,7 @@ import (

					"github.com/hashicorp/go-version"

				)

				const RequiredVersion = "2.13.0" // the minimum Git version required

				const RequiredVersion = "2.18.0" // the minimum Git version required

				type Features struct {

					gitVersion *version.Version