Commit 4851dafc authored by Rene Bernhardt's avatar Rene Bernhardt Committed by Daniel Stenberg
Browse files

HTTP auth: fix proxy Negotiate bug 

If a proxy offers several Authentication schemes where NTLM and
Negotiate are offered by the proxy and you tell libcurl not to use the
Negotiate scheme then the request never returns when the proxy answers
with its HTTP 407 reply.

It is reproducible by the following steps:

- Use a proxy that offers NTLM and Negotiate ( CURLOPT_PROXY and
CURLOPT_PROXYPORT )

- Tell libcurl NOT to use Negotiate CURL_EASY_SETOPT(CURLOPT_PROXYAUTH,
CURLAUTH_BASIC | CURLAUTH_DIGEST | CURLAUTH_NTLM )

- Start the request

The call to CURL_EASY_PERFORM never returns. If you switch on debug
logging you can see that libcurl issues a new request As soon as it
received the 407 reply. Instead it should return and set the response
code to 407.

Bug: http://curl.haxx.se/mail/lib-2011-10/0323.html
parent 73029dca

lib/http.c

+18 −17
Original line number Diff line number Diff line
@@ -741,6 +741,7 @@ CURLcode Curl_http_input_auth(struct connectdata *conn, 
      *availp |= CURLAUTH_GSSNEGOTIATE;

      authp->avail |= CURLAUTH_GSSNEGOTIATE;



      if(authp->picked == CURLAUTH_GSSNEGOTIATE) {

        if(data->state.negotiate.state == GSS_AUTHSENT) {

          /* if we sent GSS authentication in the outgoing request and we get

             this back, we're in trouble */
@@ -748,7 +749,7 @@ CURLcode Curl_http_input_auth(struct connectdata *conn, 
          data->state.authproblem = TRUE;

        }

        else {

        neg = Curl_input_negotiate(conn, (httpcode == 407)?TRUE:FALSE, start);

          neg = Curl_input_negotiate(conn, (bool)(httpcode == 407), start);

          if(neg == 0) {

            DEBUGASSERT(!data->req.newurl);

            data->req.newurl = strdup(data->change.url);
@@ -758,7 +759,7 @@ CURLcode Curl_http_input_auth(struct connectdata *conn, 
            /* we received GSS auth info and we dealt with it fine */

            data->state.negotiate.state = GSS_AUTHRECV;

          }

        else {

          else

            data->state.authproblem = TRUE;

        }

      }