From: Johannes Sixt <j6t@kdbg.org>
To: Stefan Beller <sbeller@google.com>
Cc: jrnieder@gmail.com, git@vger.kernel.org
Subject: Re: [PATCH] t7406: submodule.<name>.update command must not be run from .gitmodules
Date: Tue, 26 Sep 2017 07:37:30 +0200 [thread overview]
Message-ID: <0aa754b4-93fb-3f23-be51-4af5227ac847@kdbg.org> (raw)
In-Reply-To: <20170925225054.10819-1-sbeller@google.com>
Am 26.09.2017 um 00:50 schrieb Stefan Beller:
> submodule.<name>.update can be assigned an arbitrary command via setting
> it to "!command". When this command is found in the regular config, Git
> ought to just run that command instead of other update mechanisms.
>
> However if that command is just found in the .gitmodules file, it is
> potentially untrusted, which is why we do not run it. Add a test
> confirming the behavior.
>
> Suggested-by: Jonathan Nieder <jrnieder@gmail.com>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
>
> updated to use the super robust script.
> Thanks Jonathan,
>
> Stefan
>
> t/t7406-submodule-update.sh | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
> index 034914a14f..d718cb00e7 100755
> --- a/t/t7406-submodule-update.sh
> +++ b/t/t7406-submodule-update.sh
> @@ -406,6 +406,20 @@ test_expect_success 'submodule update - command in .git/config' '
> )
> '
>
> +test_expect_success 'submodule update - command in .gitmodules is ignored' '
> + test_when_finished "git -C super reset --hard HEAD^" &&
> +
> + write_script must_not_run.sh <<-EOF &&
> + >$TEST_DIRECTORY/bad
> + EOF
I am pretty confident that this does not test what you intend to test.
Notice that $TEST_DIRECTORY is expanded when the script is written. But
that path contains a blank, and we have something like this in the test
script:
#!/bin/sh
>/the/build/directory/t/trash directory.t7406/bad
If you inject the bug against which this test protects into
git-submodule, you should find a file "trash" in your t directory, and
the file "bad" still absent. Not to mention that the script fails
because it cannot run "directory.t7406/bad".
To fix that, you should use and exported variable and access that from
the test script, for example:
write_script must_not_run.sh <<-\EOF &&
>"$TEST_DIRECTORY"/bad
EOF
...
(
export TEST_DIRECTORY &&
git -C super submodule update submodule
) &&
test_path_is_missing bad
> +
> + git -C super config -f .gitmodules submodule.submodule.update "!$TEST_DIRECTORY/must_not_run.sh" &&
> + git -C super commit -a -m "add command to .gitmodules file" &&
> + git -C super/submodule reset --hard $submodulesha1^ &&
> + git -C super submodule update submodule &&
> + test_path_is_missing bad
> +'
> +
> cat << EOF >expect
> Execution of 'false $submodulesha1' failed in submodule path 'submodule'
> EOF
>
-- Hannes
next prev parent reply other threads:[~2017-09-26 5:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-25 19:55 [PATCH] t7406: submodule.<name>.update command must not be run from .gitmodules Stefan Beller
2017-09-25 20:04 ` Jonathan Nieder
2017-09-25 22:50 ` Stefan Beller
2017-09-26 0:01 ` Jonathan Nieder
2017-09-26 5:37 ` Johannes Sixt [this message]
2017-09-26 6:28 ` Junio C Hamano
2017-09-26 18:54 ` Stefan Beller
2017-09-26 19:46 ` Johannes Sixt
2017-09-26 19:54 ` Stefan Beller
2017-09-27 3:21 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0aa754b4-93fb-3f23-be51-4af5227ac847@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=sbeller@google.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).