From: Brandon Williams <bmwill@google.com>
To: git@vger.kernel.org
Cc: Brandon Williams <bmwill@google.com>,
peff@peff.net, sbeller@google.com, bburky@bburky.com,
jrnieder@gmail.com
Subject: [PATCH v8 3/5] http: always warn if libcurl version is too old
Date: Thu, 1 Dec 2016 16:01:00 -0800 [thread overview]
Message-ID: <1480636862-40489-4-git-send-email-bmwill@google.com> (raw)
In-Reply-To: <1480636862-40489-1-git-send-email-bmwill@google.com>
Now that there are default "known-good" and "known-bad" protocols which
are allowed/disallowed by 'is_transport_allowed' we should always warn
the user that older versions of libcurl can't respect the allowed
protocols for redirects.
Signed-off-by: Brandon Williams <bmwill@google.com>
---
http.c | 5 ++---
transport.c | 5 -----
transport.h | 6 ------
3 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/http.c b/http.c
index 4c4a812..fee128b 100644
--- a/http.c
+++ b/http.c
@@ -735,9 +735,8 @@ static CURL *get_curl_handle(void)
allowed_protocols |= CURLPROTO_FTPS;
curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS, allowed_protocols);
#else
- if (transport_restrict_protocols())
- warning("protocol restrictions not applied to curl redirects because\n"
- "your curl version is too old (>= 7.19.4)");
+ warning("protocol restrictions not applied to curl redirects because\n"
+ "your curl version is too old (>= 7.19.4)");
#endif
if (getenv("GIT_CURL_VERBOSE"))
curl_easy_setopt(result, CURLOPT_VERBOSE, 1L);
diff --git a/transport.c b/transport.c
index 2c0ec76..186de9a 100644
--- a/transport.c
+++ b/transport.c
@@ -747,11 +747,6 @@ void transport_check_allowed(const char *type)
die("transport '%s' not allowed", type);
}
-int transport_restrict_protocols(void)
-{
- return !!protocol_whitelist();
-}
-
struct transport *transport_get(struct remote *remote, const char *url)
{
const char *helper;
diff --git a/transport.h b/transport.h
index b8e4ee8..f4998bc 100644
--- a/transport.h
+++ b/transport.h
@@ -164,12 +164,6 @@ int is_transport_allowed(const char *type);
*/
void transport_check_allowed(const char *type);
-/*
- * Returns true if the user has attempted to turn on protocol
- * restrictions at all.
- */
-int transport_restrict_protocols(void);
-
/* Transport options which apply to git:// and scp-style URLs */
/* The program to use on the remote side to send a pack */
--
2.8.0.rc3.226.g39d4020
next prev parent reply other threads:[~2016-12-02 0:01 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
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 ` Brandon Williams [this message]
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=1480636862-40489-4-git-send-email-bmwill@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).