fixed NTLM test 67, added test 68 for bad NTLM name/password

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 2f1454a11d4a49cef928e774868a5c38ebf9351a..b855c77a64592a24aceca4d203fb56cff2951c69 100644 (file)
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -20,4 +20,4 @@ test130  test131  test132  test133  test134 test135 test403 test305 \
 test49 test50 test51 test52 test53 test54 test55 test56 \
 test500 test501 test502 test503 test504 test136 test57 test137 test138 \
 test58 test139 test140 test141 test59 test60 test61 test142 test143 test62 \
-test63 test64 test65 test66 test144 test145 test67
+test63 test64 test65 test66 test144 test145 test67 test68

diff --git a/tests/data/test67 b/tests/data/test67
index 242a08948ceb4c269d23f0387a823696a997d4a2..fdb44d333449328be28faccc836627766c9c95a1 100644 (file)
--- a/tests/data/test67
+++ b/tests/data/test67
@@ -36,13 +36,11 @@ Server: Apache/1.3.27 (Darwin) PHP/4.1.2
 WWW-Authenticate: NTLM\r
 Content-Type: text/html; charset=iso-8859-1\r
 \r
-This is not the real page
 HTTP/1.1 401 Now gimme that second request of crap\r
 Server: Microsoft-IIS/5.0\r
 Content-Type: text/html; charset=iso-8859-1\r
 WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==\r
 \r
-This is not the real page either!
 HTTP/1.1 200 Things are fine in server land\r
 Server: Microsoft-IIS/5.0\r
 Content-Type: text/html; charset=iso-8859-1\r
@@ -82,14 +80,14 @@ Pragma: no-cache
 Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r
 \r
 GET /67 HTTP/1.1\r
-Authorization: NTLM TlRMTVNTUAABAAAAA7IAAAUABQArAAAACwALACAAAABMSUxMQVNZU1RFUkhFTU1B\r
+Authorization: NTLM TlRMTVNTUAABAAAAA7IAAAQABAAkAAAABAAEACAAAABIQVhYQ1VSTA==\r
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 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
 GET /67 HTTP/1.1\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAHAAAAAYABgAiAAAAAoACgBAAAAAEAAQAEoAAAAWABYAWgAAAAAAAACgAAAAAYIAAEgARQBNAE0AQQB0AGUAcwB0AHUAcwBlAHIATABJAEwATABBAFMAWQBTAFQARQBSAFpkQwKRCZFMYkMKatVwZ5YQjH0KEq0sF6mFcheMuv8v+xeqphEO5V41xRd7R9deOQ==\r
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAGAAAAAYABgAeAAAAAgACABAAAAAEAAQAEgAAAAIAAgAWAAAAAAAAACQAAAAAYIAAEMAVQBSAEwAdABlAHMAdAB1AHMAZQByAEgAQQBYAFgAWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145\r
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
 Host: 127.0.0.1:8999\r
 Pragma: no-cache\r

diff --git a/tests/data/test68 b/tests/data/test68
new file mode 100644 (file)
index 0000000..8ec4eb4
--- /dev/null
+++ b/tests/data/test68
@@ -0,0 +1,99 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 401 Authorization Required\r
+Server: Apache/1.3.27 (Darwin) PHP/4.1.2\r
+WWW-Authenticate: NTLM\r
+Content-Type: text/html; charset=iso-8859-1\r
+\r
+This is not the real page
+</data>
+
+# This is supposed to be returned when the server gets a first
+# Authorization: NTLM line passed-in from the client
+<data1001>
+HTTP/1.1 401 Now gimme that second request of crap\r
+Server: Microsoft-IIS/5.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==\r
+\r
+This is not the real page either!
+</data1001>
+
+# This is supposed to be returned when the server gets the second
+# Authorization: NTLM line passed-in from the client
+<data1002>
+HTTP/1.1 401 You give me wrong password\r
+Server: Microsoft-IIS/5.0\r
+WWW-Authenticate: NTLM\r
+Content-Type: text/html; charset=iso-8859-1\r
+\r
+Wrong password dude. Get it fixed and return.
+</data1002>
+
+<datacheck>
+HTTP/1.1 401 Authorization Required\r
+Server: Apache/1.3.27 (Darwin) PHP/4.1.2\r
+WWW-Authenticate: NTLM\r
+Content-Type: text/html; charset=iso-8859-1\r
+\r
+HTTP/1.1 401 Now gimme that second request of crap\r
+Server: Microsoft-IIS/5.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==\r
+\r
+HTTP/1.1 401 You give me wrong password\r
+Server: Microsoft-IIS/5.0\r
+WWW-Authenticate: NTLM\r
+Content-Type: text/html; charset=iso-8859-1\r
+\r
+Wrong password dude. Get it fixed and return.
+</datacheck>
+
+</reply>
+
+# Client-side
+<client>
+# NTLM only works if SSL-support is present
+<features>
+SSL
+</features>
+<server>
+http
+</server>
+ <name>
+HTTP with NTLM authorization and wrong password
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/68 -u testuser:testpass --ntlm
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /68 HTTP/1.1\r
+User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 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
+GET /68 HTTP/1.1\r
+Authorization: NTLM TlRMTVNTUAABAAAAA7IAAAQABAAkAAAABAAEACAAAABIQVhYQ1VSTA==\r
+User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 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
+GET /68 HTTP/1.1\r
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAGAAAAAYABgAeAAAAAgACABAAAAAEAAQAEgAAAAIAAgAWAAAAAAAAACQAAAAAYIAAEMAVQBSAEwAdABlAHMAdAB1AHMAZQByAEgAQQBYAFgAWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145\r
+User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 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>