From 082e8a3b03d2c47d237994675bface127ab23c29 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 11 Nov 2011 19:46:44 +0100 Subject: Active mode FTP test cases with server not establishing data connection 591 -> FTP multi PORT and 425 on upload 592 -> FTP multi PORT and 421 on upload 593 -> FTP multi PORT upload, no data conn and no transient neg. reply 594 -> FTP multi PORT upload, no data conn and no positive prelim. reply 1206 -> FTP PORT and 425 on download 1207 -> FTP PORT and 421 on download 1208 -> FTP PORT download, no data conn and no transient negative reply 1209 -> FTP PORT download, no data conn and no positive preliminary reply --- tests/data/DISABLED | 9 ++++++- tests/data/Makefile.am | 7 ++--- tests/data/test1206 | 53 +++++++++++++++++++++++++++++++++++++ tests/data/test1207 | 53 +++++++++++++++++++++++++++++++++++++ tests/data/test1208 | 53 +++++++++++++++++++++++++++++++++++++ tests/data/test1209 | 53 +++++++++++++++++++++++++++++++++++++ tests/data/test589 | 68 ----------------------------------------------- tests/data/test591 | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/data/test592 | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/data/test593 | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/data/test594 | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 512 insertions(+), 72 deletions(-) create mode 100644 tests/data/test1206 create mode 100644 tests/data/test1207 create mode 100644 tests/data/test1208 create mode 100644 tests/data/test1209 delete mode 100644 tests/data/test589 create mode 100644 tests/data/test591 create mode 100644 tests/data/test592 create mode 100644 tests/data/test593 create mode 100644 tests/data/test594 (limited to 'tests/data') diff --git a/tests/data/DISABLED b/tests/data/DISABLED index db9bc6eb2..b0637dcbe 100644 --- a/tests/data/DISABLED +++ b/tests/data/DISABLED @@ -3,4 +3,11 @@ # per line. # Lines starting with '#' letters are treated as comments. 811 -589 +591 +592 +593 +594 +1206 +1207 +1208 +1209 diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index ff6c1d3f8..fdfa75547 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -47,8 +47,8 @@ test542 test543 test544 test545 test546 test547 test548 test549 test550 \ test551 test552 test553 test554 test555 test556 test557 test560 test561 \ test562 test563 test564 test565 test566 test567 test568 test569 test570 \ test571 test572 test573 test574 test575 test576 test578 test579 test580 \ -test581 test582 test583 test584 test585 test586 test587 test588 test589 \ -test590 \ +test581 test582 test583 test584 test585 test586 test587 test588 test590 \ +test591 test592 test593 test594 \ test600 test601 test602 test603 test604 \ test605 test606 test607 test608 test609 test610 test611 test612 test613 \ test614 test615 test616 test617 test618 test619 test620 test621 test622 \ @@ -75,7 +75,8 @@ test1102 test1103 test1104 test1105 test1106 test1107 test1108 test1109 \ test1110 test1111 test1112 test1113 test1114 test1115 test1116 test1117 \ test1118 test1119 test1120 test1121 test1122 test1123 test1124 test1125 \ test1126 test1127 test1128 test1129 test1130 test1131 \ -test1200 test1201 test1202 test1203 test1204 test1205 \ +test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \ +test1208 test1209 \ test1300 test1301 test1302 test1303 test1304 test1305 \ test1306 test1307 test1308 test1309 test1310 test1311 test1312 test1313 \ test1314 \ diff --git a/tests/data/test1206 b/tests/data/test1206 new file mode 100644 index 000000000..862c4bdf4 --- /dev/null +++ b/tests/data/test1206 @@ -0,0 +1,53 @@ + + + +FTP +PORT +RETR +NODATACONN425 + + +# Server-side + + +some bytes + + +NODATACONN425 + + + +# Client-side + + +ftp + + +FTP PORT and 425 on download + + +--max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/1206 -P - + + + + +# Verify data after the test has been "shot" + + +s/^EPRT \|1\|(.*)/EPRT \|1\|/ + + +USER anonymous +PASS ftp@example.com +PWD +EPRT |1| +TYPE I +SIZE 1206 +RETR 1206 +QUIT + + +19 + + + diff --git a/tests/data/test1207 b/tests/data/test1207 new file mode 100644 index 000000000..acc6427b7 --- /dev/null +++ b/tests/data/test1207 @@ -0,0 +1,53 @@ + + + +FTP +PORT +RETR +NODATACONN421 + + +# Server-side + + +some bytes + + +NODATACONN421 + + + +# Client-side + + +ftp + + +FTP PORT and 421 on download + + +--max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/1207 -P - + + + + +# Verify data after the test has been "shot" + + +s/^EPRT \|1\|(.*)/EPRT \|1\|/ + + +USER anonymous +PASS ftp@example.com +PWD +EPRT |1| +TYPE I +SIZE 1207 +RETR 1207 +QUIT + + +19 + + + diff --git a/tests/data/test1208 b/tests/data/test1208 new file mode 100644 index 000000000..7a81eecd9 --- /dev/null +++ b/tests/data/test1208 @@ -0,0 +1,53 @@ + + + +FTP +PORT +RETR +NODATACONN150 + + +# Server-side + + +some bytes + + +NODATACONN150 + + + +# Client-side + + +ftp + + +FTP PORT download, no data conn and no transient negative reply + + +--max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/1208 -P - + + + + +# Verify data after the test has been "shot" + + +s/^EPRT \|1\|(.*)/EPRT \|1\|/ + + +USER anonymous +PASS ftp@example.com +PWD +EPRT |1| +TYPE I +SIZE 1208 +RETR 1208 +QUIT + + +19 + + + diff --git a/tests/data/test1209 b/tests/data/test1209 new file mode 100644 index 000000000..a106f09cf --- /dev/null +++ b/tests/data/test1209 @@ -0,0 +1,53 @@ + + + +FTP +PORT +RETR +NODATACONN + + +# Server-side + + +some bytes + + +NODATACONN + + + +# Client-side + + +ftp + + +FTP PORT download, no data conn and no positive preliminary reply + + +--max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/1209 -P - + + + + +# Verify data after the test has been "shot" + + +s/^EPRT \|1\|(.*)/EPRT \|1\|/ + + +USER anonymous +PASS ftp@example.com +PWD +EPRT |1| +TYPE I +SIZE 1209 +RETR 1209 +QUIT + + +19 + + + diff --git a/tests/data/test589 b/tests/data/test589 deleted file mode 100644 index 29cb97217..000000000 --- a/tests/data/test589 +++ /dev/null @@ -1,68 +0,0 @@ -# -# For this test the server rejects the EPRT command -# and code in lib589 makes use of curl_multi_timeout() -# - - - -FTP -PORT -STOR -multi -EPRT refused - - - -# Server-side - - - - -REPLY EPRT 500 we don't like EPRT now - - - -# Client-side - - -ftp - - -lib589 - - -FTP PORT upload using multi interface timeout, EPRT doesn't work - - -ftp://%HOSTIP:%FTPPORT/path/589 log/upload589 - - -Moooooooooooo for 589 - upload this - - - -# Verify data after the test has been "shot" - -# Strip off parts of the PORT and EPRT commands that might differ - -s/^PORT (.*)/PORT/ -s/^EPRT \|1\|(.*)/EPRT \|1\|/ - - -USER anonymous -PASS ftp@example.com -PWD -CWD path -EPRT |1| -PORT -TYPE I -STOR 589 -QUIT - - -Moooooooooooo for 589 - upload this - - - diff --git a/tests/data/test591 b/tests/data/test591 new file mode 100644 index 000000000..0d4bac7dd --- /dev/null +++ b/tests/data/test591 @@ -0,0 +1,72 @@ +# +# For this test the server rejects the EPRT command, +# code in lib591 makes use of curl_multi_timeout() +# and server does not establish data connection. +# + + + +FTP +PORT +STOR +multi +EPRT refused +NODATACONN425 + + + +# Server-side + + + + +NODATACONN425 +REPLY EPRT 500 we don't like EPRT now + + + +# Client-side + + +ftp + + +lib591 + + +FTP multi PORT and 425 on upload + + +ftp://%HOSTIP:%FTPPORT/path/591 %FTPTIME2 log/upload591 + + +Moooooooooooo for 591 + upload this + + + +# Verify data after the test has been "shot" + +# Strip off parts of the PORT and EPRT commands that might differ + +s/^PORT (.*)/PORT/ +s/^EPRT \|1\|(.*)/EPRT \|1\|/ + + +USER anonymous +PASS ftp@example.com +PWD +CWD path +EPRT |1| +PORT +TYPE I +STOR 591 +QUIT + + +28 + + + + + diff --git a/tests/data/test592 b/tests/data/test592 new file mode 100644 index 000000000..4af04e31c --- /dev/null +++ b/tests/data/test592 @@ -0,0 +1,72 @@ +# +# For this test the server rejects the EPRT command, +# code in lib591 makes use of curl_multi_timeout() +# and server does not establish data connection. +# + + + +FTP +PORT +STOR +multi +EPRT refused +NODATACONN421 + + + +# Server-side + + + + +NODATACONN421 +REPLY EPRT 500 we don't like EPRT now + + + +# Client-side + + +ftp + + +lib591 + + +FTP multi PORT and 421 on upload + + +ftp://%HOSTIP:%FTPPORT/path/592 %FTPTIME2 log/upload592 + + +Moooooooooooo for 592 + upload this + + + +# Verify data after the test has been "shot" + +# Strip off parts of the PORT and EPRT commands that might differ + +s/^PORT (.*)/PORT/ +s/^EPRT \|1\|(.*)/EPRT \|1\|/ + + +USER anonymous +PASS ftp@example.com +PWD +CWD path +EPRT |1| +PORT +TYPE I +STOR 592 +QUIT + + +28 + + + + + diff --git a/tests/data/test593 b/tests/data/test593 new file mode 100644 index 000000000..811bf93c6 --- /dev/null +++ b/tests/data/test593 @@ -0,0 +1,72 @@ +# +# For this test the server rejects the EPRT command, +# code in lib591 makes use of curl_multi_timeout() +# and server does not establish data connection. +# + + + +FTP +PORT +STOR +multi +EPRT refused +NODATACONN150 + + + +# Server-side + + + + +NODATACONN150 +REPLY EPRT 500 we don't like EPRT now + + + +# Client-side + + +ftp + + +lib591 + + +FTP multi PORT upload, no data conn and no transient neg. reply + + +ftp://%HOSTIP:%FTPPORT/path/593 %FTPTIME2 log/upload593 + + +Moooooooooooo for 593 + upload this + + + +# Verify data after the test has been "shot" + +# Strip off parts of the PORT and EPRT commands that might differ + +s/^PORT (.*)/PORT/ +s/^EPRT \|1\|(.*)/EPRT \|1\|/ + + +USER anonymous +PASS ftp@example.com +PWD +CWD path +EPRT |1| +PORT +TYPE I +STOR 593 +QUIT + + +28 + + + + + diff --git a/tests/data/test594 b/tests/data/test594 new file mode 100644 index 000000000..77b5864d7 --- /dev/null +++ b/tests/data/test594 @@ -0,0 +1,72 @@ +# +# For this test the server rejects the EPRT command, +# code in lib591 makes use of curl_multi_timeout() +# and server does not establish data connection. +# + + + +FTP +PORT +STOR +multi +EPRT refused +NODATACONN + + + +# Server-side + + + + +NODATACONN +REPLY EPRT 500 we don't like EPRT now + + + +# Client-side + + +ftp + + +lib591 + + +FTP multi PORT upload, no data conn and no positive prelim. reply + + +ftp://%HOSTIP:%FTPPORT/path/594 %FTPTIME2 log/upload594 + + +Moooooooooooo for 594 + upload this + + + +# Verify data after the test has been "shot" + +# Strip off parts of the PORT and EPRT commands that might differ + +s/^PORT (.*)/PORT/ +s/^EPRT \|1\|(.*)/EPRT \|1\|/ + + +USER anonymous +PASS ftp@example.com +PWD +CWD path +EPRT |1| +PORT +TYPE I +STOR 594 +QUIT + + +28 + + + + + -- cgit v1.2.3