http: support CURLOPT_PROTOCOLS_STR

The CURLOPT_PROTOCOLS (and matching CURLOPT_REDIR_PROTOCOLS) flag was
deprecated in curl 7.85.0, and using it generate compiler warnings as of
curl 7.87.0. The path forward is to use CURLOPT_PROTOCOLS_STR, but we
can't just do so unilaterally, as it was only introduced less than a
year ago in 7.85.0.

Until that version becomes ubiquitous, we have to either disable the
deprecation warning or conditionally use the "STR" variant on newer
versions of libcurl. This patch switches to the new variant, which is
nice for two reasons:

  - we don't have to worry that silencing curl's deprecation warnings
    might cause us to miss other more useful ones

  - we'd eventually want to move to the new variant anyway, so this gets
    us set up (albeit with some extra ugly boilerplate for the
    conditional)

There are a lot of ways to split up the two cases. One way would be to
abstract the storage type (strbuf versus a long), how to append
(strbuf_addstr vs bitwise OR), how to initialize, which CURLOPT to use,
and so on. But the resulting code looks pretty magical:

  GIT_CURL_PROTOCOL_TYPE allowed = GIT_CURL_PROTOCOL_TYPE_INIT;
  if (...http is allowed...)
	GIT_CURL_PROTOCOL_APPEND(&allowed, "http", CURLOPT_HTTP);

and you end up with more "#define GIT_CURL_PROTOCOL_TYPE" macros than
actual code.

On the other end of the spectrum, we could just implement two separate
functions, one that handles a string list and one that handles bits. But
then we end up repeating our list of protocols (http, https, ftp, ftp).

This patch takes the middle ground. The run-time code is always there to
handle both types, and we just choose which one to feed to curl.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-curl-compat.h b/git-curl-compat.h
index 56a83b6bbd8c43291c94907e74795a46781927bc..fd96b3cdffdb6cd11b429bcada40663e80dbebc9 100644 (file)
--- a/git-curl-compat.h
+++ b/git-curl-compat.h
@@ -126,4 +126,12 @@
 #define GIT_CURL_HAVE_CURLSSLSET_NO_BACKENDS
 #endif
 
+/**
+ * CURLOPT_PROTOCOLS_STR and CURLOPT_REDIR_PROTOCOLS_STR were added in 7.85.0,
+ * released in August 2022.
+ */
+#if LIBCURL_VERSION_NUM >= 0x075500
+#define GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR 1
+#endif
+
 #endif

diff --git a/http.c b/http.c
index ca0fe80ddb86b365c09275e2009cfdf460e010d1..c4b6ddef287b90f6492706cdaa483c1832d8b06c 100644 (file)
--- a/http.c
+++ b/http.c
@@ -764,20 +764,37 @@ void setup_curl_trace(CURL *handle)
        curl_easy_setopt(handle, CURLOPT_DEBUGDATA, NULL);
 }
 
-static long get_curl_allowed_protocols(int from_user)
+static void proto_list_append(struct strbuf *list, const char *proto)
 {
-       long allowed_protocols = 0;
+       if (!list)
+               return;
+       if (list->len)
+               strbuf_addch(list, ',');
+       strbuf_addstr(list, proto);
+}
 
-       if (is_transport_allowed("http", from_user))
-               allowed_protocols |= CURLPROTO_HTTP;
-       if (is_transport_allowed("https", from_user))
-               allowed_protocols |= CURLPROTO_HTTPS;
-       if (is_transport_allowed("ftp", from_user))
-               allowed_protocols |= CURLPROTO_FTP;
-       if (is_transport_allowed("ftps", from_user))
-               allowed_protocols |= CURLPROTO_FTPS;
+static long get_curl_allowed_protocols(int from_user, struct strbuf *list)
+{
+       long bits = 0;
 
-       return allowed_protocols;
+       if (is_transport_allowed("http", from_user)) {
+               bits |= CURLPROTO_HTTP;
+               proto_list_append(list, "http");
+       }
+       if (is_transport_allowed("https", from_user)) {
+               bits |= CURLPROTO_HTTPS;
+               proto_list_append(list, "https");
+       }
+       if (is_transport_allowed("ftp", from_user)) {
+               bits |= CURLPROTO_FTP;
+               proto_list_append(list, "ftp");
+       }
+       if (is_transport_allowed("ftps", from_user)) {
+               bits |= CURLPROTO_FTPS;
+               proto_list_append(list, "ftps");
+       }
+
+       return bits;
 }
 
 #ifdef GIT_CURL_HAVE_CURL_HTTP_VERSION_2
@@ -921,10 +938,26 @@ static CURL *get_curl_handle(void)
 
        curl_easy_setopt(result, CURLOPT_MAXREDIRS, 20);
        curl_easy_setopt(result, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+
+#ifdef GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR
+       {
+               struct strbuf buf = STRBUF_INIT;
+
+               get_curl_allowed_protocols(0, &buf);
+               curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS_STR, buf.buf);
+               strbuf_reset(&buf);
+
+               get_curl_allowed_protocols(-1, &buf);
+               curl_easy_setopt(result, CURLOPT_PROTOCOLS_STR, buf.buf);
+               strbuf_release(&buf);
+       }
+#else
        curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS,
-                        get_curl_allowed_protocols(0));
+                        get_curl_allowed_protocols(0, NULL));
        curl_easy_setopt(result, CURLOPT_PROTOCOLS,
-                        get_curl_allowed_protocols(-1));
+                        get_curl_allowed_protocols(-1, NULL));
+#endif
+
        if (getenv("GIT_CURL_VERBOSE"))
                http_trace_curl_no_data();
        setup_curl_trace(result);