averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

fast-export: handle all kinds of tag signatures

Browse Source 
Currently the handle_tag() function in "builtin/fast-export.c" searches
only for "\n-----BEGIN PGP SIGNATURE-----\n" in the tag message to find
a tag signature.

This doesn't handle all kinds of OpenPGP signatures as some can start
with "-----BEGIN PGP MESSAGE-----" too, and this doesn't handle SSH and
X.509 signatures either as they use "-----BEGIN SSH SIGNATURE-----" and
"-----BEGIN SIGNED MESSAGE-----" respectively.

To handle all these kinds of tag signatures supported by Git, let's use
the parse_signed_buffer() function to properly find signatures in tag
messages.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder
2025-10-13 10:48:56 +02:00
committed by Junio C Hamano
parent 132e5666ce
commit 31f375c31c
2 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/fast-export.c
View File

@@ -931,9 +931,8 @@ static void handle_tag(const char *name, struct tag *tag)
/* handle signed tags */
if (message) {
const char *signature = strstr(message,
"\n-----BEGIN PGP SIGNATURE-----\n");
if (signature)
size_t sig_offset = parse_signed_buffer(message, message_size);
if (sig_offset < message_size)
switch (signed_tag_mode) {
case SIGN_ABORT:
die("encountered signed tag %s; use "
@@ -950,7 +949,7 @@ static void handle_tag(const char *name, struct tag *tag)
oid_to_hex(&tag->object.oid));
/* fallthru */
case SIGN_STRIP:
message_size = signature + 1 - message;
message_size = sig_offset;
break;
}
}

36
t/t9350-fast-export.sh
View File

@@ -279,6 +279,42 @@ test_expect_success 'signed-tags=warn-strip' '
test -s err
'
test_expect_success GPGSM 'setup X.509 signed tag' '
test_config gpg.format x509 &&
test_config user.signingkey $GIT_COMMITTER_EMAIL &&
git tag -s -m "X.509 signed tag" x509-signed $(git rev-parse HEAD) &&
ANNOTATED_TAG_COUNT=$((ANNOTATED_TAG_COUNT + 1))
'
test_expect_success GPGSM 'signed-tags=verbatim with X.509' '
git fast-export --signed-tags=verbatim x509-signed > output &&
test_grep "SIGNED MESSAGE" output
'
test_expect_success GPGSM 'signed-tags=strip with X.509' '
git fast-export --signed-tags=strip x509-signed > output &&
test_grep ! "SIGNED MESSAGE" output
'
test_expect_success GPGSSH 'setup SSH signed tag' '
test_config gpg.format ssh &&
test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
git tag -s -m "SSH signed tag" ssh-signed $(git rev-parse HEAD) &&
ANNOTATED_TAG_COUNT=$((ANNOTATED_TAG_COUNT + 1))
'
test_expect_success GPGSSH 'signed-tags=verbatim with SSH' '
git fast-export --signed-tags=verbatim ssh-signed > output &&
test_grep "SSH SIGNATURE" output
'
test_expect_success GPGSSH 'signed-tags=strip with SSH' '
git fast-export --signed-tags=strip ssh-signed > output &&
test_grep ! "SSH SIGNATURE" output
'
test_expect_success GPG 'set up signed commit' '
# Generate a commit with both "gpgsig" and "encoding" set, so