@matheusbsbs / matheus-bagliano / commits / ecf7b129fa

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>

Jeff King committed May 18, 2021 at 02:27 UTC ecf7b129fa8619bfe16c5f7e470717ad79186e07

2 files changed +8 -9

http.c

+7 -8

@@ -1641,18 +1641,17 @@ static int handle_curl_result(struct slot_results *results)

1641 } else if (missing_target(results))

1642 return HTTP_MISSING_TARGET;

1643 else if (results->http_code == 401) {

1644 -#ifdef LIBCURL_CAN_HANDLE_AUTH_ANY

1645 - http_auth_methods &= ~CURLAUTH_GSSNEGOTIATE;

1646 - if (results->auth_avail) {

1647 - http_auth_methods &= results->auth_avail;

1648 - http_auth_methods_restricted = 1;

1649 - return HTTP_REAUTH;

1650 - }

1651 -#endif

1644 if (http_auth.username && http_auth.password) {

1645 credential_reject(&http_auth);

1646 return HTTP_NOAUTH;

1647 } else {

1648 +#ifdef LIBCURL_CAN_HANDLE_AUTH_ANY

1649 + http_auth_methods &= ~CURLAUTH_GSSNEGOTIATE;

1650 + if (results->auth_avail) {

1651 + http_auth_methods &= results->auth_avail;

1652 + http_auth_methods_restricted = 1;

1653 + }

1654 +#endif

1655 return HTTP_REAUTH;

1656 }

1657 } else {

t/t5551-http-fetch-smart.sh

+1 -1

@@ -533,7 +533,7 @@ test_expect_success 'http auth remembers successful credentials' '

533 expect_askpass none

534 '

535

536 -test_expect_failure 'http auth forgets bogus credentials' '

536 +test_expect_success 'http auth forgets bogus credentials' '

537 # seed credential store with bogus values. In real life,

538 # this would probably come from a password which worked

539 # for a previous request.