kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jk/http-curl-strip-creds' into jch 

The HTTP transport has been updated to handle changes in recent curl
versions that strip credentials from the effective URL, preventing
unnecessary credential prompts during redirects.

* jk/http-curl-strip-creds:
  http: handle curl stripping creds from effective url
Junio C Hamano 2026-09-28 11:21:43 -07:00
parent 4d09addb1e 76524c2604
commit 5ef68304de
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
git-curl-compat.h
View File

@ -28,6 +28,13 @@
* introduced, oldest first, in the official version of cURL library.
*/

/**
* curl_url() interface added in 7.62.0 (October 2018)
*/
#if LIBCURL_VERSION_NUM >= 0x073e00
#define GIT_CURL_HAVE_CURL_URL
#endif

/**
* Versions before curl 7.66.0 (September 2019) required manually setting the
* transfer-encoding for a streaming POST; after that this is handled

41
http.c
View File

@ -2315,6 +2315,45 @@ static int http_request(const char *url,
return ret;
}

#ifndef GIT_CURL_HAVE_CURL_URL
#define strip_url_credential(in) NULL
#else
static char *strip_url_credential(const char *in)
{
char *ret = NULL;
CURLU *url;

url = curl_url();
if (!url)
goto out;

if (curl_url_set(url, CURLUPART_URL, in, 0))
goto out;

curl_url_set(url, CURLUPART_USER, NULL, 0);
curl_url_set(url, CURLUPART_PASSWORD, NULL, 0);
curl_url_get(url, CURLUPART_URL, &ret, 0);

out:
curl_url_cleanup(url);
return ret;
}
#endif

static int match_effective_url(const char *asked, const char *got)
{
char *stripped;
int ret;

if (!strcmp(asked, got))
return 1;

stripped = strip_url_credential(asked);
ret = stripped && !strcmp(stripped, got);
curl_free(stripped);
return ret;
}

/*
* Update the "base" url to a more appropriate value, as deduced by
* redirects seen when requesting a URL starting with "url".
@ -2347,7 +2386,7 @@ static int update_url_from_redirect(struct strbuf *base,
const char *tail;
size_t new_len;

if (!strcmp(asked, got->buf))
if (match_effective_url(asked, got->buf))
return 0;

if (!skip_prefix(asked, base->buf, &tail))