From patchwork Tue Jan 17 20:33:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seija Kijin X-Patchwork-Id: 13105104 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 318DCC678D4 for ; Tue, 17 Jan 2023 22:06:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229748AbjAQWGd (ORCPT ); Tue, 17 Jan 2023 17:06:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229890AbjAQWEM (ORCPT ); Tue, 17 Jan 2023 17:04:12 -0500 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62D303A855 for ; Tue, 17 Jan 2023 12:33:06 -0800 (PST) Received: by mail-wr1-x434.google.com with SMTP id r2so31860671wrv.7 for ; Tue, 17 Jan 2023 12:33:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=9vcbh7iw7a2EU+e6TRBlUbqRCH9XeQmX+z/KXtE4sX0=; b=Lj6HLycoQGQP0EeaMgpyY/1WFMbwYPz5pY8joBODzvJ3/UIrKJJqWIf3lsnWmUCREb 9+X31wGBzCex9/DByQ/fNjljIReb/tXlBwQE+45pjfThWNOzE/Qh94jYKFGqoJd6/+6d tvOrPAcnkbzVBLFJoSQklQam4PBzkhEB+iIo2yYqyLXCClfvhq7ivDhP9Rn7iwwmpQFn 5hlUb7QYtgC38j7LckMh3AWdluuBpbRvoRqLXTvsTPexskF0UM6ynufeJU8yqPZoM8UJ A05ubew2GQ5475GGxTeYcEpGl/y+69k088j2IiwMV16Wsx+bQCvz4gBrMrcL5gKCbvT4 Dv6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9vcbh7iw7a2EU+e6TRBlUbqRCH9XeQmX+z/KXtE4sX0=; b=p+InnuJVFtrs4f1xkGtGZqqnHXHEtVO3l32opEi8CIHQE+HWmBs/NRQWg+Isf12fBT kWw1SpV5BE4YzkUflU2LouWefuXAVJ+CaT1e1N+D5BW55OB92iFRxYl68StRyCbwe8g4 z9e+4RDua0VC7X5PExiujtIdBEHZJV1eRz+qz1TIVrQ5tpTyQJL8DeZ7O9/eVI0lg99g w+uSiD2XbOc2vx2VKXkt6bGCMqvnHgjzR7oM7Y/HgQYK3i0Bub+4+YZf6mXmo5ey7LBL cFFpproBbdui1vdF+cdmBvsfoQAOr8TRfAaHGXPQm7LxHLANzG2wy76g1dglmznseUBS 04bQ== X-Gm-Message-State: AFqh2kr5HEMTRndY7F/+Aev8m+b7Twk9kmscdGadaSKohw+M/fKscVAI uHMUR7iJ2x91/tEHhqYQX35JQ9JSlwU= X-Google-Smtp-Source: AMrXdXtjSCjIBm9QaZW7WAqpA1giyPwT8586EWTOC47o5yzNbFwgmppFvZ7vx4DrS+ByHTuoXiG7gg== X-Received: by 2002:a5d:6d46:0:b0:2bd:f367:40bc with SMTP id k6-20020a5d6d46000000b002bdf36740bcmr3574802wri.13.1673987584721; Tue, 17 Jan 2023 12:33:04 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y15-20020adffa4f000000b002bbec19c8acsm24580680wrr.64.2023.01.17.12.33.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 12:33:04 -0800 (PST) Message-Id: In-Reply-To: References: Date: Tue, 17 Jan 2023 20:33:03 +0000 Subject: [PATCH v7] curl: resolve deprecated curl declarations Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Rose <83477269+AtariDreams@users.noreply.github.com>, Seija Kijin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Seija Kijin From: Seija Kijin Fix CI-Alpine build by replacing deprecated declarations with their suggested replacements Note that this required changing the callbacks of functions because the replacement for these deprecations require a different function signature for the callback and different parameters. Every change done was made as to minimize changed behavior as well as get the CI to pass again. Signed-off-by: Seija Kijin --- curl: resolve deprecated curl declarations Fix CI-Alpine build by replacing deprecated declarations with their suggested replacements Signed-off-by: Seija Kijin doremylover123@gmail.com Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1435%2FAtariDreams%2Fcurl-v7 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1435/AtariDreams/curl-v7 Pull-Request: https://github.com/git/git/pull/1435 Range-diff vs v6: 1: 6b471a867d5 ! 1: 23094afb2e6 curl: resolve deprecated curl declarations @@ http.c: void setup_curl_trace(CURL *handle) + } + if (is_transport_allowed("https", from_user)) { -+ if (proto_buf->len) -+ strbuf_addch(proto_buf, ','); -+ strbuf_addstr(proto_buf, "https"); ++ strbuf_addstr(proto_buf, proto_buf->len ? "https" : ",https"); + } + + if (is_transport_allowed("ftp", from_user)) { -+ if (proto_buf->len) -+ strbuf_addch(proto_buf, ','); -+ strbuf_addstr(proto_buf, "ftp"); ++ strbuf_addstr(proto_buf, proto_buf->len ? "ftp" : ",ftp"); + } + + if (is_transport_allowed("ftps", from_user)) { -+ if (proto_buf->len) -+ strbuf_addch(proto_buf, ','); -+ strbuf_addstr(proto_buf, "ftps"); ++ strbuf_addstr(proto_buf, proto_buf->len ? "ftps" : ",ftps"); + } +} +#else INSTALL | 2 +- git-curl-compat.h | 8 +++++++ http-push.c | 6 ++--- http.c | 57 +++++++++++++++++++++++++++++++++++++---------- http.h | 2 +- remote-curl.c | 31 +++++++++++++------------- 6 files changed, 73 insertions(+), 33 deletions(-) base-commit: a7caae2729742fc80147bca1c02ae848cb55921a diff --git a/INSTALL b/INSTALL index 33447883974..d5694f8c470 100644 --- a/INSTALL +++ b/INSTALL @@ -139,7 +139,7 @@ Issues of note: not need that functionality, use NO_CURL to build without it. - Git requires version "7.19.4" or later of "libcurl" to build + Git requires version "7.19.5" or later of "libcurl" to build without NO_CURL. This version requirement may be bumped in the future. diff --git a/git-curl-compat.h b/git-curl-compat.h index 56a83b6bbd8..38a2237c8fe 100644 --- a/git-curl-compat.h +++ b/git-curl-compat.h @@ -127,3 +127,11 @@ #endif #endif + +/** + * CURLOPT_PROTOCOLS_STR was added in 7.83.0, released in August + * 2022. + */ +#if LIBCURL_VERSION_NUM >= 0x075500 +#define GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR 1 +#endif diff --git a/http-push.c b/http-push.c index 5f4340a36e6..7f71316456c 100644 --- a/http-push.c +++ b/http-push.c @@ -198,13 +198,13 @@ static void curl_setup_http(CURL *curl, const char *url, const char *custom_req, struct buffer *buffer, curl_write_callback write_fn) { - curl_easy_setopt(curl, CURLOPT_PUT, 1); + curl_easy_setopt(curl, CURLOPT_UPLOAD, 1); curl_easy_setopt(curl, CURLOPT_URL, url); curl_easy_setopt(curl, CURLOPT_INFILE, buffer); curl_easy_setopt(curl, CURLOPT_INFILESIZE, buffer->buf.len); curl_easy_setopt(curl, CURLOPT_READFUNCTION, fread_buffer); - curl_easy_setopt(curl, CURLOPT_IOCTLFUNCTION, ioctl_buffer); - curl_easy_setopt(curl, CURLOPT_IOCTLDATA, buffer); + curl_easy_setopt(curl, CURLOPT_SEEKFUNCTION, seek_buffer); + curl_easy_setopt(curl, CURLOPT_SEEKDATA, buffer); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_fn); curl_easy_setopt(curl, CURLOPT_NOBODY, 0); curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, custom_req); diff --git a/http.c b/http.c index 8a5ba3f4776..6dfbae96ac6 100644 --- a/http.c +++ b/http.c @@ -157,21 +157,19 @@ size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffer_) return size / eltsize; } -curlioerr ioctl_buffer(CURL *handle, int cmd, void *clientp) +int seek_buffer(void *userp, curl_off_t offset, int origin) { - struct buffer *buffer = clientp; + struct buffer *buffer = userp; - switch (cmd) { - case CURLIOCMD_NOP: - return CURLIOE_OK; - - case CURLIOCMD_RESTARTREAD: - buffer->posn = 0; - return CURLIOE_OK; - - default: - return CURLIOE_UNKNOWNCMD; + if (origin != SEEK_SET) + BUG("seek_buffer only handles SEEK_SET"); + if (offset < 0 || offset >= buffer->buf.len) { + error("curl seek would be outside of buffer"); + return CURL_SEEKFUNC_FAIL; } + + buffer->posn = offset; + return CURL_SEEKFUNC_OK; } size_t fwrite_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffer_) @@ -765,7 +763,26 @@ void setup_curl_trace(CURL *handle) curl_easy_setopt(handle, CURLOPT_DEBUGFUNCTION, curl_trace); curl_easy_setopt(handle, CURLOPT_DEBUGDATA, NULL); } +#ifdef GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR +static void get_curl_allowed_protocols(struct strbuf *proto_buf, int from_user) +{ + if (is_transport_allowed("http", from_user)) { + strbuf_addstr(proto_buf, "http"); + } + if (is_transport_allowed("https", from_user)) { + strbuf_addstr(proto_buf, proto_buf->len ? "https" : ",https"); + } + + if (is_transport_allowed("ftp", from_user)) { + strbuf_addstr(proto_buf, proto_buf->len ? "ftp" : ",ftp"); + } + + if (is_transport_allowed("ftps", from_user)) { + strbuf_addstr(proto_buf, proto_buf->len ? "ftps" : ",ftps"); + } +} +#else static long get_curl_allowed_protocols(int from_user) { long allowed_protocols = 0; @@ -781,6 +798,7 @@ static long get_curl_allowed_protocols(int from_user) return allowed_protocols; } +#endif #ifdef GIT_CURL_HAVE_CURL_HTTP_VERSION_2 static int get_curl_http_version_opt(const char *version_string, long *opt) @@ -923,10 +941,25 @@ 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(&buf, 0); + curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS_STR, buf.buf); + strbuf_reset(&buf); + + get_curl_allowed_protocols(&buf, -1); + 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)); curl_easy_setopt(result, CURLOPT_PROTOCOLS, get_curl_allowed_protocols(-1)); +#endif + if (getenv("GIT_CURL_VERBOSE")) http_trace_curl_no_data(); setup_curl_trace(result); diff --git a/http.h b/http.h index 3c94c479100..0be9400ef53 100644 --- a/http.h +++ b/http.h @@ -40,7 +40,7 @@ struct buffer { size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *strbuf); size_t fwrite_buffer(char *ptr, size_t eltsize, size_t nmemb, void *strbuf); size_t fwrite_null(char *ptr, size_t eltsize, size_t nmemb, void *strbuf); -curlioerr ioctl_buffer(CURL *handle, int cmd, void *clientp); +int seek_buffer(void *userp, curl_off_t offset, int origin); /* Slot lifecycle functions */ struct active_request_slot *get_active_slot(void); diff --git a/remote-curl.c b/remote-curl.c index 72dfb8fb86a..540da2b7989 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -717,25 +717,24 @@ static size_t rpc_out(void *ptr, size_t eltsize, return avail; } -static curlioerr rpc_ioctl(CURL *handle, int cmd, void *clientp) +static int rpc_seek(void *userp, curl_off_t offset, int origin) { - struct rpc_state *rpc = clientp; + struct rpc_state *rpc = userp; - switch (cmd) { - case CURLIOCMD_NOP: - return CURLIOE_OK; + if (origin != SEEK_SET) + BUG("rpc_seek only handles SEEK_SET, not %d", origin); - case CURLIOCMD_RESTARTREAD: - if (rpc->initial_buffer) { - rpc->pos = 0; - return CURLIOE_OK; + if (rpc->initial_buffer) { + if (offset < 0 || offset > rpc->len) { + error("curl seek would be outside of rpc buffer"); + return CURL_SEEKFUNC_FAIL; } - error(_("unable to rewind rpc post data - try increasing http.postBuffer")); - return CURLIOE_FAILRESTART; - - default: - return CURLIOE_UNKNOWNCMD; + rpc->pos = offset; + return CURL_SEEKFUNC_OK; } + + error(_("unable to rewind rpc post data - try increasing http.postBuffer")); + return CURL_SEEKFUNC_FAIL; } struct check_pktline_state { @@ -959,8 +958,8 @@ retry: rpc->initial_buffer = 1; curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, rpc_out); curl_easy_setopt(slot->curl, CURLOPT_INFILE, rpc); - curl_easy_setopt(slot->curl, CURLOPT_IOCTLFUNCTION, rpc_ioctl); - curl_easy_setopt(slot->curl, CURLOPT_IOCTLDATA, rpc); + curl_easy_setopt(slot->curl, CURLOPT_SEEKFUNCTION, rpc_seek); + curl_easy_setopt(slot->curl, CURLOPT_SEEKDATA, rpc); if (options.verbosity > 1) { fprintf(stderr, "POST %s (chunked)\n", rpc->service_name); fflush(stderr);