more auth tests

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 6fbf10e95873fed5bb41e172ebfa4f3ff2b1e50f..c8c239d33a76e3f81f7542c8cdf99ebe2b37e0c4 100644 (file)
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -23,4 +23,4 @@ test58 test139 test140 test141 test59 test60 test61 test142 test143 \
 test62 test63 test64 test65 test66 test144 test145 test67 test68 test41 \
 test40 test42 test69 test70 test71 test72 test73 test146 test505 \
 test74 test75 test76 test77 test78 test147 test148 test506 test79 test80 \
-test81 test82
+test81 test82 test83 test84 test85

diff --git a/tests/data/test82 b/tests/data/test82
index afd0b9beb0d9c97473753c9cd2ce06866605030b..9fef0fabd599c22507c8d4b6ced335f5ff812f55 100644 (file)
--- a/tests/data/test82
+++ b/tests/data/test82
@@ -16,7 +16,6 @@ This is not the real page either!
 # Client-side
 <client>
 <features>
-SSL
 </features>
 <server>
 http

diff --git a/tests/data/test83 b/tests/data/test83
new file mode 100644 (file)
index 0000000..cbcd47a
--- /dev/null
+++ b/tests/data/test83
@@ -0,0 +1,47 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake swsclose
+Content-Type: text/html
+Funny-head: yesyes
+
+contents
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP over proxy-tunnel with site authentication
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/that/page/83 -p -x %HOSTIP:%HOSTPORT --user iam:myself
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+CONNECT 127.0.0.1:8999 HTTP/1.0\r
+User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3\r
+\r
+GET /we/want/that/page/83 HTTP/1.1\r
+Authorization: Basic aWFtOm15c2VsZg==\r
+User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3\r
+Host: 127.0.0.1:8999\r
+Pragma: no-cache\r
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r
+\r
+</protocol>
+</verify>

diff --git a/tests/data/test84 b/tests/data/test84
new file mode 100644 (file)
index 0000000..b95e853
--- /dev/null
+++ b/tests/data/test84
@@ -0,0 +1,44 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake swsclose
+Content-Type: text/html
+Funny-head: yesyes
+
+contents
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP over proxy with site authentication
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/that/page/84 -x %HOSTIP:%HOSTPORT --user iam:myself
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET http://127.0.0.1:8999/we/want/that/page/84 HTTP/1.1\r
+Authorization: Basic aWFtOm15c2VsZg==\r
+User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3\r
+Host: 127.0.0.1:8999\r
+Pragma: no-cache\r
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r
+\r
+</protocol>
+</verify>

diff --git a/tests/data/test85 b/tests/data/test85
new file mode 100644 (file)
index 0000000..ce9771b
--- /dev/null
+++ b/tests/data/test85
@@ -0,0 +1,45 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake swsclose
+Content-Type: text/html
+Funny-head: yesyes
+
+contents
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP over proxy with site and proxy authentication
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/that/page/85 -x %HOSTIP:%HOSTPORT --user iam:myself --proxy-user testing:this
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET http://127.0.0.1:8999/we/want/that/page/85 HTTP/1.1\r
+Proxy-authorization: Basic dGVzdGluZzp0aGlz\r
+Authorization: Basic aWFtOm15c2VsZg==\r
+User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3\r
+Host: 127.0.0.1:8999\r
+Pragma: no-cache\r
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r
+\r
+</protocol>
+</verify>