From: Jonathan Nieder <jrnieder@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Brandon Williams <bwilliams.eng@gmail.com>,
Stefan Beller <sbeller@google.com>,
Aaron Schrab <aaron@schrab.com>
Subject: Re: [RFC] submodule: munge paths to submodule git directories
Date: Mon, 14 Jan 2019 17:25:07 -0800 [thread overview]
Message-ID: <20190115012507.GK162110@google.com> (raw)
In-Reply-To: <20180807230637.247200-1-bmwill@google.com>
Hi,
In August, 2018, Brandon Williams wrote:
> Commit 0383bbb901 (submodule-config: verify submodule names as paths,
> 2018-04-30) introduced some checks to ensure that submodule names don't
> include directory traversal components (e.g. "../").
>
> This addresses the vulnerability identified in 0383bbb901 but the root
> cause is that we use submodule names to construct paths to the
> submodule's git directory. What we really should do is munge the
> submodule name before using it to construct a path.
Thanks again for this. I liked the proposal enough to run Git with
patches implementing it for a while. That said, there were some
unaddressed comments in the review.
I've put a summary in https://crbug.com/git/28 to make this easier to
pick up where we left off. Summary from there of the upstream review:
1. Using urlencoding to escape the slashes is fine, but what if we
want to escape some other character (for example to handle
case-insensitive filesystems)?
Proposal: Store the escaping mapping in config[1] so it can be
modified it in the future:
[submodule "plugin/hooks"]
gitdirname = plugins%2fhooks
2. The urlencoded name could conflict with a submodule that has % in
its name in an existing clone created by an older version of Git.
Proposal: Put submodules in a new .git/submodules/ directory
instead of .git/modules/.
3. These gitdirname settings can clutter up .git/config.
Proposal: For the "easy" cases (e.g. submodule name consisting of
[a-z]*), allow omitting the gitdirname setting.
Is that a fair summary? Are there concerns from the review that I
forgot, or would a new version of the series that addresses those
three problems put us in good shape?
Thanks,
Jonathan
[1] https://public-inbox.org/git/20180816181940.46114-1-bmwill@google.com/
next prev parent reply other threads:[~2019-01-15 1:25 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-07 23:06 [RFC] submodule: munge paths to submodule git directories Brandon Williams
2018-08-07 23:25 ` Jonathan Nieder
2018-08-08 0:14 ` Junio C Hamano
2018-08-08 22:33 ` [PATCH 0/2] munge submodule names Brandon Williams
2018-08-08 22:33 ` [PATCH 1/2] submodule: create helper to build paths to submodule gitdirs Brandon Williams
2018-08-08 23:21 ` Stefan Beller
2018-08-09 0:45 ` Brandon Williams
2018-08-10 21:27 ` Junio C Hamano
2018-08-10 21:45 ` Brandon Williams
2018-08-08 22:33 ` [PATCH 2/2] submodule: munge paths to submodule git directories Brandon Williams
2018-08-09 21:26 ` Jeff King
2018-08-14 18:04 ` Brandon Williams
2018-08-14 18:57 ` Jonathan Nieder
2018-08-14 21:08 ` Stefan Beller
2018-08-14 21:12 ` Jonathan Nieder
2018-08-14 22:34 ` Stefan Beller
2018-08-16 2:34 ` Jonathan Nieder
2018-08-16 2:39 ` Stefan Beller
2018-08-16 2:47 ` Jonathan Nieder
2018-08-16 17:34 ` Brandon Williams
2018-08-16 18:19 ` [PATCH] submodule: add config for where gitdirs are located Brandon Williams
2018-08-20 22:03 ` Junio C Hamano
2018-08-16 15:07 ` [PATCH 2/2] submodule: munge paths to submodule git directories Junio C Hamano
2018-08-14 18:58 ` Jeff King
2018-08-28 21:35 ` Stefan Beller
2018-08-29 5:25 ` Jeff King
2018-08-29 18:10 ` Stefan Beller
2018-08-29 21:03 ` Jeff King
2018-08-29 21:10 ` Stefan Beller
2018-08-29 21:18 ` Jonathan Nieder
2018-08-29 21:27 ` Stefan Beller
2018-08-29 21:30 ` Jeff King
2018-08-29 21:09 ` Jonathan Nieder
2018-08-29 21:14 ` Stefan Beller
2018-08-29 21:25 ` Brandon Williams
2018-08-29 21:32 ` Jeff King
2018-08-16 0:19 ` Aaron Schrab
2019-01-15 1:25 ` Jonathan Nieder [this message]
2019-01-17 17:32 ` [RFC] " Jeff King
2019-01-17 17:57 ` 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=20190115012507.GK162110@google.com \
--to=jrnieder@gmail.com \
--cc=aaron@schrab.com \
--cc=bwilliams.eng@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sbeller@google.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).