mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'gc/trace-bare-repo-setup'
The tracing mechanism learned to notice and report when auto-discovered bare repositories are being used, as allowing so without explicitly stating the user intends to do so (with setting GIT_DIR for example) can be used with social engineering as an attack vector. * gc/trace-bare-repo-setup: setup: trace bare repository setups
This commit is contained in:
commit
fa889347e3
1
setup.c
1
setup.c
|
@ -1352,6 +1352,7 @@ static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir,
|
|||
}
|
||||
|
||||
if (is_git_directory(dir->buf)) {
|
||||
trace2_data_string("setup", NULL, "implicit-bare-repository", dir->buf);
|
||||
if (get_allowed_bare_repo() == ALLOWED_BARE_REPO_EXPLICIT)
|
||||
return GIT_DIR_DISALLOWED_BARE;
|
||||
if (!ensure_valid_ownership(NULL, NULL, dir->buf, report))
|
||||
|
|
|
@ -7,13 +7,26 @@ TEST_PASSES_SANITIZE_LEAK=true
|
|||
|
||||
pwd="$(pwd)"
|
||||
|
||||
expect_accepted () {
|
||||
git "$@" rev-parse --git-dir
|
||||
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_must_fail git "$@" rev-parse --git-dir 2>err &&
|
||||
grep -F "cannot use bare repository" err
|
||||
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' '
|
||||
|
@ -22,12 +35,13 @@ test_expect_success 'setup bare repo in worktree' '
|
|||
'
|
||||
|
||||
test_expect_success 'safe.bareRepository unset' '
|
||||
expect_accepted -C outer-repo/bare-repo
|
||||
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 -C outer-repo/bare-repo
|
||||
expect_accepted_implicit -C outer-repo/bare-repo
|
||||
'
|
||||
|
||||
test_expect_success 'safe.bareRepository=explicit' '
|
||||
|
@ -47,7 +61,7 @@ test_expect_success 'safe.bareRepository in the repository' '
|
|||
|
||||
test_expect_success 'safe.bareRepository on the command line' '
|
||||
test_config_global safe.bareRepository explicit &&
|
||||
expect_accepted -C outer-repo/bare-repo \
|
||||
expect_accepted_implicit -C outer-repo/bare-repo \
|
||||
-c safe.bareRepository=all
|
||||
'
|
||||
|
||||
|
@ -60,4 +74,8 @@ test_expect_success 'safe.bareRepository in included file' '
|
|||
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_done
|
||||
|
|
Loading…
Reference in a new issue