mirror of
https://github.com/git/git.git
synced 2024-06-02 05:56:11 +02:00
45bb916248
The safe.bareRepository setting can be set to 'explicit' to disallow implicit uses of bare repositories, preventing an attack [1] where an artificial and malicious bare repository is embedded in another git repository. Unfortunately, some tooling uses myrepo/.git/ as the cwd when executing commands, and this is blocked when safe.bareRepository=explicit. Blocking is unnecessary, as git already prevents nested .git directories. Teach git to not reject uses of git inside of the .git directory: check if cwd is .git (or a subdirectory of it) and allow it even if safe.bareRepository=explicit. [1] https://github.com/justinsteven/advisories/blob/main/2022_git_buried_bare_repos_and_fsmonitor_various_abuses.md Signed-off-by: Kyle Lippincott <spectral@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
90 lines
2.6 KiB
Bash
Executable File
90 lines
2.6 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='verify safe.bareRepository checks'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
pwd="$(pwd)"
|
|
|
|
expect_accepted_implicit () {
|
|
test_when_finished 'rm "$pwd/trace.perf"' &&
|
|
GIT_TRACE2_PERF="$pwd/trace.perf" git "$@" rev-parse --git-dir &&
|
|
# Note: we're intentionally only checking that the bare repo has a
|
|
# directory *prefix* of $pwd
|
|
grep -F "implicit-bare-repository:$pwd" "$pwd/trace.perf"
|
|
}
|
|
|
|
expect_accepted_explicit () {
|
|
test_when_finished 'rm "$pwd/trace.perf"' &&
|
|
GIT_DIR="$1" GIT_TRACE2_PERF="$pwd/trace.perf" git rev-parse --git-dir &&
|
|
! grep -F "implicit-bare-repository:$pwd" "$pwd/trace.perf"
|
|
}
|
|
|
|
expect_rejected () {
|
|
test_when_finished 'rm "$pwd/trace.perf"' &&
|
|
test_env GIT_TRACE2_PERF="$pwd/trace.perf" \
|
|
test_must_fail git "$@" rev-parse --git-dir 2>err &&
|
|
grep -F "cannot use bare repository" err &&
|
|
grep -F "implicit-bare-repository:$pwd" "$pwd/trace.perf"
|
|
}
|
|
|
|
test_expect_success 'setup bare repo in worktree' '
|
|
git init outer-repo &&
|
|
git init --bare outer-repo/bare-repo
|
|
'
|
|
|
|
test_expect_success 'safe.bareRepository unset' '
|
|
test_unconfig --global safe.bareRepository &&
|
|
expect_accepted_implicit -C outer-repo/bare-repo
|
|
'
|
|
|
|
test_expect_success 'safe.bareRepository=all' '
|
|
test_config_global safe.bareRepository all &&
|
|
expect_accepted_implicit -C outer-repo/bare-repo
|
|
'
|
|
|
|
test_expect_success 'safe.bareRepository=explicit' '
|
|
test_config_global safe.bareRepository explicit &&
|
|
expect_rejected -C outer-repo/bare-repo
|
|
'
|
|
|
|
test_expect_success 'safe.bareRepository in the repository' '
|
|
# safe.bareRepository must not be "explicit", otherwise
|
|
# git config fails with "fatal: not in a git directory" (like
|
|
# safe.directory)
|
|
test_config -C outer-repo/bare-repo safe.bareRepository \
|
|
all &&
|
|
test_config_global safe.bareRepository explicit &&
|
|
expect_rejected -C outer-repo/bare-repo
|
|
'
|
|
|
|
test_expect_success 'safe.bareRepository on the command line' '
|
|
test_config_global safe.bareRepository explicit &&
|
|
expect_accepted_implicit -C outer-repo/bare-repo \
|
|
-c safe.bareRepository=all
|
|
'
|
|
|
|
test_expect_success 'safe.bareRepository in included file' '
|
|
cat >gitconfig-include <<-\EOF &&
|
|
[safe]
|
|
bareRepository = explicit
|
|
EOF
|
|
git config --global --add include.path "$(pwd)/gitconfig-include" &&
|
|
expect_rejected -C outer-repo/bare-repo
|
|
'
|
|
|
|
test_expect_success 'no trace when GIT_DIR is explicitly provided' '
|
|
expect_accepted_explicit "$pwd/outer-repo/bare-repo"
|
|
'
|
|
|
|
test_expect_success 'no trace when "bare repository" is .git' '
|
|
expect_accepted_implicit -C outer-repo/.git
|
|
'
|
|
|
|
test_expect_success 'no trace when "bare repository" is a subdir of .git' '
|
|
expect_accepted_implicit -C outer-repo/.git/objects
|
|
'
|
|
|
|
test_done
|