[PATCH 2/2] fsck: reject .gitmodules git:// urls with newlines
- From
Jeff King <peff@peff.net>
- Date
- Jan 7, 2021, 09:44 UTC
- Message-ID
- <X/bX8XDYH2rni9uV@coredump.intra.peff.net>
- In-Reply-To
- <X/bXV9dGFK2bxBV0@coredump.intra.peff.net>
The previous commit taught the clone/fetch client side to reject a git:// URL with a newline in it. Let's also catch these when fscking a .gitmodules file, which will give an earlier warning.
Note that it would be simpler to just complain about newline in _any_ URL, but an earlier tightening for http/ftp made sure we kept allowing newlines for unknown protocols (and this is covered in the tests). So we'll stick to that precedent.
Signed-off-by: Jeff King <peff@peff.net> --- fsck.c | 2 +- t/t7416-submodule-dash-url.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/fsck.c b/fsck.c index f82e2fe9e3..5e282b3b6b 100644 --- a/fsck.c +++ b/fsck.c @@ -1082,7 +1082,7 @@ static int check_submodule_url(const char *url) if (looks_like_command_line_option(url)) return -1; - if (submodule_url_is_relative(url)) { + if (submodule_url_is_relative(url) || starts_with(url, "git://")) { char *decoded; const char *next; int has_nl; diff --git a/t/t7416-submodule-dash-url.sh b/t/t7416-submodule-dash-url.sh index eec96e0ba9..d21dc8b009 100755 --- a/t/t7416-submodule-dash-url.sh +++ b/t/t7416-submodule-dash-url.sh @@ -201,4 +201,19 @@ test_expect_success 'fsck rejects embedded newline in relative url' ' grep gitmodulesUrl err ' +test_expect_success 'fsck rejects embedded newline in git url' ' + git checkout --orphan git-newline && + cat >.gitmodules <<-\EOF && + [submodule "foo"] + url = "git://example.com:1234/repo%0a.git" + EOF + git add .gitmodules && + git commit -m "git url with newline" && + test_when_finished "rm -rf dst" && + git init --bare dst && + git -C dst config transfer.fsckObjects true && + test_must_fail git push dst HEAD 2>err && + grep gitmodulesUrl err +' + test_done
-- 2.30.0.572.g094076f6a2