mirror of
https://github.com/git-for-windows/git.git
synced 2025-12-13 00:06:03 -06:00
c44088ecc4
libcurl permits making requests without a URL scheme specified. In this case, it guesses the URL from the hostname, so I can run git ls-remote http::ftp.example.com/path/to/repo and it would make an FTP request. Any user intentionally using such a URL is likely to have made a typo. Unfortunately, credential_from_url is not able to determine the host and protocol in order to determine appropriate credentials to send, and until "credential: refuse to operate when missing host or protocol", this resulted in another host's credentials being leaked to the named host. Teach credential_from_url_gently to consider such a URL to be invalid so that fsck can detect and block gitmodules files with such URLs, allowing server operators to avoid serving them to downstream users running older versions of Git. This also means that when such URLs are passed on the command line, Git will print a clearer error so affected users can switch to the simpler URL that explicitly specifies the host and protocol they intend. One subtlety: .gitmodules files can contain relative URLs, representing a URL relative to the URL they were cloned from. The relative URL resolver used for .gitmodules can follow ".." components out of the path part and past the host part of a URL, meaning that such a relative URL can be used to traverse from a https://foo.example.com/innocent superproject to a https::attacker.example.com/exploit submodule. Fortunately a leading ':' in the first path component after a series of leading './' and '../' components is unlikely to show up in other contexts, so we can catch this by detecting that pattern. Reported-by: Jeff King <peff@peff.net> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Reviewed-by: Jeff King <peff@peff.net>
141 lines
4.1 KiB
Bash
Executable File
141 lines
4.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='check handling of disallowed .gitmodule urls'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'create submodule with protected dash in url' '
|
|
git init upstream &&
|
|
git -C upstream commit --allow-empty -m base &&
|
|
mv upstream ./-upstream &&
|
|
git submodule add ./-upstream sub &&
|
|
git add sub .gitmodules &&
|
|
git commit -m submodule
|
|
'
|
|
|
|
test_expect_success 'clone can recurse submodule' '
|
|
test_when_finished "rm -rf dst" &&
|
|
git clone --recurse-submodules . dst &&
|
|
echo base >expect &&
|
|
git -C dst/sub log -1 --format=%s >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'fsck accepts protected dash' '
|
|
test_when_finished "rm -rf dst" &&
|
|
git init --bare dst &&
|
|
git -C dst config transfer.fsckObjects true &&
|
|
git push dst HEAD
|
|
'
|
|
|
|
test_expect_success 'remove ./ protection from .gitmodules url' '
|
|
perl -i -pe "s{\./}{}" .gitmodules &&
|
|
git commit -am "drop protection"
|
|
'
|
|
|
|
test_expect_success 'clone rejects unprotected dash' '
|
|
test_when_finished "rm -rf dst" &&
|
|
test_must_fail git clone --recurse-submodules . dst 2>err &&
|
|
test_i18ngrep ignoring err
|
|
'
|
|
|
|
test_expect_success 'fsck rejects unprotected dash' '
|
|
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_expect_success 'trailing backslash is handled correctly' '
|
|
git init testmodule &&
|
|
test_commit -C testmodule c &&
|
|
git submodule add ./testmodule &&
|
|
: ensure that the name ends in a double backslash &&
|
|
sed -e "s|\\(submodule \"testmodule\\)\"|\\1\\\\\\\\\"|" \
|
|
-e "s|url = .*|url = \" --should-not-be-an-option\"|" \
|
|
<.gitmodules >.new &&
|
|
mv .new .gitmodules &&
|
|
git commit -am "Add testmodule" &&
|
|
test_must_fail git clone --verbose --recurse-submodules . dolly 2>err &&
|
|
test_i18ngrep ! "unknown option" err
|
|
'
|
|
|
|
test_expect_success 'fsck rejects missing URL scheme' '
|
|
git checkout --orphan missing-scheme &&
|
|
cat >.gitmodules <<-\EOF &&
|
|
[submodule "foo"]
|
|
url = http::one.example.com/foo.git
|
|
EOF
|
|
git add .gitmodules &&
|
|
test_tick &&
|
|
git commit -m "gitmodules with missing URL scheme" &&
|
|
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_expect_success 'fsck rejects relative URL resolving to missing scheme' '
|
|
git checkout --orphan relative-missing-scheme &&
|
|
cat >.gitmodules <<-\EOF &&
|
|
[submodule "foo"]
|
|
url = "..\\../.\\../:one.example.com/foo.git"
|
|
EOF
|
|
git add .gitmodules &&
|
|
test_tick &&
|
|
git commit -m "gitmodules with relative URL that strips off scheme" &&
|
|
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_expect_success 'fsck permits embedded newline with unrecognized scheme' '
|
|
git checkout --orphan newscheme &&
|
|
cat >.gitmodules <<-\EOF &&
|
|
[submodule "foo"]
|
|
url = "data://acjbkd%0akajfdickajkd"
|
|
EOF
|
|
git add .gitmodules &&
|
|
git commit -m "gitmodules with unrecognized scheme" &&
|
|
test_when_finished "rm -rf dst" &&
|
|
git init --bare dst &&
|
|
git -C dst config transfer.fsckObjects true &&
|
|
git push dst HEAD
|
|
'
|
|
|
|
test_expect_success 'fsck rejects embedded newline in url' '
|
|
# create an orphan branch to avoid existing .gitmodules objects
|
|
git checkout --orphan newline &&
|
|
cat >.gitmodules <<-\EOF &&
|
|
[submodule "foo"]
|
|
url = "https://one.example.com?%0ahost=two.example.com/foo.git"
|
|
EOF
|
|
git add .gitmodules &&
|
|
git commit -m "gitmodules 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_expect_success 'fsck rejects embedded newline in relative url' '
|
|
git checkout --orphan relative-newline &&
|
|
cat >.gitmodules <<-\EOF &&
|
|
[submodule "foo"]
|
|
url = "./%0ahost=two.example.com/foo.git"
|
|
EOF
|
|
git add .gitmodules &&
|
|
git commit -m "relative 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
|