Skip to content

http: fix bug in ntlm_allow=1 handling #6136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mjcheetham wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −4
Open

http: fix bug in ntlm_allow=1 handling #6136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions http.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1908,10 +1908,6 @@ static int handle_curl_result(struct slot_results *results)
else if (results->http_code == 401) {
http_auth.ntlm_suppressed = (results->auth_avail & CURLAUTH_NTLM) &&
!(http_auth_any & CURLAUTH_NTLM);
if (http_auth.ntlm_suppressed && http_auth.ntlm_allow) {
http_auth_methods |= CURLAUTH_NTLM;
return HTTP_REAUTH;
}
if ((http_auth.username && http_auth.password) ||\
(http_auth.authtype && http_auth.credential)) {
if (http_auth.multistage) {
Expand Down Expand Up @@ -2373,6 +2369,13 @@ static int http_request_reauth(const char *url,

credential_fill(the_repository, &http_auth, 1);

/*
* Re-enable NTLM auth if the helper allows it and we would
* otherwise suppress authentication via NTLM.
*/
if (http_auth.ntlm_suppressed && http_auth.ntlm_allow)
http_auth_methods |= CURLAUTH_NTLM;

ret = http_request(url, result, target, options);
}
return ret;
Expand Down
Loading