From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Brooke Kuhlmann <brooke@alchemists.io>
Subject: [PATCH v2 09/12] tests: verify that `clone -c core.hooksPath=/dev/null` works again
Date: Fri, 24 May 2024 12:47:12 -0700 [thread overview]
Message-ID: <20240524194715.695916-10-gitster@pobox.com> (raw)
In-Reply-To: <20240524194715.695916-1-gitster@pobox.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
As part of the protections added in Git v2.45.1 and friends,
repository-local `core.hooksPath` settings are no longer allowed, as a
defense-in-depth mechanism to prevent future Git vulnerabilities to
raise to critical level if those vulnerabilities inadvertently allow the
repository-local config to be written.
What the added protection did not anticipate is that such a
repository-local `core.hooksPath` can not only be used to point to
maliciously-placed scripts in the current worktree, but also to
_prevent_ hooks from being called altogether.
We just reverted the `core.hooksPath` protections, based on the Git
maintainer's recommendation in
https://lore.kernel.org/git/xmqq4jaxvm8z.fsf@gitster.g/ to address this
concern as well as related ones. Let's make sure that we won't regress
while trying to protect the clone operation further.
Reported-by: Brooke Kuhlmann <brooke@alchemists.io>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
t/t1350-config-hooks-path.sh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/t/t1350-config-hooks-path.sh b/t/t1350-config-hooks-path.sh
index f6dc83e2aa..45a0492917 100755
--- a/t/t1350-config-hooks-path.sh
+++ b/t/t1350-config-hooks-path.sh
@@ -41,4 +41,11 @@ test_expect_success 'git rev-parse --git-path hooks' '
test .git/custom-hooks/abc = "$(cat actual)"
'
+test_expect_success 'core.hooksPath=/dev/null' '
+ git clone -c core.hooksPath=/dev/null . no-templates &&
+ value="$(git -C no-templates config --local core.hooksPath)" &&
+ # The Bash used by Git for Windows rewrites `/dev/null` to `nul`
+ { test /dev/null = "$value" || test nul = "$value"; }
+'
+
test_done
--
2.45.1-246-gb9cfe4845c
next prev parent reply other threads:[~2024-05-24 19:47 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-24 19:47 [PATCH v2 00/12] Fix various overly aggressive protections in 2.45.1 and friends Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 01/12] send-email: drop FakeTerm hack Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 02/12] send-email: avoid creating more than one Term::ReadLine object Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 03/12] ci: drop mention of BREW_INSTALL_PACKAGES variable Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 04/12] ci: avoid bare "gcc" for osx-gcc job Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 05/12] ci: stop installing "gcc-13" for osx-gcc Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 06/12] hook: plug a new memory leak Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 07/12] init: use the correct path of the templates directory again Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 08/12] Revert "core.hooksPath: add some protection while cloning" Junio C Hamano
2024-05-24 19:47 ` Junio C Hamano [this message]
2024-05-24 19:47 ` [PATCH v2 10/12] clone: drop the protections where hooks aren't run Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 11/12] Revert "Add a helper function to compare file contents" Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 12/12] Revert "fsck: warn about symlink pointing inside a gitdir" Junio C Hamano
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=20240524194715.695916-10-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=brooke@alchemists.io \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).