Commit 1e29d275 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

test1509: verify proxy header response headers count 

Modified sws to support and use custom CONNECT responses instead of the
previously naive hard-coded version. Made the HTTP test server able to
extract test case number from the host name in a CONNECT request by
finding the number after the last dot. It makes 'machine.moo.123' use
test case 123.

Adapted a larger amount of tests to the new <connect> style.

Bug: http://curl.haxx.se/bug/view.cgi?id=1204
Reported by: Martin Jansen
parent 142755fa

tests/FILEFORMAT

+9 −7
Original line number Diff line number Diff line
@@ -75,6 +75,11 @@ to complete a transfer. The response to each request is found in its own data 
section.  Validating the entire negotiation sequence can be done by

specifying a datacheck section.

</dataNUM>

<connect>

The connect section is used instead of the 'data' for all CONNECT

requests. The remainder of the rules for the data section then apply but with

a connect prefix.

</connect>

<datacheck [nonewline="yes"]>

if the data is sent but this is what should be checked afterwards. If

'nonewline' is set, we will cut off the trailing newline of this given data
@@ -247,13 +252,10 @@ that is returned. The last slash in the URL must be followed by a number. That 
number (N) will be used by the test-server to load test case N and return the

data that is defined within the <reply><data></data></reply> section.



If a CONNECT is used to the server (to emulate HTTPS etc over proxy), the port

number given in the CONNECT request will be used to identify which test that

is being run, if the proxy host name is said to start with 'test'.



If there's no non-zero test number found in the above two places, the HTTP test

server will use the number following the last dot in the given url so that

"foo.bar.123" gets treated as test case 123.

If there's no test number found above, the HTTP test server will use the

number following the last dot in the given hostname (made so that a CONNECT

can still pass on test number) so that "foo.bar.123" gets treated as test case

123.



Set type="perl" to write the test case as a perl script. It implies that

there's no memory debugging and valgrind gets shut off for this test.

tests/data/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ test1400 test1401 test1402 test1403 test1404 test1405 test1406 test1407 \ 
test1408 test1409 test1410 test1411 test1412 test1413 \

\

test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \

test1508 \

test1508 test1509 \

\

test1900 test1901 test1902 test1903 \

\

tests/data/test1008

+10 −10
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ connection-monitor 
</servercmd>



# this is returned first since we get no proxy-auth

<data1001>

<connect1001>

HTTP/1.1 407 Authorization Required to proxy me my dear

Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==

Transfer-Encoding: chunked
@@ -27,16 +27,16 @@ FA0 
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX

0



</data1001>

</connect1001>



# This is supposed to be returned when the server gets the second

# Authorization: NTLM line passed-in from the client

<data1002>

<connect1002>

HTTP/1.1 200 Things are fine in proxy land

Server: Microsoft-IIS/5.0

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



</data1002>

</connect1002>



# this is returned when we get a GET!

<data2>
@@ -96,7 +96,7 @@ CURL_GETHOSTNAME=curlhost 
LD_PRELOAD=%PWD/libtest/.libs/libhostname.so

 </setenv>

 <command>

http://test.remote.example.com:1008/path/10080002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel

http://test.remote.example.com.1008:%HTTPPORT/path/10080002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel

</command>

<precheck>

chkhostname curlhost
@@ -109,19 +109,19 @@ chkhostname curlhost 
^User-Agent: curl/.*

</strip>

<protocol>

CONNECT test.remote.example.com:1008 HTTP/1.1

Host: test.remote.example.com:1008

CONNECT test.remote.example.com.1008:%HTTPPORT HTTP/1.1

Host: test.remote.example.com.1008:%HTTPPORT

Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=

Proxy-Connection: Keep-Alive



CONNECT test.remote.example.com:1008 HTTP/1.1

Host: test.remote.example.com:1008

CONNECT test.remote.example.com.1008:%HTTPPORT HTTP/1.1

Host: test.remote.example.com.1008:%HTTPPORT

Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAKAeQjzKtCQ7ubW8S6MN7B59436GAxPu0CVROwwNBsgxML49gcbAXLT/bU+H5wrS9XNpbGx5Y3VybGhvc3Q=

Proxy-Connection: Keep-Alive



GET /path/10080002 HTTP/1.1

User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4

Host: test.remote.example.com:1008

Host: test.remote.example.com.1008:%HTTPPORT

Accept: */*



[DISCONNECT]

tests/data/test1021

+14 −14
Original line number Diff line number Diff line
@@ -12,32 +12,32 @@ HTTP proxy NTLM auth 
# Server-side

<reply>



<data>

<connect>

HTTP/1.1 407 Authorization Required to proxy me my dear swsclose

Proxy-Authenticate: NTLM

Content-Length: 21

Connection: close



data to discard

</data>

</connect>



# this is returned first since we get no proxy-auth

<data1001>

<connect1001>

HTTP/1.1 407 Authorization Required to proxy me my dear

Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==

Content-Length: 28



And you should ignore this data.

</data1001>

</connect1001>



# This is supposed to be returned when the server gets the second

# Authorization: NTLM line passed-in from the client

<data1002>

<connect1002>

HTTP/1.1 200 Things are fine in proxy land

Server: Microsoft-IIS/5.0

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



</data1002>

</connect1002>



# this is returned when we get a GET!

<data2>
@@ -102,7 +102,7 @@ CURL_GETHOSTNAME=curlhost 
LD_PRELOAD=%PWD/libtest/.libs/libhostname.so

 </setenv>

 <command>

http://test.remote.example.com:1021/path/10210002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-anyauth --proxytunnel

http://test.remote.example.com.1021:%HTTPPORT/path/10210002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-anyauth --proxytunnel

</command>

<precheck>

chkhostname curlhost
@@ -115,23 +115,23 @@ chkhostname curlhost 
^User-Agent: curl/.*

</strip>

<protocol>

CONNECT test.remote.example.com:1021 HTTP/1.1

Host: test.remote.example.com:1021

CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1

Host: test.remote.example.com.1021:%HTTPPORT

Proxy-Connection: Keep-Alive



CONNECT test.remote.example.com:1021 HTTP/1.1

Host: test.remote.example.com:1021

CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1

Host: test.remote.example.com.1021:%HTTPPORT

Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=

Proxy-Connection: Keep-Alive



CONNECT test.remote.example.com:1021 HTTP/1.1

Host: test.remote.example.com:1021

CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1

Host: test.remote.example.com.1021:%HTTPPORT

Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAKAeQjzKtCQ7ubW8S6MN7B59436GAxPu0CVROwwNBsgxML49gcbAXLT/bU+H5wrS9XNpbGx5Y3VybGhvc3Q=

Proxy-Connection: Keep-Alive



GET /path/10210002 HTTP/1.1

User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4

Host: test.remote.example.com:1021

Host: test.remote.example.com.1021:%HTTPPORT

Accept: */*



</protocol>

tests/data/test1059

+2 −2
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ FAILURE 
#

# Server-side

<reply>

<data>

<connect>

HTTP/1.1 501 Method not implemented swsclose

Date: Thu, 09 Nov 2010 14:49:00 GMT

Connection: close

Content-Length: 0



</data>

</connect>

</reply>



#