From: Brandon Williams <bmwill@google.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, sbeller@google.com, bburky@bburky.com,
jrnieder@gmail.com
Subject: Re: [PATCH v3] transport: add protocol policy config option
Date: Mon, 7 Nov 2016 11:17:54 -0800 [thread overview]
Message-ID: <20161107191754.GB143723@google.com> (raw)
In-Reply-To: <20161104230613.epbziphiqyl57bcn@sigill.intra.peff.net>
On 11/04, Jeff King wrote:
> > diff --git a/Documentation/config.txt b/Documentation/config.txt
> > index 27069ac..5d845c4 100644
> > --- a/Documentation/config.txt
> > +++ b/Documentation/config.txt
> > @@ -2308,6 +2308,31 @@ pretty.<name>::
> > Note that an alias with the same name as a built-in format
> > will be silently ignored.
> >
> > +protocol.allow::
> > + If set, provide a user defined default policy for all protocols which
> > + don't explicitly have a policy (protocol.<name>.allow). By default,
> > + if unset, known-safe protocols (http, https, git, ssh, file) have a
> > + default policy of `always`, known-dangerous protocols (ext) have a
> > + default policy of `never`, and all other protocols have a default policy
> > + of `user`. Supported policies:
> > ++
> > +--
> > +
> > +* `always` - protocol is always able to be used.
> > +
> > +* `never` - protocol is never able to be used.
> > +
> > +* `user` - protocol is only able to be used when `GIT_PROTOCOL_FROM_USER` is
> > + either unset or has a value of 1. This policy should be used when you want a
> > + protocol to be usable by the user but don't want it used by commands which
> > + execute clone/fetch/pull commands without user input, e.g. recursive
> > + submodule initialization.
>
> Makes sense. I wonder if it would be good to emphasize _directly_ usable
> here. I.e., "...when you want a protocol to be directly usable by the
> user but don't want...".
>
> Should clone/fetch/pull also include push?
You're right, that should really have been clone/fetch/push.
>
> > +protocol.<name>.allow::
> > + Set a policy to be used by protocol <name> with clone/fetch/pull commands.
> > +
>
> Nice that this matches protocol.allow, so we don't need to re-explain
> that.
>
> Should the list of protocols be here? I know they're covered under
> GIT_ALLOW_PROTOCOL already, but if this is the preferred system, we
> should probably explain them here, and then just have GIT_ALLOW_PROTOCOL
> refer the user.
Right now the list of protocols under GIT_ALLOW_PROTOCOL looks like it
has a bit more documentation with how the colon list works. The
protocols are also mentioned above with their default behaviour.
>
> > diff --git a/Documentation/git.txt b/Documentation/git.txt
> > index ab7215e..ab25580 100644
> > --- a/Documentation/git.txt
> > +++ b/Documentation/git.txt
> > @@ -1150,13 +1150,13 @@ of clones and fetches.
> > cloning a repository to make a backup).
> >
> > `GIT_ALLOW_PROTOCOL`::
> > - If set, provide a colon-separated list of protocols which are
> > - allowed to be used with fetch/push/clone. This is useful to
> > - restrict recursive submodule initialization from an untrusted
> > - repository. Any protocol not mentioned will be disallowed (i.e.,
> > - this is a whitelist, not a blacklist). If the variable is not
> > - set at all, all protocols are enabled. The protocol names
> > - currently used by git are:
> > + The new way to configure allowed protocols is done through the config
> > + interface, though this setting takes precedences. See
> > + linkgit:git-config[1] for more details. If set, provide a
> > + colon-separated list of protocols which are allowed to be used with
> > + fetch/push/clone. Any protocol not mentioned will be disallowed (i.e.,
> > + this is a whitelist, not a blacklist). The protocol names currently
> > + used by git are:
>
> I wonder if we can explain this in terms of the config system. Something
> like:
>
> If set to a colon-separated list of zero or more protocols, behave as
> if `protocol.allow` is set to `never`, and each of the listed
> protocols has `protocol.$protocol.allow` set to `always`.
Yeah that makes sense.
>
> > +`GIT_PROTOCOL_FROM_USER`::
> > + Set to 0 to prevent protocols used by fetch/push/clone which are
> > + configured to the `user` state. This is useful to restrict recursive
> > + submodule initialization from an untrusted repository. See
> > + linkgit:git-config[1] for more details.
>
> Under "this is useful", it may make sense to make it clear that external
> programs can use this, too. Something like:
>
> It may also be useful for programs which feed potentially-untrusted
> URLs to git commands.
I'll put that in too.
>
> > diff --git a/t/lib-proto-disable.sh b/t/lib-proto-disable.sh
> > index b0917d9..5950fbf 100644
> > --- a/t/lib-proto-disable.sh
> > +++ b/t/lib-proto-disable.sh
> > @@ -1,15 +1,12 @@
> > # Test routines for checking protocol disabling.
> >
> > -# test cloning a particular protocol
> > -# $1 - description of the protocol
> > -# $2 - machine-readable name of the protocol
> > -# $3 - the URL to try cloning
> > -test_proto () {
> > +# Test clone/fetch/push with GIT_ALLOW_PROTOCOL whitelist
> > +test_whitelist () {
> > desc=$1
> > proto=$2
> > url=$3
> >
> > - test_expect_success "clone $1 (enabled)" '
> > + test_expect_success "clone $desc (enabled)" '
>
> Yeah, this should have been $desc all along. It makes the diff really
> noisy, though. Should it be split out into a preparatory change?
I'll pull it out to make the patch a bit cleaner.
--
Brandon Williams
next prev parent reply other threads:[~2016-11-07 19:18 UTC|newest]
Thread overview: 124+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-02 22:20 [PATCH] transport: add core.allowProtocol config option Brandon Williams
2016-11-02 22:41 ` Stefan Beller
2016-11-02 22:47 ` Brandon Williams
2016-11-02 23:05 ` Jeff King
2016-11-02 23:08 ` Jeff King
2016-11-02 23:34 ` Brandon Williams
2016-11-02 23:33 ` Brandon Williams
2016-11-02 23:46 ` Brandon Williams
2016-11-03 0:08 ` Jeff King
2016-11-03 0:22 ` Jonathan Nieder
2016-11-03 0:41 ` Blake Burkhart
2016-11-03 2:44 ` Junio C Hamano
2016-11-03 14:38 ` Jeff King
2016-11-03 17:25 ` Brandon Williams
2016-11-03 17:39 ` Stefan Beller
2016-11-03 17:51 ` Brandon Williams
2016-11-03 18:02 ` Jeff King
2016-11-03 18:08 ` Brandon Williams
2016-11-03 18:00 ` Jeff King
2016-11-03 17:53 ` Jeff King
2016-11-03 18:19 ` Brandon Williams
2016-11-03 18:25 ` Jeff King
2016-11-03 18:24 ` Jeff King
2016-11-03 18:45 ` Brandon Williams
2016-11-03 18:50 ` Jeff King
2016-11-03 18:56 ` Brandon Williams
2016-11-03 0:50 ` [PATCH v2] " Brandon Williams
2016-11-04 20:55 ` [PATCH v3] transport: add protocol policy " Brandon Williams
2016-11-04 20:58 ` Brandon Williams
2016-11-04 21:35 ` Stefan Beller
2016-11-04 23:09 ` Jeff King
2016-11-05 0:18 ` Brandon Williams
2016-11-04 22:38 ` Stefan Beller
2016-11-07 18:14 ` Brandon Williams
2016-11-04 23:06 ` Jeff King
2016-11-07 19:17 ` Brandon Williams [this message]
2016-11-07 19:35 ` [PATCH v4 1/2] lib-proto-disable: variable name fix Brandon Williams
2016-11-07 19:35 ` [PATCH v4 2/2] transport: add protocol policy config option Brandon Williams
2016-11-07 20:44 ` Jeff King
2016-11-07 21:02 ` Brandon Williams
2016-11-07 20:26 ` [PATCH v4 1/2] lib-proto-disable: variable name fix Jeff King
2016-11-07 20:40 ` Brandon Williams
2016-11-07 20:48 ` Jeff King
2016-11-08 3:32 ` Jacob Keller
2016-11-08 20:52 ` Junio C Hamano
2016-11-07 21:51 ` [PATCH v5 " Brandon Williams
2016-11-07 21:51 ` [PATCH v5 2/2] transport: add protocol policy config option Brandon Williams
2016-11-08 22:04 ` Jeff King
2016-11-08 22:05 ` Brandon Williams
2016-12-01 19:44 ` [PATCH v6 0/4] transport protocol policy configuration Brandon Williams
2016-12-01 19:44 ` [PATCH v6 1/4] lib-proto-disable: variable name fix Brandon Williams
2016-12-01 19:44 ` [PATCH v6 2/4] transport: add protocol policy config option Brandon Williams
2016-12-01 19:44 ` [PATCH v6 3/4] http: always warn if libcurl version is too old Brandon Williams
2016-12-01 19:44 ` [PATCH v6 4/4] transport: check if protocol can be used on a redirect Brandon Williams
2016-12-01 19:48 ` Brandon Williams
2016-12-01 19:49 ` Brandon Williams
2016-12-01 19:50 ` Jeff King
2016-12-01 19:54 ` Junio C Hamano
2016-12-01 19:59 ` Jeff King
2016-12-01 20:01 ` Brandon Williams
2016-12-01 20:25 ` [PATCH v7 0/4] transport protocol policy configuration Brandon Williams
2016-12-01 20:25 ` [PATCH v7 1/4] lib-proto-disable: variable name fix Brandon Williams
2016-12-01 20:25 ` [PATCH v7 2/4] transport: add protocol policy config option Brandon Williams
2016-12-01 20:25 ` [PATCH v7 3/4] http: always warn if libcurl version is too old Brandon Williams
2016-12-01 20:25 ` [PATCH v7 4/4] transport: add from_user parameter to is_transport_allowed Brandon Williams
2016-12-01 21:40 ` Jeff King
2016-12-01 22:25 ` Junio C Hamano
2016-12-01 23:07 ` Brandon Williams
2016-12-01 23:26 ` Brandon Williams
2016-12-02 0:13 ` Jeff King
2016-12-02 17:33 ` Brandon Williams
2016-12-01 23:34 ` Junio C Hamano
2016-12-01 23:58 ` Brandon Williams
2016-12-05 20:04 ` Junio C Hamano
2016-12-05 22:22 ` Brandon Williams
2016-12-05 23:19 ` Junio C Hamano
2016-12-05 23:22 ` Brandon Williams
2016-12-06 13:51 ` Jeff King
2016-12-06 17:53 ` Junio C Hamano
2016-12-06 18:10 ` Jeff King
2016-12-06 18:24 ` [PATCH v2] jk/http-walker-limit-redirect rebased to maint-2.9 Jeff King
2016-12-06 18:24 ` [PATCH v2 1/6] http: simplify update_url_from_redirect Jeff King
2016-12-06 18:24 ` [PATCH v2 2/6] http: always update the base URL for redirects Jeff King
2016-12-06 18:24 ` [PATCH v2 3/6] remote-curl: rename shadowed options variable Jeff King
2016-12-06 18:24 ` [PATCH v2 4/6] http: make redirects more obvious Jeff King
2016-12-06 18:24 ` [PATCH v2 5/6] http: treat http-alternates like redirects Jeff King
2016-12-06 18:25 ` [PATCH v2 6/6] http-walker: complain about non-404 loose object errors Jeff King
2016-12-06 22:24 ` [PATCH v7 4/4] transport: add from_user parameter to is_transport_allowed Brandon Williams
2016-12-02 0:00 ` [PATCH v8 0/5] transport protocol policy configuration Brandon Williams
2016-12-02 0:00 ` [PATCH v8 1/5] lib-proto-disable: variable name fix Brandon Williams
2016-12-02 0:00 ` [PATCH v8 2/5] transport: add protocol policy config option Brandon Williams
2016-12-02 0:01 ` [PATCH v8 3/5] http: always warn if libcurl version is too old Brandon Williams
2016-12-02 0:01 ` [PATCH v8 4/5] http: create function to get curl allowed protocols Brandon Williams
2016-12-02 0:01 ` [PATCH v8 5/5] transport: add from_user parameter to is_transport_allowed Brandon Williams
2016-12-14 1:40 ` [PATCH v9 0/5] transport protocol policy configuration Brandon Williams
2016-12-14 1:40 ` [PATCH v9 1/5] lib-proto-disable: variable name fix Brandon Williams
2016-12-14 1:40 ` [PATCH v9 2/5] transport: add protocol policy config option Brandon Williams
2016-12-14 1:40 ` [PATCH v9 3/5] http: always warn if libcurl version is too old Brandon Williams
2016-12-14 16:01 ` Jeff King
2016-12-14 17:56 ` Brandon Williams
2016-12-14 1:40 ` [PATCH v9 4/5] http: create function to get curl allowed protocols Brandon Williams
2016-12-14 16:03 ` Jeff King
2016-12-14 18:00 ` Brandon Williams
2016-12-14 1:40 ` [PATCH v9 5/5] transport: add from_user parameter to is_transport_allowed Brandon Williams
2016-12-14 16:40 ` Jeff King
2016-12-14 20:13 ` Brandon Williams
2016-12-14 20:33 ` Jeff King
2016-12-14 21:12 ` Jeff King
2016-12-14 21:58 ` Brandon Williams
[not found] ` <CAP3OtXiOPbAkr5Mn+5tEmZZAZzJXQ4CvtpHCg=wt+k-bi6K2vA@mail.gmail.com>
[not found] ` <CAP3OtXhH++szRws20MaHt-ftLBMUJuYiTmfL50mOFP4FA4Mn6Q@mail.gmail.com>
2016-12-14 22:52 ` Jeff King
2016-12-14 20:37 ` Brandon Williams
2016-12-14 20:41 ` Jeff King
2016-12-14 20:50 ` Brandon Williams
2016-12-14 22:39 ` [PATCH v10 0/6] transport protocol policy configuration Brandon Williams
2016-12-14 22:39 ` [PATCH v10 1/6] lib-proto-disable: variable name fix Brandon Williams
2016-12-14 22:39 ` [PATCH v10 2/6] http: always warn if libcurl version is too old Brandon Williams
2016-12-15 0:21 ` Jeff King
2016-12-15 17:29 ` Junio C Hamano
2016-12-14 22:39 ` [PATCH v10 3/6] transport: add protocol policy config option Brandon Williams
2016-12-14 22:39 ` [PATCH v10 4/6] http: create function to get curl allowed protocols Brandon Williams
2016-12-14 22:39 ` [PATCH v10 5/6] transport: add from_user parameter to is_transport_allowed Brandon Williams
2016-12-14 22:39 ` [PATCH v10 6/6] http: respect protocol.*.allow=user for http-alternates Brandon Williams
2016-12-14 23:25 ` [PATCH v10 0/6] transport protocol policy configuration Junio C Hamano
2016-12-15 0:22 ` Jeff King
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=20161107191754.GB143723@google.com \
--to=bmwill@google.com \
--cc=bburky@bburky.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--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).