From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, Loic Guelorget <loic@google.com>,
Jeff King <peff@peff.net>, Stefan Beller <sbeller@google.com>,
Sitaram Chamarty <sitaramc@gmail.com>
Subject: Re: Security of .git/config and .git/hooks
Date: Tue, 03 Oct 2017 10:12:18 +0900 [thread overview]
Message-ID: <xmqqtvzhkpal.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20171002234517.GV19555@aiede.mtv.corp.google.com> (Jonathan Nieder's message of "Mon, 2 Oct 2017 16:45:17 -0700")
Jonathan Nieder <jrnieder@gmail.com> writes:
> Proposed fix: because of case (1), I would like a way to tell Git to
> stop trusting any files in .git. That is:
>
> 1. Introduce a (configurable) list of "safe" configuration items that
> can be set in .git/config and don't respect any others.
The list of "safe" things are configurable by having something in
~/.gitconfig, perhaps?
How would this work, from the end-user's point of view, with "git
config --global" and "git config --local"?
> 2. But what if I want to set a different pager per-repository?
> I think we could do this using configuration "profiles".
> My ~/.config/git/profiles/ directory would contain git-style
> config files for repositories to include. Repositories could
> then contain
>
> [include]
> path = ~/.config/git/profiles/fancy-log-pager
>
> to make use of those settings. The facility (1) would
> special-case this directory to allow it to set "unsafe" settings
> since files there are assumed not to be under the control of an
> attacker.
Meaning, "include" is not in "safe" category, but a value that
begins with "~/.config/git/" are excempt???
> 3. Likewise for hooks: my ~/.config/git/hooks/ directory would
> contain hooks for repositories to make use of. Repositories could
> symlink to hook files from there to make use of them.
I am not sure what this means. .git/hooks/pre-commit being a
symbolic link to "~/.config/git/hooks/pre-commit-fancy"
(i.e. readlink gives the path with tilde unexpanded), so that the
attacked sysadmin will not run it from ~attacker/.config/git/hooks?
And the code that finds a hook to run sees .git/hooks/pre-commit,
resolves the symlink manually and makes sure it leads to somewhere
inside ~/.config/... (otherwise it rejects) and then uses the
pointed-at copy?
At that point, we are not taking any advantage of symbolic-link-ness
of the entity, so .git/hooks/pre-commit being a text file that has a
single like, e.g.
# safe-hook: pre-commit-fancy
may be sufficient (and we do not have to worry about systems without
symbolic links)? The machinery that used to manually resolved symlink
instead reads it, finds "pre-commit-fancy" in ~/.config/git/hooks/
and runs it, and you get the same behaviour, no?
> One downside of (3) is its reliance on symlinks. Some alternatives:
>
> 3b. Use core.hooksPath configuration instead. Rely on (2).
> 3c. Introduce new hook.* configuration to be used instead of hook
> scripts. Rely on (2).
I guess I invented 3d. without reading ahead X-<. None of the 3x
variants other than 3 proper will not work for scripts and existing
code that sees that .git/hooks/pre-commit is an executable and runs
it, and 3 proper will not work without symbolic links, so this means
we'd need "git locate-hook pre-commit" (and underlying locate_hook()
helper API) that returns "/home/me/.git/config/hook/pre-commit-fancy"
or fails when we do this transition. In an unconverted repository,
it may return $PWD/.git/hooks/pre-commit, or failure if we are
running under the paranoid mode.
Sounds workable.
next prev parent reply other threads:[~2017-10-03 1:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-02 23:45 Security of .git/config and .git/hooks Jonathan Nieder
2017-10-03 1:12 ` Junio C Hamano [this message]
2017-10-03 10:59 ` Christian Couder
2017-10-03 12:32 ` Jeff King
2017-10-03 15:10 ` Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqtvzhkpal.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=loic@google.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
--cc=sitaramc@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).