summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2022-01-03 13:35:53 +0100
committerDaniel Stenberg <daniel@haxx.se>2022-01-03 22:32:05 +0100
commitdbbf3609f3d874d6d709f60a6005f8dcce74e95b (patch)
treee8e6559b23fd8435a46228cd34d2c0d160c6f943
parentd2f712ddd0f76490f85b79f0cbd2b5669a9ecb00 (diff)
downloadcurl-dbbf3609f3d874d6d709f60a6005f8dcce74e95b.tar.gz
test719-721: verify SOCKS details
Using the new verify/socks details
-rw-r--r--tests/data/Makefile.inc2
-rw-r--r--tests/data/test71911
-rw-r--r--tests/data/test7205
-rw-r--r--tests/data/test72159
4 files changed, 71 insertions, 6 deletions
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 60930664d..9e0372b6e 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -95,7 +95,7 @@ test670 test671 test672 test673 test674 test675 test676 test677 test678 \
\
test700 test701 test702 test703 test704 test705 test706 test707 test708 \
test709 test710 test711 test712 test713 test714 test715 test716 test717 \
-test718 test719 test720 \
+test718 test719 test720 test721 \
\
test800 test801 test802 test803 test804 test805 test806 test807 test808 \
test809 test810 test811 test812 test813 test814 test815 test816 test817 \
diff --git a/tests/data/test719 b/tests/data/test719
index 3c242b1f6..7a5a4ff7e 100644
--- a/tests/data/test719
+++ b/tests/data/test719
@@ -31,14 +31,14 @@ Funny-head: yesyes
# Client-side
<client>
<server>
-http-ipv6
+http
socks5
</server>
<name>
-HTTP GET with IPv6 numerical via SOCKS5h set with --proxy
+HTTP GET with IPv6 numerical via SOCKS5h
</name>
<command>
-http://%HOST6IP:%HTTP6PORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT
+http://[2200::33]:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT
</command>
</client>
@@ -47,10 +47,13 @@ http://%HOST6IP:%HTTP6PORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT
<verify>
<protocol>
GET /%TESTNUMBER HTTP/1.1
-Host: %HOST6IP:%HTTP6PORT
+Host: [2200::33]:%HTTPPORT
User-Agent: curl/%VERSION
Accept: */*
</protocol>
+<socks>
+atyp 4 => 22 00 00 00 00 00 00 00 00 00 00 00 00 00 00 33
+</socks>
</verify>
</testcase>
diff --git a/tests/data/test720 b/tests/data/test720
index 876a7a326..786d83552 100644
--- a/tests/data/test720
+++ b/tests/data/test720
@@ -35,7 +35,7 @@ http
socks5
</server>
<name>
-HTTP GET with IPv4 numerical via SOCKS5h set with --proxy
+HTTP GET with IPv4 numerical via SOCKS5h
</name>
<command>
http://12.34.56.78:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT
@@ -52,5 +52,8 @@ User-Agent: curl/%VERSION
Accept: */*
</protocol>
+<socks>
+atyp 1 => 12.34.56.78
+</socks>
</verify>
</testcase>
diff --git a/tests/data/test721 b/tests/data/test721
new file mode 100644
index 000000000..8af61dabf
--- /dev/null
+++ b/tests/data/test721
@@ -0,0 +1,59 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+SOCKS5
+SOCKS5h
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Tue, 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 with host name using SOCKS5h
+ </name>
+ <command>
+http://this.is.a.host.name:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+GET /%TESTNUMBER HTTP/1.1
+Host: this.is.a.host.name:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+</protocol>
+<socks>
+atyp 3 => this.is.a.host.name
+</socks>
+</verify>
+</testcase>