@matheusbsbs / matheus-bagliano / commits / 6c065f72b8

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>

Jeff King committed Jan 16, 2023 at 22:04 UTC 6c065f72b8d581eee53ab82e82da049ee492bf11

2 files changed +54 -13

git-curl-compat.h

@@ -126,4 +126,12 @@

126 #define GIT_CURL_HAVE_CURLSSLSET_NO_BACKENDS

127 #endif

128

129 +/**

130 + * CURLOPT_PROTOCOLS_STR and CURLOPT_REDIR_PROTOCOLS_STR were added in 7.85.0,

131 + * released in August 2022.

132 + */

133 +#if LIBCURL_VERSION_NUM >= 0x075500

134 +#define GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR 1

135 +#endif

136 +

137 #endif

http.c

+46 -13

@@ -764,20 +764,37 @@ void setup_curl_trace(CURL *handle)

764 curl_easy_setopt(handle, CURLOPT_DEBUGDATA, NULL);

765 }

766

767 -static long get_curl_allowed_protocols(int from_user)

767 +static void proto_list_append(struct strbuf *list, const char *proto)

768 {

769 - long allowed_protocols = 0;

769 + if (!list)

770 + return;

771 + if (list->len)

772 + strbuf_addch(list, ',');

773 + strbuf_addstr(list, proto);

774 +}

775

771 - if (is_transport_allowed("http", from_user))

772 - allowed_protocols |= CURLPROTO_HTTP;

773 - if (is_transport_allowed("https", from_user))

774 - allowed_protocols |= CURLPROTO_HTTPS;

775 - if (is_transport_allowed("ftp", from_user))

776 - allowed_protocols |= CURLPROTO_FTP;

777 - if (is_transport_allowed("ftps", from_user))

778 - allowed_protocols |= CURLPROTO_FTPS;

776 +static long get_curl_allowed_protocols(int from_user, struct strbuf *list)

777 +{

778 + long bits = 0;

779

780 - return allowed_protocols;

780 + if (is_transport_allowed("http", from_user)) {

781 + bits |= CURLPROTO_HTTP;

782 + proto_list_append(list, "http");

783 + }

784 + if (is_transport_allowed("https", from_user)) {

785 + bits |= CURLPROTO_HTTPS;

786 + proto_list_append(list, "https");

787 + }

788 + if (is_transport_allowed("ftp", from_user)) {

789 + bits |= CURLPROTO_FTP;

790 + proto_list_append(list, "ftp");

791 + }

792 + if (is_transport_allowed("ftps", from_user)) {

793 + bits |= CURLPROTO_FTPS;

794 + proto_list_append(list, "ftps");

795 + }

796 +

797 + return bits;

798 }

799

800 #ifdef GIT_CURL_HAVE_CURL_HTTP_VERSION_2

@@ -921,10 +938,26 @@ static CURL *get_curl_handle(void)

938

939 curl_easy_setopt(result, CURLOPT_MAXREDIRS, 20);

940 curl_easy_setopt(result, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);

941 +

942 +#ifdef GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR

943 + {

944 + struct strbuf buf = STRBUF_INIT;

945 +

946 + get_curl_allowed_protocols(0, &buf);

947 + curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS_STR, buf.buf);

948 + strbuf_reset(&buf);

949 +

950 + get_curl_allowed_protocols(-1, &buf);

951 + curl_easy_setopt(result, CURLOPT_PROTOCOLS_STR, buf.buf);

952 + strbuf_release(&buf);

953 + }

954 +#else

955 curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS,

925 - get_curl_allowed_protocols(0));

956 + get_curl_allowed_protocols(0, NULL));

957 curl_easy_setopt(result, CURLOPT_PROTOCOLS,

927 - get_curl_allowed_protocols(-1));

958 + get_curl_allowed_protocols(-1, NULL));

959 +#endif

960 +

961 if (getenv("GIT_CURL_VERBOSE"))

962 http_trace_curl_no_data();

963 setup_curl_trace(result);