Daniel Black's test suite fixes and initial test cases for SOCKS4/5 using

openssh

6 files changed, 241 insertions, 3 deletions

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index e418d41e4..6262dac6b 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -28,8 +28,8 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test194 test195 test196 test197 test198 test515 test516 test517 test518   \
  test210 test211 test212 test220 test221 test222 test223 test224 test206   \
  test207 test208 test209 test213 test240 test241 test242 test519 test214   \
- test215 test216 test217 test218 test199 test225 test226 test227 \
- test228 test229 test233 test234 test235 test236 test520   \
+ test215 test216 test217 test218 test199 test225 test226 test227	   \
+ test228 test229 test233 test234 test235 test236 test520		   \
  test237 test238 test239 test243 test245 test246 test247 test248 test249   \
  test250 test251 test252 test253 test254 test255 test521 test522 test523   \
  test256 test257 test258 test259 test260 test261 test262 test263 test264   \
@@ -41,4 +41,4 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test603 test401 test402 test290 test291 test292 test293 test403 test404   \
  test405 test604 test605 test606 test607 test608 test609 test294 test295   \
  test296 test297 test298 test610 test611 test612 test406 test407 test408   \
- test409 test613 test614
+ test409 test613 test614 test700 test701 test702 test704 test705
diff --git a/tests/data/test700 b/tests/data/test700
new file mode 100644
index 000000000..196fe4ed8
--- /dev/null
+++ b/tests/data/test700
@@ -0,0 +1,57 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+SOCKS4
+</keywords>
+</info>
+
+#
+# Server-side
+<reply name="1">
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
+-foo-
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+socks4
+</server>
+ <name>
+HTTP GET via SOCK4 proxy
+ </name>
+ <command>
+--socks4 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/700
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /700 HTTP/1.1

+Host: 127.0.0.1:%HTTPPORT

+Accept: */*

+

+</protocol>
+</verify>
+</testcase>
diff --git a/tests/data/test701 b/tests/data/test701
new file mode 100644
index 000000000..19fa933c0
--- /dev/null
+++ b/tests/data/test701
@@ -0,0 +1,57 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+SOCKS5
+</keywords>
+</info>
+
+#
+# Server-side
+<reply name="1">
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
+-foo-
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+socks5
+</server>
+ <name>
+HTTP GET via SOCK5 proxy
+ </name>
+ <command>
+--socks5 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/701
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /701 HTTP/1.1

+Host: 127.0.0.1:%HTTPPORT

+Accept: */*

+

+</protocol>
+</verify>
+</testcase>
diff --git a/tests/data/test702 b/tests/data/test702
new file mode 100644
index 000000000..65564f840
--- /dev/null
+++ b/tests/data/test702
@@ -0,0 +1,39 @@
+#based off  19
+<testcase>
+<info>
+<keywords>
+HTTP
+SOCKS4
+connect to non-listen
+FAILURE
+</keywords>
+</info>
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+socks4
+</server>
+<features>
+http
+</features>
+ <name>
+attempt connect to non-listening socket via sock4 proxy
+ </name>
+ <command>
+--socks4 %HOSTIP:%SOCKSPORT  %HOSTIP:60000
+</command>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+7
+</errorcode>
+</verify>
+</testcase>
diff --git a/tests/data/test704 b/tests/data/test704
new file mode 100644
index 000000000..76792640d
--- /dev/null
+++ b/tests/data/test704
@@ -0,0 +1,42 @@
+#based off  19
+<testcase>
+<info>
+<keywords>
+HTTP
+SOCKS4 fail
+connect to non-listen
+FAILURE
+</keywords>
+</info>
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+<killserver>
+socks4
+</killserver>
+<features>
+http
+</features>
+ <name>
+attempt connect to non-listening sock4 proxy
+ </name>
+ <command>
+--socks4 %HOSTIP:%SOCKSPORT  %HOSTIP:60000
+</command>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+7
+</errorcode>
+</verify>
+</testcase>
diff --git a/tests/data/test705 b/tests/data/test705
new file mode 100644
index 000000000..72e5b0b3b
--- /dev/null
+++ b/tests/data/test705
@@ -0,0 +1,43 @@
+#based off  19
+<testcase>
+<info>
+<keywords>
+HTTP
+SOCKS5 fail
+connect to non-listen
+FAILURE
+</keywords>
+</info>
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+<features>
+http
+</features>
+ <name>
+attempt connect to non-listening sock5 proxy
+ </name>
+ <command>
+--socks5 %HOSTIP:%SOCKSPORT  %HOSTIP:60000
+</command>
+</client>
+
+<killserver>
+sock5
+</killserver>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+7
+</errorcode>
+</verify>
+</testcase>