threads / bug / 60043

[BUG] Git 2.39.0+ Git.pm ignores Directory=> argument for bare repos

Subject: [BUG] Git 2.39.0+ Git.pm ignores Directory=> argument for bare repos

## tl;dr

2 messages between Jul 30, 2023 and Jul 31, 2023.

replies: 1people: 2as markdown or json

Hank Leininger· Jul 30, 2023, 20:42 UTC · lore

Recent git versions (2.39.0 through 2.41.0) Git.pm seems to forget its Directory argument for bare repos. Initial creation of a Git->repository object will succeed, but subsequent $repo->command() fails unless the repo is in pwd or is set in the GIT_DIR environment argument.

  patsy@ultron ~/tmp/repo-test $ git init --bare test1.git
  Initialized empty Git repository in /home/patsy/tmp/repo-test/test1.git/
  # success with 2.38.4
  patsy@ultron ~/tmp/repo-test $ git --version
  git version 2.38.4
  patsy@ultron ~/tmp/repo-test $ perl -MGit -e 'my $repo = Git->repository(Directory=>"/home/patsy/tmp/repo-test/test1.git/")||die "git open failed: $!\n"; $repo->command("rev-list", "--all", "-1"); print "rev-list succeeded\n"'
  rev-list succeeded
  # fail with 2.41.0
  patsy@ultron ~/tmp/repo-test $ git --version
  git version 2.41.0
  patsy@ultron ~/tmp/repo-test $ perl -MGit -e 'my $repo =
  Git->repository(Directory=>"/home/patsy/tmp/repo-test/test1.git/")||die "git open failed: $!\n"; $repo->command("rev-list", "--all", "-1"); print "rev-list succeeded\n"'
  fatal: not a git repository: '/home/patsy/tmp/repo-test'
  rev-list --all -1: command returned error: 128
  # success with 2.41.0 after cd
  patsy@ultron ~/tmp/repo-test $ cd test1.git/
  patsy@ultron ~/tmp/repo-test/test1.git $ perl -MGit -e 'my $repo = Git->repository(Directory=>"/home/patsy/tmp/repo-test/test1.git/")||die "git open failed: $!\n"; $repo->command("rev-list", "--all", "-1"); print "rev-list succeeded\n"'
  rev-list succeeded
  # success with 2.41.0 with GIT_DIR= set
  patsy@ultron ~/tmp/repo-test $
  GIT_DIR=/home/patsy/tmp/repo-test/test1.git/ perl -MGit -e 'my $repo = Git->repository(Directory=>"/home/patsy/tmp/repo-test/test1.git/")||die "git open failed: $!\n"; $repo->command("rev-list", "--all", "-1"); print "rev-list succeeded\n"'
  rev-list succeeded
It seems to be only bare repos that are a problem:
  # success with 2.41.0 for a non-bare repo
  patsy@ultron ~/tmp/repo-test $ git --version
  git version 2.41.0
  patsy@ultron ~/tmp/repo-test $ git init test2
  Initialized empty Git repository in /home/patsy/tmp/repo-test/test2/.git/
  patsy@ultron ~/tmp/repo-test $ perl -MGit -e 'my $repo = Git->repository(Directory=>"/home/patsy/tmp/repo-test/test2")||die "git open failed: $!\n"; $repo->command("rev-list", "--all", "-1"); print "rev-list succeeded\n"'
  rev-list succeeded

When stracing both, I can see that Git.pm does an initial execve of git rev-parse --is-bare-repository --git-dir, and it *does* cd prior to that. But running the specified command is done in a new child which does not chdir first. For non-bare repos, the child executing the command does chdir.

Thanks,
-- 
Hank Leininger <hlein@korelogic.com>
9606 3BF9 B593 4CBC E31A  A384 6200 F6E3 781E 3DD7
Junio C Hamano· Jul 31, 2023, 15:44 UTC · re: Hank Leininger · lore

Re: [BUG] Git 2.39.0+ Git.pm ignores Directory=> argument for bare repos

Hank Leininger <hlein@korelogic.com> writes:
Show 5 quoted lines
> Recent git versions (2.39.0 through 2.41.0) Git.pm seems to forget its
> Directory argument for bare repos. Initial creation of a
> Git->repository object will succeed, but subsequent $repo->command()
> fails unless the repo is in pwd or is set in the GIT_DIR environment
> argument.

$ git log --oneline v2.38.0..v2.39.0 -- perl/Git.pm 20da61f25f Git.pm: trust rev-parse to find bare repositories 77a1310e6b Git.pm: add semicolon after catch statement

My guess is 20da61f25f is likely the source of the differences, but it is unclear if that should be called a "bug", as it was done as a fix for misbehaviour.

commit 20da61f25f8f61a2b581b60f8820ad6116f88e6f
Author: Jeff King <peff@peff.net>
Date:   Sat Oct 22 18:08:59 2022 -0400
    Git.pm: trust rev-parse to find bare repositories
    
    When initializing a repository object, we run "git rev-parse --git-dir"
    to let the C version of Git find the correct directory. But curiously,
    if this fails we don't automatically say "not a git repository".
    Instead, we do our own pure-perl check to see if we're in a bare
    repository.
    
    This makes little sense, as rev-parse will report both bare and non-bare
    directories. This logic comes from d5c7721d58 (Git.pm: Add support for
    subdirectories inside of working copies, 2006-06-24), but I don't see
    any reason given why we can't just rely on rev-parse. Worse, because we
    treat any non-error response from rev-parse as a non-bare repository,
    we'll erroneously set the object's WorkingCopy, even in a bare
    repository.
    
    But it gets worse. Since 8959555cee (setup_git_directory(): add an owner
    check for the top-level directory, 2022-03-02), it's actively wrong (and
    dangerous). The perl code doesn't implement the same ownership checks.
    And worse, after "finding" the bare repository, it sets GIT_DIR in the
    environment, which tells any subsequent Git commands that we've
    confirmed the directory is OK, and to trust us. I.e., it re-opens the
    vulnerability plugged by 8959555cee when using Git.pm's repository
    discovery code.
    
    We can fix this by just relying on rev-parse to tell us when we're not
    in a repository, which fixes the vulnerability. Furthermore, we'll ask
    its --is-bare-repository function to tell us if we're bare or not, and
    rely on that.

← back to recent threads