Attachment 892526 Details for Bug 1093348 – http: avoid auth failure on a duplicated header [NOT TESTED]

[patch] http: avoid auth failure on a duplicated header [NOT TESTED]

0001-http-avoid-auth-failure-on-a-duplicated-header.patch (text/plain), 1.79 KB, created by Kamil Dudka on 2014-05-05 12:57:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kamil Dudka

Created: 2014-05-05 12:57:05 UTC

Size: 1.79 KB

patch

obsolete

>From 43a71daae6f9193d7c3a02ddfb321b4cb54b43ed Mon Sep 17 00:00:00 2001
>From: Kamil Dudka <kdudka@redhat.com>
>Date: Mon, 5 May 2014 14:49:30 +0200
>Subject: [PATCH] http: avoid auth failure on a duplicated header
>
>... 'WWW-Authenticate: Negotiate' received from server
>
>Reported by: David Woodhouse
>Bug: https://bugzilla.redhat.com/1093348
>---
> lib/http.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/lib/http.c b/lib/http.c
>index fb43349..937d241 100644
>--- a/lib/http.c
>+++ b/lib/http.c
>@@ -768,31 +768,31 @@ CURLcode Curl_http_input_auth(struct connectdata *conn, bool proxy,
>   while(*auth) {
> #ifdef USE_HTTP_NEGOTIATE
>     if(checkprefix("GSS-Negotiate", auth) ||
>        checkprefix("Negotiate", auth)) {
>       int neg;
>       *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 */
>           infof(data, "Authentication problem. Ignoring this.\n");
>           data->state.authproblem = TRUE;
>         }
>-        else {
>+        else if(data->state.negotiate.state == GSS_AUTHNONE) {
>           neg = Curl_input_negotiate(conn, proxy, auth);
>           if(neg == 0) {
>             DEBUGASSERT(!data->req.newurl);
>             data->req.newurl = strdup(data->change.url);
>             if(!data->req.newurl)
>               return CURLE_OUT_OF_MEMORY;
>             data->state.authproblem = FALSE;
>             /* we received GSS auth info and we dealt with it fine */
>             data->state.negotiate.state = GSS_AUTHRECV;
>           }
>           else
>             data->state.authproblem = TRUE;
>         }
>       }
>     }
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1093348: 892526