Skip to content

Commit

Permalink
http_negotiate: improve handling of gss_init_sec_context() failures
Browse files Browse the repository at this point in the history
If HTTPAUTH_GSSNEGOTIATE was used for a POST request and
gss_init_sec_context() failed, the POST request was sent
with empty body.  This commit also restores the original
behavior of `curl --fail --negotiate`, which was changed
by commit 6c60355.

Add regression tests 2077 and 2078 to cover this.

Fixes #3992
Closes #4171
  • Loading branch information
kdudka committed Aug 1, 2019
1 parent cd8068e commit 4c18704
Show file tree
Hide file tree
Showing 4 changed files with 99 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/http_negotiate.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ CURLcode Curl_output_negotiate(struct connectdata *conn, bool proxy)
if(result == CURLE_LOGIN_DENIED) {
/* negotiate auth failed, let's continue unauthenticated to stay
* compatible with the behavior before curl-7_64_0-158-g6c6035532 */
conn->data->state.authproblem = TRUE;
authp->done = TRUE;
return CURLE_OK;
}
else if(result)
Expand Down
3 changes: 2 additions & 1 deletion tests/data/Makefile.inc
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@ test2040 test2041 test2042 test2043 test2044 test2045 test2046 test2047 \
test2048 test2049 test2050 test2051 test2052 test2053 test2054 test2055 \
test2056 test2057 test2058 test2059 test2060 test2061 test2062 test2063 \
test2064 test2065 test2066 test2067 test2068 test2069 \
test2071 test2072 test2073 test2074 test2075 test2076 \
test2071 test2072 test2073 test2074 test2075 test2076 test2077 \
test2078 \
test2080 \
test2100 \
\
Expand Down
42 changes: 42 additions & 0 deletions tests/data/test2077
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<testcase>
<info>
<keywords>
HTTP
HTTP GET
GSS-API
</keywords>
</info>

# Server-side
<reply>
<data>
HTTP/1.1 200 OK swsclose
Content-Length: 23

This IS the real page!
</data>
</reply>

# Client-side
<client>
<server>
http
</server>
<features>
GSS-API
</features>
<name>
curl --fail --negotiate to unauthenticated service fails
</name>
<command>
http://%HOSTIP:%HTTPPORT/2077 -u : --fail --negotiate
</command>
</client>

# Verify data after the test has been "shot"
<verify>
<errorcode>
0
</errorcode>
</verify>
</testcase>
54 changes: 54 additions & 0 deletions tests/data/test2078
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<testcase>
<info>
<keywords>
HTTP
HTTP GET
GSS-API
</keywords>
</info>

# Server-side
<reply>
<data>
HTTP/1.1 200 OK swsclose
Content-Length: 23

This IS the real page!
</data>
</reply>

# Client-side
<client>
<server>
http
</server>
<features>
GSS-API
</features>
<name>
curl --negotiate should not send empty POST request only
</name>
<command>
http://%HOSTIP:%HTTPPORT/2078 -u : --negotiate --data name=value
</command>
</client>

# Verify data after the test has been "shot"
<verify>
<errorcode>
0
</errorcode>
<strip>
^User-Agent:.*
</strip>
<protocol nonewline="yes">
POST /2078 HTTP/1.1
Host: 127.0.0.1:8990
Accept: */*
Content-Length: 10
Content-Type: application/x-www-form-urlencoded

name=value
</protocol>
</verify>
</testcase>

0 comments on commit 4c18704

Please sign in to comment.