kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

ssh signing: don't detach the filename strbuf from key_file tempfile 

Detaching the filename string from the tempfile structure used to cause
delete_tempfile() to fail and the temporary file was not cleaned up.

While it's possible to get rid of the allocation and copy from
xstrdup(), it keeps the code symetric with the other branch since
interpolate_path() also allocates and ssh_signing_key_file is freed
in both cases.

The exisiting test was updated to check if the temporary files are
properly deleted. To prevent TMPDIR from leaking into the other tests, a
new subshell is created, however this prevents test_config from working.
The cleanup of the config changed in the subshell is done by
test_unconfig in a call to test_when_finished outside of it.

Helped-by: brian m. carlson <sandals@crustytoothpaste.net>
Helped-by: Patrick Steinhardt <ps@pks.im>
Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: redoste <redoste@redoste.xyz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
redoste 2025-07-07 20:48:51 +02:00 committed by Junio C Hamano
parent 16bd9f20a4
commit 4498127b04
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gpg-interface.c
View File

@ -1048,7 +1048,7 @@ static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature,
key_file->filename.buf); key_file->filename.buf);
goto out; goto out;
} }
ssh_signing_key_file = strbuf_detach(&key_file->filename, NULL); ssh_signing_key_file = xstrdup(key_file->filename.buf);
} else { } else {
/* We assume a file */ /* We assume a file */
ssh_signing_key_file = interpolate_path(signing_key, 1); ssh_signing_key_file = interpolate_path(signing_key, 1);

32
t/t7528-signed-commit-ssh.sh
View File

@ -84,18 +84,26 @@ test_expect_success GPGSSH 'sign commits using literal public keys with ssh-agen
test_config gpg.format ssh && test_config gpg.format ssh &&
eval $(ssh-agent) && eval $(ssh-agent) &&
test_when_finished "kill ${SSH_AGENT_PID}" && test_when_finished "kill ${SSH_AGENT_PID}" &&
ssh-add "${GPGSSH_KEY_PRIMARY}" && test_when_finished "test_unconfig user.signingkey" &&
echo 1 >file && git add file && mkdir tmpdir &&
git commit -a -m rsa-inline -S"$(cat "${GPGSSH_KEY_PRIMARY}.pub")" && TMPDIR="$(pwd)/tmpdir" &&
echo 2 >file && (
test_config user.signingkey "$(cat "${GPGSSH_KEY_PRIMARY}.pub")" && export TMPDIR &&
git commit -a -m rsa-config -S && ssh-add "${GPGSSH_KEY_PRIMARY}" &&
ssh-add "${GPGSSH_KEY_ECDSA}" && echo 1 >file && git add file &&
echo 3 >file && git commit -a -m rsa-inline -S"$(cat "${GPGSSH_KEY_PRIMARY}.pub")" &&
git commit -a -m ecdsa-inline -S"key::$(cat "${GPGSSH_KEY_ECDSA}.pub")" && echo 2 >file &&
echo 4 >file && git config user.signingkey "$(cat "${GPGSSH_KEY_PRIMARY}.pub")" &&
test_config user.signingkey "key::$(cat "${GPGSSH_KEY_ECDSA}.pub")" && git commit -a -m rsa-config -S &&
git commit -a -m ecdsa-config -S ssh-add "${GPGSSH_KEY_ECDSA}" &&
echo 3 >file &&
git commit -a -m ecdsa-inline -S"key::$(cat "${GPGSSH_KEY_ECDSA}.pub")" &&
echo 4 >file &&
git config user.signingkey "key::$(cat "${GPGSSH_KEY_ECDSA}.pub")" &&
git commit -a -m ecdsa-config -S
) &&
find tmpdir -type f >tmpfiles &&
test_must_be_empty tmpfiles
' '


test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'create signed commits with keys having defined lifetimes' ' test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'create signed commits with keys having defined lifetimes' '