From 4c5971e18a181c68aec03262fb467cb5d21a5b0d Mon Sep 17 00:00:00 2001 From: Jeff King Date: Tue, 14 Apr 2020 17:43:04 -0400 Subject: credential: treat "?" and "#" in URLs as end of host It's unusual to see: https://example.com?query-parameters without an intervening slash, like: https://example.com/some-path?query-parameters or even: https://example.com/?query-parameters but it is a valid end to the hostname (actually "authority component") according to RFC 3986. Likewise for "#". And curl will parse the URL according to the standard, meaning it will contact example.com, but our credential code would ask about a bogus hostname with a "?" in it. Let's make sure we follow the standard, and more importantly ask about the same hosts that curl will be talking to. It would be nice if we could just ask curl to parse the URL for us. But it didn't grow a URL-parsing API until 7.62, so we'd be stuck with fallback code either way. Plus we'd need this code in the main Git binary, where we've tried to avoid having a link dependency on libcurl. But let's at least fix our parser. Moving to curl's parser would prevent other potential discrepancies, but this gives us immediate relief for the known problem, and would help our fallback code if we eventually use curl. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- credential.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'credential.c') diff --git a/credential.c b/credential.c index 21b3ba152f..8aa9777548 100644 --- a/credential.c +++ b/credential.c @@ -388,7 +388,14 @@ int credential_from_url_gently(struct credential *c, const char *url, cp = proto_end + 3; at = strchr(cp, '@'); colon = strchr(cp, ':'); - slash = strchrnul(cp, '/'); + + /* + * A query or fragment marker before the slash ends the host portion. + * We'll just continue to call this "slash" for simplicity. Notably our + * "trim leading slashes" part won't skip over this part of the path, + * but that's what we'd want. + */ + slash = cp + strcspn(cp, "/?#"); if (!at || slash <= at) { /* Case (1) */ -- cgit v1.2.3