Re: [PATCH v3 4/5] fast-export: handle all kinds of tag signatures
- From
Elijah Newren <newren@gmail.com>
- Date
- Oct 24, 2025, 02:03 UTC
- Message-ID
- <CABPp-BHMNQB8Dc-xq_JbL_73PQ+wUDwxWSKUQyjFGGYWUyiWvw@mail.gmail.com>
- In-Reply-To
- <20251013084857.1646783-5-christian.couder@gmail.com>
On Mon, Oct 13, 2025 at 4:49 AM Christian Couder <christian.couder@gmail.com> wrote:
Show 33 quoted lines
>
> 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>
> ---
> builtin/fast-export.c | 7 +++----
> t/t9350-fast-export.sh | 36 ++++++++++++++++++++++++++++++++++++
> 2 files changed, 39 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/fast-export.c b/builtin/fast-export.c
> index dc2486f9a8..7adbc55f0d 100644
> --- a/builtin/fast-export.c
> +++ b/builtin/fast-export.c
> @@ -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)Always nice to remove a special hard-coded (and incomplete) additional parsing with a call to the official function we have to handle this.
Show 61 quoted lines
> 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;
> }
> }
> diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
> index 21ff26939c..3d153a4805 100755
> --- a/t/t9350-fast-export.sh
> +++ b/t/t9350-fast-export.sh
> @@ -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
> --
> 2.51.0.438.g6987fc0baeLooks good.