From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: j6t@kdbg.org, git@vger.kernel.org, jrnieder@gmail.com
Subject: Re: [PATCH] t7406: submodule.<name>.update command must not be run from .gitmodules
Date: Wed, 27 Sep 2017 12:21:27 +0900 [thread overview]
Message-ID: <xmqqr2us7rns.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170926195413.3916-1-sbeller@google.com> (Stefan Beller's message of "Tue, 26 Sep 2017 12:54:13 -0700")
Stefan Beller <sbeller@google.com> writes:
> 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>
> ---
Earlier, we saw:
Ideally we want this test to be super robust: e.g. if it runs the
command but from a different directory, we still want the test to fail,
and if it runs the command but using exec instead of a shell, we still
want the test to fail.
and this one (i.e. signal that it is a command by prefixing with
'!', and then have a single command that would fail whether it is
run via run_command() with or without shell) would satisfy that
criteria, I would think.
>> This test for a missing file is certainly a remnant from the
>> previous iteration, isn't it?
>
> Yes. This is a good indicator I need some vacation.
Or just take a deep breath before making a knee-jerk reaction public
and instead double-check before sending things out ;-)
Will queue. Thanks.
>
> Thanks,
> Stefan
>
> t/t7406-submodule-update.sh | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
> index 034914a14f..6f083c4d68 100755
> --- a/t/t7406-submodule-update.sh
> +++ b/t/t7406-submodule-update.sh
> @@ -406,6 +406,14 @@ 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^" &&
> + git -C super config -f .gitmodules submodule.submodule.update "!false" &&
> + git -C super commit -a -m "add command to .gitmodules file" &&
> + git -C super/submodule reset --hard $submodulesha1^ &&
> + git -C super submodule update submodule
> +'
> +
> cat << EOF >expect
> Execution of 'false $submodulesha1' failed in submodule path 'submodule'
> EOF
prev parent reply other threads:[~2017-09-27 3:21 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
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 [this message]
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=xmqqr2us7rns.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.