git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Bare repositories in the working tree are a security risk

From
Taylor Blau <me@ttaylorr.com>
Date
Apr 21, 2022, 19:09 UTC
Message-ID
<YmGr0upicQJML+9B@nand.local>
In-Reply-To
<CAJoAoZkgnnvdymuBsM9Ja3+eYSnyohr=FQZMVX_uzZ_pkQhgaw@mail.gmail.com>
On Thu, Apr 21, 2022 at 11:25:39AM -0700, Emily Shaffer wrote:
Show 37 quoted lines
> On Fri, Apr 15, 2022 at 6:28 PM Taylor Blau <me@ttaylorr.com> wrote:
> >
> > On Fri, Apr 15, 2022 at 05:41:59PM -0700, Glen Choo wrote:
> > > * We want additional protection on the client besides `git fsck`; there are
> > >   a few ways to do this:
> >
> > I'm a little late to chime into the thread, but I appreciate you
> > summarizing some of the approaches discussed so far. Let me add my
> > thoughts on each of these in order:
> >
> > >   1. Prevent checking out an embedded bare repo.
> > >   2. Detect if the bare repo is embedded and refuse to work with it.
> > >   3. Detect if the bare repo is embedded and do not read its config/hooks, but
> > >      everything else still 'works'.
> > >   4. Don't detect bare repos.
> > >   5. Only detect bare repos that are named `.git` [1].
> > >
> > >   (I've responded with my thoughts on each of these approaches in-thread).
> >
> >   1. Likely disrupts too many legitimate workflows for us to adopt
> >      without designing some way to declare an embedded bare repository
> >      is "safe".
> >   2. Ditto.
> >   3. This seems the most promising approach so far. Similar to (1), I
> >      would also want to make sure we provide an easy way to declare a
> >      bare repository as "safe" in order to avoid permanently disrupting
> >      valid workflows that have accumulated over the past >15 years.
>
> I'd like to think a little more about how we want to determine that a
> bare repo isn't embedded - wantonly scanning up the filesystem for any
> gitdir above the current one is really expensive. When I tried that
> approach for the purposes of including some shared config between
> superproject and submodules, it slowed down the Git test suite by
> something like 3-5x. So, I suppose that "we think this is bare" means
> refs/ and objects/ present in a directory that isn't named '.git/',
> and then we hunt anywhere above us for another .git/? Of course being
> careful not to accept another bare repo as the "parent" gitdir.

Definitely worth considering. Fundamentally I think if you're going to allow checking out embedded bare repositories (which I strongly think that we should), any search for "is this repository embedded in another one?" needs to walk along its entire path up to the filesystem root.

I'd think that we could offer some tools, perhaps "safe.boundary", specifying a list of directories to halt our traversal at. IOW, if you have a bunch of bare repositories underneath /data/repositories, and know that they're all safe, you could set your boundary there to signal to Git "if my path is a subdirectory of anything in safe.boundary, then I don't care whether the repo is embedded or not".

Show 8 quoted lines
> Does it work for submodules? I suppose it works for non-bare
> submodules - and for bare submodules, e.g.
> 'submodule-having-project.git/modules/some-submodule/' we can rely on
> the user to turn that flag on if they want their submodule's config
> and hooks to be noticed from the gitdir. (From
> 'worktree-for-submodule-having-project/some-submodule' there is a
> '.git' pointer, so I'd expect things to work normally that way,
> right?)
I don't enough about submodules to comment here, sorry.
Show 7 quoted lines
> > Here's an alternative approach, which I haven't seen discussed thus
> > far: [...]
>
> Nice - a more strict spin on proposal 3 from above, if I understand it
> right. Rather than allowing any and all bare repos, avoid someone
> sneaking in a malicious one next to legitimate ones by using an
> allowlist. Seems reasonable to me.

We'd probably want to allow saying "all embedded bare repositories are safe to read config/hooks from", too. I hadn't considered this approach as a way to read some embedded repos and not others; I suspect the overwhelmingly common use-case would be: `git config --local safe.embeddedRepo '*'`.

Thanks, Taylor

Previous: Taylor BlauNext: Emily Shaffer
Message 42 of 50 in “Bare repositories in the working tree are a security risk”
  1. Glen ChooApr 6, 2022
  2. fsck: detect bare repos in trees and warnGlen Choo, Apr 6, 2022
  3. Johannes SchindelinApr 7, 2022
  4. Derrick StoleeApr 7, 2022
  5. Ævar Arnfjörð BjarmasonApr 7, 2022
  6. Glen ChooApr 14, 2022
  7. Ævar Arnfjörð BjarmasonApr 15, 2022
  8. Junio C HamanoApr 7, 2022
  9. Glen ChooApr 13, 2022
  10. Ævar Arnfjörð BjarmasonApr 7, 2022
  11. Junio C HamanoApr 7, 2022
  12. John CaiApr 7, 2022
  13. brian m. carlsonApr 7, 2022
  14. Justin StevenApr 7, 2022
  15. brian m. carlsonApr 7, 2022
  16. rsbecker@nexbridge.comApr 7, 2022
  17. Junio C HamanoApr 8, 2022
  18. Junio C HamanoApr 14, 2022
  19. Glen ChooApr 14, 2022
  20. Glen ChooApr 13, 2022
  21. Glen ChooApr 13, 2022
  22. Junio C HamanoApr 13, 2022
  23. Glen ChooApr 14, 2022
  24. Junio C HamanoApr 14, 2022
  25. Junio C HamanoApr 14, 2022
  26. Glen ChooApr 15, 2022
  27. Junio C HamanoApr 15, 2022
  28. Taylor BlauApr 16, 2022
  29. Glen ChooApr 15, 2022
  30. Junio C HamanoApr 15, 2022
  31. Glen ChooApr 15, 2022
  32. Glen ChooApr 15, 2022
  33. Taylor BlauApr 16, 2022
  34. Junio C HamanoApr 16, 2022
  35. Taylor BlauApr 16, 2022
  36. Glen ChooApr 16, 2022
  37. Taylor BlauApr 16, 2022
  38. Emily ShafferApr 21, 2022
  39. Emily ShafferApr 21, 2022
  40. Junio C HamanoApr 21, 2022
  41. Taylor BlauApr 21, 2022
  42. Taylor BlauApr 21, 2022
  43. Emily ShafferApr 21, 2022
  44. Taylor BlauApr 21, 2022
  45. Glen ChooApr 29, 2022
  46. Taylor BlauApr 30, 2022
  47. Glen ChooMay 2, 2022
  48. Philip OakleyMay 2, 2022
  49. Junio C HamanoMay 2, 2022
  50. Glen ChooApr 16, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.