aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2013-02-18 23:40:29 +0100
committerDaniel Stenberg <daniel@haxx.se>2013-04-12 23:59:37 +0200
commitc5ba0c2f5446532798ff68b598326f5f994616c1 (patch)
tree29fa64ced4062750866fa2089bf756e3535089dc /tests
parentedddf394b8634079a0b7c43c126e33ed9fa578b1 (diff)
FTP: handle a 230 welcome response
...instead of the 220 we otherwise expect. Made the ftpserver.pl support sending a custom "welcome" and then created test 1219 to verify this fix with such a 230 welcome. Bug: http://curl.haxx.se/mail/lib-2013-02/0102.html Reported by: Anders Havn
Diffstat (limited to 'tests')
-rw-r--r--tests/FILEFORMAT2
-rw-r--r--tests/data/Makefile.am2
-rw-r--r--tests/data/test121949
-rwxr-xr-xtests/ftpserver.pl40
4 files changed, 74 insertions, 19 deletions
diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index 063925f09..eeb4a9822 100644
--- a/tests/FILEFORMAT
+++ b/tests/FILEFORMAT
@@ -107,6 +107,8 @@ For FTP/SMTP/POP/IMAP, these are supported:
REPLY [command] [return value] [response string]
- Changes how the server responds to the [command]. [response string] is
evaluated as a perl string, so it can contain embedded \r\n, for example.
+ There's a special [command] named "welcome" (without quotes) which is the
+ string sent immediately on connect as a welcome.
COUNT [command] [num]
- Do the REPLY change for [command] only [num] times and then go back to the
built-in approach
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index c3857d2f5..875a35d3a 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -89,7 +89,7 @@ test1128 test1129 test1130 test1131 test1132 test1133 \
\
test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \
test1208 test1209 test1210 test1211 test1212 test1213 test1214 test1215 \
-test1216 test1217 test1218 \
+test1216 test1217 test1218 test1219 \
test1220 test1221 test1222 test1223 test1224 test1225 test1226 test1227 \
\
test1300 test1301 test1302 test1303 test1304 test1305 test1306 test1307 \
diff --git a/tests/data/test1219 b/tests/data/test1219
new file mode 100644
index 000000000..e42a211a2
--- /dev/null
+++ b/tests/data/test1219
@@ -0,0 +1,49 @@
+<testcase>
+<info>
+<keywords>
+FTP
+PASV
+RETR
+</keywords>
+</info>
+# Server-side
+<reply>
+<data>
+data
+ to
+ see
+that FTP
+works
+ so does it?
+</data>
+<servercmd>
+REPLY welcome 230 welcome without password
+</servercmd>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP with no user+password required (230 response)
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/1219
+</command>
+
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+PWD
+EPSV
+TYPE I
+SIZE 1219
+RETR 1219
+QUIT
+</protocol>
+</verify>
+</testcase>
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index 23af6f85f..f6cb25511 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -124,7 +124,6 @@ my $sockfilt_timeout = 5; # default timeout for sockfilter eXsysreads
#
my %commandfunc; # protocol command specific function callbacks
my %displaytext; # text returned to client before callback runs
-my @welcome; # text returned to client upon connection
#**********************************************************************
# global vars customized for each test from the server commands file
@@ -547,13 +546,12 @@ sub protocolsetup {
'NOOP' => '200 Yes, I\'m very good at doing nothing.',
'PBSZ' => '500 PBSZ not implemented',
'PROT' => '500 PROT not implemented',
- );
- @welcome = (
+ 'welcome' => join("",
'220- _ _ ____ _ '."\r\n",
'220- ___| | | | _ \| | '."\r\n",
'220- / __| | | | |_) | | '."\r\n",
'220- | (__| |_| | _ <| |___ '."\r\n",
- '220 \___|\___/|_| \_\_____|'."\r\n"
+ '220 \___|\___/|_| \_\_____|'."\r\n")
);
}
elsif($proto eq 'pop3') {
@@ -567,14 +565,13 @@ sub protocolsetup {
'USER' => '+OK We are happy you popped in!',
'PASS' => '+OK Access granted',
'QUIT' => '+OK byebye',
- );
- @welcome = (
+ 'welcome' => join("",
' _ _ ____ _ '."\r\n",
' ___| | | | _ \| | '."\r\n",
' / __| | | | |_) | | '."\r\n",
' | (__| |_| | _ <| |___ '."\r\n",
' \___|\___/|_| \_\_____|'."\r\n",
- '+OK cURL POP3 server ready to serve'."\r\n"
+ '+OK cURL POP3 server ready to serve'."\r\n")
);
}
elsif($proto eq 'imap') {
@@ -590,14 +587,13 @@ sub protocolsetup {
%displaytext = (
'LOGIN' => ' OK We are happy you popped in!',
'LOGOUT' => ' OK thanks for the fish',
- );
- @welcome = (
+ 'welcome' => join("",
' _ _ ____ _ '."\r\n",
' ___| | | | _ \| | '."\r\n",
' / __| | | | |_) | | '."\r\n",
' | (__| |_| | _ <| |___ '."\r\n",
' \___|\___/|_| \_\_____|'."\r\n",
- '* OK cURL IMAP server ready to serve'."\r\n"
+ '* OK cURL IMAP server ready to serve'."\r\n")
);
}
elsif($proto eq 'smtp') {
@@ -610,13 +606,12 @@ sub protocolsetup {
'MAIL' => '200 Note taken',
'RCPT' => '200 Receivers accepted',
'QUIT' => '200 byebye',
- );
- @welcome = (
+ 'welcome' => join("",
'220- _ _ ____ _ '."\r\n",
'220- ___| | | | _ \| | '."\r\n",
'220- / __| | | | |_) | | '."\r\n",
'220- | (__| |_| | _ <| |___ '."\r\n",
- '220 \___|\___/|_| \_\_____|'."\r\n"
+ '220 \___|\___/|_| \_\_____|'."\r\n")
);
}
}
@@ -2157,7 +2152,18 @@ while(1) {
&customize(); # read test control instructions
- sendcontrol @welcome;
+ my $welcome = $customreply{"welcome"};
+ if(!$welcome) {
+ $welcome = $displaytext{"welcome"};
+ }
+ else {
+ # clear it after use
+ $customreply{"welcome"}="";
+ if($welcome !~ /\r\n\z/) {
+ $welcome .= "\r\n";
+ }
+ }
+ sendcontrol $welcome;
#remove global variables from last connection
if($ftplistparserstate) {
@@ -2168,9 +2174,7 @@ while(1) {
}
if($verbose) {
- for(@welcome) {
- print STDERR "OUT: $_";
- }
+ print STDERR "OUT: $welcome";
}
my $full = "";