412 lines
7.7 KiB
Diff
412 lines
7.7 KiB
Diff
commit a666cad58213b010a046a6b767fce7617e863cb1
|
|
Author: Daniel Stenberg <daniel@haxx.se>
|
|
Date: Mon Apr 25 16:24:33 2022 +0200
|
|
|
|
[Backport] tests: verify the fix for CVE-2022-27774
|
|
|
|
Offering: RTOS
|
|
CVE: CVE-2022-27774
|
|
Reference: upstream_commit_id=5295e8d64ac6949ecb3f9e564317a608f51b90d8
|
|
|
|
DTS/AR: DTS2022042805098
|
|
type: LTS
|
|
reason: fix CVE-2022-27774 for curl.
|
|
weblink:https://github.com/curl/curl/commit/5295e8d64ac6949ecb3f9e564317a608f51b90d8
|
|
|
|
- Test 973 redirects from HTTP to FTP, clear auth
|
|
- Test 974 redirects from HTTP to HTTP different port, clear auth
|
|
- Test 975 redirects from HTTP to FTP, permitted to keep auth
|
|
- Test 976 redirects from HTTP to HTTP different port, permitted to keep
|
|
auth
|
|
|
|
Signed-off-by: lvshengyuan <lvshengyuan1@h-partners.com>
|
|
|
|
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
|
|
index a2cfd69f7..cd52a026b 100644
|
|
--- a/tests/data/Makefile.inc
|
|
+++ b/tests/data/Makefile.inc
|
|
@@ -116,7 +116,7 @@ test936 test937 test938 test939 test940 test941 test942 test943 test944 \
|
|
test945 test946 test947 test948 test949 test950 test951 test952 test953 \
|
|
test954 test955 test956 test957 test958 test959 test960 test961 test962 \
|
|
test963 test964 test965 test966 test967 test968 test969 test970 test971 \
|
|
-test972 \
|
|
+test972 test973 test974 test975 test976 \
|
|
\
|
|
test980 test981 test982 test983 test984 test985 test986 \
|
|
\
|
|
diff --git a/tests/data/test973 b/tests/data/test973
|
|
new file mode 100644
|
|
index 000000000..6ced10789
|
|
--- /dev/null
|
|
+++ b/tests/data/test973
|
|
@@ -0,0 +1,88 @@
|
|
+<testcase>
|
|
+<info>
|
|
+<keywords>
|
|
+HTTP
|
|
+FTP
|
|
+--location
|
|
+</keywords>
|
|
+</info>
|
|
+
|
|
+#
|
|
+# Server-side
|
|
+<reply>
|
|
+<data>
|
|
+HTTP/1.1 301 redirect
|
|
+Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
+Server: test-server/fake
|
|
+Content-Length: 0
|
|
+Connection: close
|
|
+Content-Type: text/html
|
|
+Location: ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER0002
|
|
+
|
|
+</data>
|
|
+<data2>
|
|
+data
|
|
+ to
|
|
+ see
|
|
+that FTP
|
|
+works
|
|
+ so does it?
|
|
+</data2>
|
|
+
|
|
+<datacheck>
|
|
+HTTP/1.1 301 redirect
|
|
+Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
+Server: test-server/fake
|
|
+Content-Length: 0
|
|
+Connection: close
|
|
+Content-Type: text/html
|
|
+Location: ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER0002
|
|
+
|
|
+data
|
|
+ to
|
|
+ see
|
|
+that FTP
|
|
+works
|
|
+ so does it?
|
|
+</datacheck>
|
|
+
|
|
+</reply>
|
|
+
|
|
+#
|
|
+# Client-side
|
|
+<client>
|
|
+<server>
|
|
+http
|
|
+ftp
|
|
+</server>
|
|
+ <name>
|
|
+HTTP with auth redirected to FTP w/o auth
|
|
+ </name>
|
|
+ <command>
|
|
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -u joe:secret
|
|
+</command>
|
|
+</client>
|
|
+
|
|
+#
|
|
+# Verify data after the test has been "shot"
|
|
+<verify>
|
|
+<protocol>
|
|
+GET /%TESTNUMBER HTTP/1.1
|
|
+Host: %HOSTIP:%HTTPPORT
|
|
+Authorization: Basic am9lOnNlY3JldA==
|
|
+User-Agent: curl/%VERSION
|
|
+Accept: */*
|
|
+
|
|
+USER anonymous
|
|
+PASS ftp@example.com
|
|
+PWD
|
|
+CWD a
|
|
+CWD path
|
|
+EPSV
|
|
+TYPE I
|
|
+SIZE %TESTNUMBER0002
|
|
+RETR %TESTNUMBER0002
|
|
+QUIT
|
|
+</protocol>
|
|
+</verify>
|
|
+</testcase>
|
|
diff --git a/tests/data/test974 b/tests/data/test974
|
|
new file mode 100644
|
|
index 000000000..ac4e6415d
|
|
--- /dev/null
|
|
+++ b/tests/data/test974
|
|
@@ -0,0 +1,87 @@
|
|
+<testcase>
|
|
+<info>
|
|
+<keywords>
|
|
+HTTP
|
|
+--location
|
|
+</keywords>
|
|
+</info>
|
|
+
|
|
+#
|
|
+# Server-side
|
|
+<reply>
|
|
+<data>
|
|
+HTTP/1.1 301 redirect
|
|
+Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
+Server: test-server/fake
|
|
+Content-Length: 0
|
|
+Connection: close
|
|
+Content-Type: text/html
|
|
+Location: http://firsthost.com:9999/a/path/%TESTNUMBER0002
|
|
+
|
|
+</data>
|
|
+<data2>
|
|
+HTTP/1.1 200 OK
|
|
+Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
+Server: test-server/fake
|
|
+Content-Length: 4
|
|
+Connection: close
|
|
+Content-Type: text/html
|
|
+
|
|
+hey
|
|
+</data2>
|
|
+
|
|
+<datacheck>
|
|
+HTTP/1.1 301 redirect
|
|
+Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
+Server: test-server/fake
|
|
+Content-Length: 0
|
|
+Connection: close
|
|
+Content-Type: text/html
|
|
+Location: http://firsthost.com:9999/a/path/%TESTNUMBER0002
|
|
+
|
|
+HTTP/1.1 200 OK
|
|
+Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
+Server: test-server/fake
|
|
+Content-Length: 4
|
|
+Connection: close
|
|
+Content-Type: text/html
|
|
+
|
|
+hey
|
|
+</datacheck>
|
|
+
|
|
+</reply>
|
|
+
|
|
+#
|
|
+# Client-side
|
|
+<client>
|
|
+<server>
|
|
+http
|
|
+</server>
|
|
+ <name>
|
|
+HTTP with auth redirected to HTTP on a diff port w/o auth
|
|
+ </name>
|
|
+ <command>
|
|
+-x http://%HOSTIP:%HTTPPORT http://firsthost.com -L -u joe:secret
|
|
+</command>
|
|
+</client>
|
|
+
|
|
+#
|
|
+# Verify data after the test has been "shot"
|
|
+<verify>
|
|
+<protocol>
|
|
+GET http://firsthost.com/ HTTP/1.1
|
|
+Host: firsthost.com
|
|
+Authorization: Basic am9lOnNlY3JldA==
|
|
+User-Agent: curl/%VERSION
|
|
+Accept: */*
|
|
+Proxy-Connection: Keep-Alive
|
|
+
|
|
+GET http://firsthost.com:9999/a/path/%TESTNUMBER0002 HTTP/1.1
|
|
+Host: firsthost.com:9999
|
|
+User-Agent: curl/%VERSION
|
|
+Accept: */*
|
|
+Proxy-Connection: Keep-Alive
|
|
+
|
|
+</protocol>
|
|
+</verify>
|
|
+</testcase>
|
|
diff --git a/tests/data/test975 b/tests/data/test975
|
|
new file mode 100644
|
|
index 000000000..85e03e4f2
|
|
--- /dev/null
|
|
+++ b/tests/data/test975
|
|
@@ -0,0 +1,88 @@
|
|
+<testcase>
|
|
+<info>
|
|
+<keywords>
|
|
+HTTP
|
|
+FTP
|
|
+--location-trusted
|
|
+</keywords>
|
|
+</info>
|
|
+
|
|
+#
|
|
+# Server-side
|
|
+<reply>
|
|
+<data>
|
|
+HTTP/1.1 301 redirect
|
|
+Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
+Server: test-server/fake
|
|
+Content-Length: 0
|
|
+Connection: close
|
|
+Content-Type: text/html
|
|
+Location: ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER0002
|
|
+
|
|
+</data>
|
|
+<data2>
|
|
+data
|
|
+ to
|
|
+ see
|
|
+that FTP
|
|
+works
|
|
+ so does it?
|
|
+</data2>
|
|
+
|
|
+<datacheck>
|
|
+HTTP/1.1 301 redirect
|
|
+Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
+Server: test-server/fake
|
|
+Content-Length: 0
|
|
+Connection: close
|
|
+Content-Type: text/html
|
|
+Location: ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER0002
|
|
+
|
|
+data
|
|
+ to
|
|
+ see
|
|
+that FTP
|
|
+works
|
|
+ so does it?
|
|
+</datacheck>
|
|
+
|
|
+</reply>
|
|
+
|
|
+#
|
|
+# Client-side
|
|
+<client>
|
|
+<server>
|
|
+http
|
|
+ftp
|
|
+</server>
|
|
+ <name>
|
|
+HTTP with auth redirected to FTP allowing auth to continue
|
|
+ </name>
|
|
+ <command>
|
|
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --location-trusted -u joe:secret
|
|
+</command>
|
|
+</client>
|
|
+
|
|
+#
|
|
+# Verify data after the test has been "shot"
|
|
+<verify>
|
|
+<protocol>
|
|
+GET /%TESTNUMBER HTTP/1.1
|
|
+Host: %HOSTIP:%HTTPPORT
|
|
+Authorization: Basic am9lOnNlY3JldA==
|
|
+User-Agent: curl/%VERSION
|
|
+Accept: */*
|
|
+
|
|
+USER joe
|
|
+PASS secret
|
|
+PWD
|
|
+CWD a
|
|
+CWD path
|
|
+EPSV
|
|
+TYPE I
|
|
+SIZE %TESTNUMBER0002
|
|
+RETR %TESTNUMBER0002
|
|
+QUIT
|
|
+</protocol>
|
|
+</verify>
|
|
+</testcase>
|
|
diff --git a/tests/data/test976 b/tests/data/test976
|
|
new file mode 100644
|
|
index 000000000..c4dd61e70
|
|
--- /dev/null
|
|
+++ b/tests/data/test976
|
|
@@ -0,0 +1,88 @@
|
|
+<testcase>
|
|
+<info>
|
|
+<keywords>
|
|
+HTTP
|
|
+--location-trusted
|
|
+</keywords>
|
|
+</info>
|
|
+
|
|
+#
|
|
+# Server-side
|
|
+<reply>
|
|
+<data>
|
|
+HTTP/1.1 301 redirect
|
|
+Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
+Server: test-server/fake
|
|
+Content-Length: 0
|
|
+Connection: close
|
|
+Content-Type: text/html
|
|
+Location: http://firsthost.com:9999/a/path/%TESTNUMBER0002
|
|
+
|
|
+</data>
|
|
+<data2>
|
|
+HTTP/1.1 200 OK
|
|
+Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
+Server: test-server/fake
|
|
+Content-Length: 4
|
|
+Connection: close
|
|
+Content-Type: text/html
|
|
+
|
|
+hey
|
|
+</data2>
|
|
+
|
|
+<datacheck>
|
|
+HTTP/1.1 301 redirect
|
|
+Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
+Server: test-server/fake
|
|
+Content-Length: 0
|
|
+Connection: close
|
|
+Content-Type: text/html
|
|
+Location: http://firsthost.com:9999/a/path/%TESTNUMBER0002
|
|
+
|
|
+HTTP/1.1 200 OK
|
|
+Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
+Server: test-server/fake
|
|
+Content-Length: 4
|
|
+Connection: close
|
|
+Content-Type: text/html
|
|
+
|
|
+hey
|
|
+</datacheck>
|
|
+
|
|
+</reply>
|
|
+
|
|
+#
|
|
+# Client-side
|
|
+<client>
|
|
+<server>
|
|
+http
|
|
+</server>
|
|
+ <name>
|
|
+HTTP with auth redirected to HTTP on a diff port --location-trusted
|
|
+ </name>
|
|
+ <command>
|
|
+-x http://%HOSTIP:%HTTPPORT http://firsthost.com --location-trusted -u joe:secret
|
|
+</command>
|
|
+</client>
|
|
+
|
|
+#
|
|
+# Verify data after the test has been "shot"
|
|
+<verify>
|
|
+<protocol>
|
|
+GET http://firsthost.com/ HTTP/1.1
|
|
+Host: firsthost.com
|
|
+Authorization: Basic am9lOnNlY3JldA==
|
|
+User-Agent: curl/%VERSION
|
|
+Accept: */*
|
|
+Proxy-Connection: Keep-Alive
|
|
+
|
|
+GET http://firsthost.com:9999/a/path/%TESTNUMBER0002 HTTP/1.1
|
|
+Host: firsthost.com:9999
|
|
+Authorization: Basic am9lOnNlY3JldA==
|
|
+User-Agent: curl/%VERSION
|
|
+Accept: */*
|
|
+Proxy-Connection: Keep-Alive
|
|
+
|
|
+</protocol>
|
|
+</verify>
|
|
+</testcase>
|