From: Patrick Steinhardt <ps@pks•im>
To: redoste <redoste@redoste•xyz>
Cc: git@vger•kernel.org, Jeff King <peff@peff•net>,
"brian m. carlson" <sandals@crustytoothpaste•net>,
Fabian Stelzer <fs@gigacodes•de>,
Junio C Hamano <gitster@pobox•com>,
Elijah Newren <newren@gmail•com>
Subject: Re: [PATCH v2] ssh signing: don't detach the filename strbuf from key_file tempfile
Date: Mon, 7 Jul 2025 11:02:00 +0200 [thread overview]
Message-ID: <aGuNCGNk96DK4GzX@pks.im> (raw)
In-Reply-To: <20250706173450.12995-1-redoste@redoste.xyz>
On Sun, Jul 06, 2025 at 07:34:49PM +0200, redoste wrote:
> diff --git a/t/t7528-signed-commit-ssh.sh b/t/t7528-signed-commit-ssh.sh
> index 065f780636..1a8d96f355 100755
> --- a/t/t7528-signed-commit-ssh.sh
> +++ b/t/t7528-signed-commit-ssh.sh
> @@ -390,6 +390,22 @@ test_expect_success GPGSSH 'check config gpg.format values' '
> test_must_fail git commit -S --amend -m "fail"
> '
>
> +test_expect_success GPGSSH 'check temporary files clean up when signing commits' '
> + test_config gpg.format ssh &&
> + eval $(ssh-agent) &&
> + test_when_finished "kill ${SSH_AGENT_PID}" &&
> + mkdir tmpdir &&
> + TMPDIR="$(pwd)/tmpdir" &&
> + export TMPDIR &&
I think this exported environment variable now leaks into subsequent
tests, doesn't it? We may want to do it in a subshell.
mkdir tmpdir &&
TMPDIR="$(pwd)/tmpdir" &&
(
export TMPDIR &&
ssh-add "${GPGSSH_KEY_PRIMARY}" &&
echo 1 >file && git add file &&
git commit -a -m inline -S"$(cat "${GPGSSH_KEY_PRIMARY}.pub")" &&
echo 2 >file &&
git commit -a -m file -S"${GPGSSH_KEY_PRIMARY}"
) &&
find tmpdir -type f >tmpfiles &&
test_line_count = 0 tmpfiles
Patrick
> + ssh-add "${GPGSSH_KEY_PRIMARY}" &&
> + echo 1 >file && git add file &&
> + git commit -a -m inline -S"$(cat "${GPGSSH_KEY_PRIMARY}.pub")" &&
> + echo 2 >file &&
> + git commit -a -m file -S"${GPGSSH_KEY_PRIMARY}" &&
> + find tmpdir -type f >tmpfiles &&
> + test_line_count = 0 tmpfiles
> +'
> +
> test_expect_failure GPGSSH 'detect fudged commit with double signature (TODO)' '
> sed -e "/gpgsig/,/END PGP/d" forged1 >double-base &&
> sed -n -e "/gpgsig/,/END PGP/p" forged1 | \
> --
> 2.49.0
>
>
next prev parent reply other threads:[~2025-07-07 9:02 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-04 23:08 [PATCH] ssh signing: don't detach the filename strbuf from key_file tempfile redoste
2025-07-05 19:21 ` Jeff King
2025-07-05 20:07 ` brian m. carlson
2025-07-05 22:50 ` redoste
2025-07-05 23:04 ` redoste
2025-07-06 0:28 ` brian m. carlson
2025-07-06 3:13 ` Jeff King
2025-07-06 17:20 ` redoste
2025-07-06 17:14 ` redoste
2025-07-06 17:34 ` [PATCH v2] " redoste
2025-07-06 21:21 ` brian m. carlson
2025-07-07 9:02 ` Patrick Steinhardt [this message]
2025-07-07 9:35 ` Phillip Wood
2025-07-07 14:25 ` redoste
2025-07-07 15:26 ` Phillip Wood
2025-07-07 16:22 ` redoste
2025-07-07 16:42 ` Phillip Wood
2025-07-07 18:48 ` [PATCH v3] " redoste
2025-07-07 20:57 ` Junio C Hamano
2025-07-08 6:47 ` Patrick Steinhardt
2025-07-08 13:59 ` Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aGuNCGNk96DK4GzX@pks.im \
--to=ps@pks$(echo .)im \
--cc=fs@gigacodes$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=newren@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=redoste@redoste$(echo .)xyz \
--cc=sandals@crustytoothpaste$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox