Unverified Commit f20cbac9 authored by Florin Petriuc's avatar Florin Petriuc Committed by Daniel Stenberg
Browse files

auth: Added test cases for RFC7616 



Updated docs to include support for RFC7616

Signed-off-by: default avatarFlorin <petriuc.florin@gmail.com>

Closes #1934
parent 2b5b37cb

docs/libcurl/opts/CURLINFO_HTTPAUTH_AVAIL.3

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ if(curl) { 
}

.fi

.SH AVAILABILITY

Added in 7.10.8

Added RFC2617 in 7.10.8

Added RFC7616 in 7.57.0

.SH RETURN VALUE

Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not.

.SH "SEE ALSO"

docs/libcurl/opts/CURLINFO_PROXYAUTH_AVAIL.3

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ if(curl) { 
}

.fi

.SH AVAILABILITY

Added in 7.10.8

Added RFC2617 in 7.10.8

Added RFC7616 in 7.57.0

.SH RETURN VALUE

Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not.

.SH "SEE ALSO"

tests/data/Makefile.inc

+2 −1
Original line number Diff line number Diff line
@@ -186,4 +186,5 @@ test2024 test2025 test2026 test2027 test2028 test2029 test2030 test2031 \ 
test2032 test2033 test2034 test2035 test2036 test2037 test2038 test2039 \

test2040 test2041 test2042 test2043 test2044 test2045 test2046 test2047 \

test2048 test2049 test2050 test2051 test2052 test2053 test2054 test2055 \

test2056 test2057
 
test2056 test2057 test2058 test2059 test2060 test2061 test2062 test2063 \

test2064 test2065 test2066 test2067 test2068 test2069

tests/data/test2058

0 → 100644
+107 −0
Original line number Diff line number Diff line 
<testcase>

<info>

<keywords>

HTTP

HTTP PUT

HTTP proxy

HTTP Digest auth

Resume

Content-Range

CUSTOMREQUEST

</keywords>

</info>



# Server-side

<reply>

<data>

HTTP/1.1 100 Continue

Server: Microsoft-IIS/5.0

Date: Sun, 03 Apr 2005 14:57:45 GMT

X-Powered-By: ASP.NET



HTTP/1.1 401 authentication please swsbounce

Server: Microsoft-IIS/6.0

WWW-Authenticate: Digest realm="testrealm", algorithm="SHA-256", nonce="1053604144"

Content-Type: text/html; charset=iso-8859-1

Content-Length: 0



</data>

<data1000>

HTTP/1.1 200 A OK

Server: Microsoft-IIS/6.0

Content-Type: text/html; charset=iso-8859-1

Content-Length: 3



ok

</data1000>



<datacheck>

HTTP/1.1 100 Continue

Server: Microsoft-IIS/5.0

Date: Sun, 03 Apr 2005 14:57:45 GMT

X-Powered-By: ASP.NET



HTTP/1.1 401 authentication please swsbounce

Server: Microsoft-IIS/6.0

WWW-Authenticate: Digest realm="testrealm", algorithm="SHA-256", nonce="1053604144"

Content-Type: text/html; charset=iso-8859-1

Content-Length: 0



HTTP/1.1 200 A OK

Server: Microsoft-IIS/6.0

Content-Type: text/html; charset=iso-8859-1

Content-Length: 3



ok

</datacheck>



</reply>



# Client-side

<client>

# 

<server>

http

</server>

<features>

!SSPI

crypto

</features>

 <name>

HTTP POST --digest with PUT, resumed upload, modified method and SHA-256

 </name>

 <command>

http://%HOSTIP:%HTTPPORT/2058 -u auser:apasswd --digest -T log/2058 -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET

</command>

<file name="log/2058">

test

</file>

</client>



# Verify data after the test has been "shot"

<verify>

<strip>

^User-Agent:.*

</strip>

<protocol>

GET http://%HOSTIP:%HTTPPORT/2058 HTTP/1.1

Host: %HOSTIP:%HTTPPORT

Content-Range: bytes 2-4/5

User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6

Accept: */*

Proxy-Connection: Keep-Alive

Content-Length: 0



GET http://%HOSTIP:%HTTPPORT/2058 HTTP/1.1

Host: %HOSTIP:%HTTPPORT

Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2058", response="fbed69f9f3fd304c8f1acb1a43eb32688b933c0e28055c16b926cbcec070aeed", algorithm="SHA-256"

Content-Range: bytes 2-4/5

Accept: */*

Proxy-Connection: Keep-Alive

Content-Length: 3

Expect: 100-continue



st

</protocol>

</verify>

</testcase>

tests/data/test2059

0 → 100644
+107 −0
Original line number Diff line number Diff line 
<testcase>

<info>

<keywords>

HTTP

HTTP PUT

HTTP proxy

HTTP Digest auth

Resume

Content-Range

CUSTOMREQUEST

</keywords>

</info>



# Server-side

<reply>

<data>

HTTP/1.1 100 Continue

Server: Microsoft-IIS/5.0

Date: Sun, 03 Apr 2005 14:57:45 GMT

X-Powered-By: ASP.NET



HTTP/1.1 401 authentication please swsbounce

Server: Microsoft-IIS/6.0

WWW-Authenticate: Digest realm="testrealm", algorithm="SHA-512-256", nonce="1053604144", userhash=true

Content-Type: text/html; charset=iso-8859-1

Content-Length: 0



</data>

<data1000>

HTTP/1.1 200 A OK

Server: Microsoft-IIS/6.0

Content-Type: text/html; charset=iso-8859-1

Content-Length: 3



ok

</data1000>



<datacheck>

HTTP/1.1 100 Continue

Server: Microsoft-IIS/5.0

Date: Sun, 03 Apr 2005 14:57:45 GMT

X-Powered-By: ASP.NET



HTTP/1.1 401 authentication please swsbounce

Server: Microsoft-IIS/6.0

WWW-Authenticate: Digest realm="testrealm", algorithm="SHA-512-256", nonce="1053604144", userhash=true

Content-Type: text/html; charset=iso-8859-1

Content-Length: 0



HTTP/1.1 200 A OK

Server: Microsoft-IIS/6.0

Content-Type: text/html; charset=iso-8859-1

Content-Length: 3



ok

</datacheck>



</reply>



# Client-side

<client>

# 

<server>

http

</server>

<features>

!SSPI

crypto

</features>

 <name>

HTTP POST --digest with PUT, resumed upload, modified method, SHA-512-256 and userhash=true

 </name>

 <command>

http://%HOSTIP:%HTTPPORT/2059 -u auser:apasswd --digest -T log/2059 -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET

</command>

<file name="log/2059">

test

</file>

</client>



# Verify data after the test has been "shot"

<verify>

<strip>

^User-Agent:.*

</strip>

<protocol>

GET http://%HOSTIP:%HTTPPORT/2059 HTTP/1.1

Host: %HOSTIP:%HTTPPORT

Content-Range: bytes 2-4/5

User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6

Accept: */*

Proxy-Connection: Keep-Alive

Content-Length: 0



GET http://%HOSTIP:%HTTPPORT/2059 HTTP/1.1

Host: %HOSTIP:%HTTPPORT

Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/2059", response="fc09be8192851e284e73e8b719b32a2f6f91cca0594e68713da8c49dc2c1656e", algorithm="SHA-512-256", userhash=true

Content-Range: bytes 2-4/5

Accept: */*

Proxy-Connection: Keep-Alive

Content-Length: 3

Expect: 100-continue



st

</protocol>

</verify>

</testcase>