summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2021-05-18 06:27:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-05-19 01:09:58 (GMT)
commitecf7b129fa8619bfe16c5f7e470717ad79186e07 (patch)
treee1b06e7c0ee9d9b8c3f85ebc79c782e99fecd9b1 /http.c
parentb694f1e49ec39f45f61ca3b6d9df5945cbf43b71 (diff)
downloadgit-ecf7b129fa8619bfe16c5f7e470717ad79186e07.zip
git-ecf7b129fa8619bfe16c5f7e470717ad79186e07.tar.gz
git-ecf7b129fa8619bfe16c5f7e470717ad79186e07.tar.bz2
Revert "remote-curl: fall back to basic auth if Negotiate fails"
This reverts commit 1b0d9545bb85912a16b367229d414f55d140d3be. That commit does fix the situation it intended to (avoiding Negotiate even when the credentials were provided in the URL), but it creates a more serious regression: we now never hit the conditional for "we had a username and password, tried them, but the server still gave us a 401". That has two bad effects: 1. we never call credential_reject(), and thus a bogus credential stored by a helper will live on forever 2. we never return HTTP_NOAUTH, so the error message the user gets is "The requested URL returned error: 401", instead of "Authentication failed". Doing this correctly seems non-trivial, as we don't know whether the Negotiate auth was a problem. Since this is a regression in the upcoming v2.23.0 release (for which we're in -rc0), let's revert for now and work on a fix separately. (Note that this isn't a pure revert; the previous commit added a test showing the regression, so we can now flip it to expect_success). Reported-by: Ben Humphreys <behumphreys@atlassian.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http.c')
-rw-r--r--http.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/http.c b/http.c
index 19c203d..0e31fc2 100644
--- a/http.c
+++ b/http.c
@@ -1641,18 +1641,17 @@ static int handle_curl_result(struct slot_results *results)
} else if (missing_target(results))
return HTTP_MISSING_TARGET;
else if (results->http_code == 401) {
-#ifdef LIBCURL_CAN_HANDLE_AUTH_ANY
- http_auth_methods &= ~CURLAUTH_GSSNEGOTIATE;
- if (results->auth_avail) {
- http_auth_methods &= results->auth_avail;
- http_auth_methods_restricted = 1;
- return HTTP_REAUTH;
- }
-#endif
if (http_auth.username && http_auth.password) {
credential_reject(&http_auth);
return HTTP_NOAUTH;
} else {
+#ifdef LIBCURL_CAN_HANDLE_AUTH_ANY
+ http_auth_methods &= ~CURLAUTH_GSSNEGOTIATE;
+ if (results->auth_avail) {
+ http_auth_methods &= results->auth_avail;
+ http_auth_methods_restricted = 1;
+ }
+#endif
return HTTP_REAUTH;
}
} else {