Index: src/router/proftpd/tests/t/lib/ProFTPD/Tests/Config/TimeoutStalled.pm =================================================================== --- src/router/proftpd/tests/t/lib/ProFTPD/Tests/Config/TimeoutStalled.pm (revision 14672) +++ src/router/proftpd/tests/t/lib/ProFTPD/Tests/Config/TimeoutStalled.pm (revision 17876) @@ -2,8 +2,7 @@ use lib qw(t/lib); -use base qw(Test::Unit::TestCase ProFTPD::TestSuite::Child); +use base qw(ProFTPD::TestSuite::Child); use strict; -use File::Path qw(mkpath rmtree); use File::Spec; use IO::Handle; @@ -22,9 +21,34 @@ }, - timeoutstalled_exceeded => { + timeoutstalled_exceeded_list => { order => ++$order, test_class => [qw(forking)], }, + timeoutstalled_exceeded_nlst => { + order => ++$order, + test_class => [qw(forking)], + }, + + timeoutstalled_exceeded_mlsd => { + order => ++$order, + test_class => [qw(forking)], + }, + + timeoutstalled_exceeded_retr => { + order => ++$order, + test_class => [qw(forking)], + }, + + timeoutstalled_exceeded_stor => { + order => ++$order, + test_class => [qw(forking)], + }, + + timeoutstalled_exceeded_retr_usesendfile_on => { + order => ++$order, + test_class => [qw(feat_sendfile forking)], + }, + }; @@ -37,27 +61,4 @@ } -sub set_up { - my $self = shift; - $self->{tmpdir} = testsuite_get_tmp_dir(); - - # Create temporary scratch dir - eval { mkpath($self->{tmpdir}) }; - if ($@) { - my $abs_path = File::Spec->rel2abs($self->{tmpdir}); - die("Can't create dir $abs_path: $@"); - } -} - -sub tear_down { - my $self = shift; - - # Remove temporary scratch dir - if ($self->{tmpdir}) { - eval { rmtree($self->{tmpdir}) }; - } - - undef $self; -}; - sub timeoutstalled_ok { my $self = shift; @@ -75,4 +76,5 @@ my $user = 'proftpd'; my $passwd = 'test'; + my $group = 'ftpd'; my $home_dir = File::Spec->rel2abs($tmpdir); my $uid = 500; @@ -93,5 +95,5 @@ auth_user_write($auth_user_file, $user, $passwd, $uid, $gid, $home_dir, '/bin/bash'); - auth_group_write($auth_group_file, 'ftpd', $gid, $user); + auth_group_write($auth_group_file, $group, $gid, $user); my $timeout_stalled = 2; @@ -145,5 +147,5 @@ my $buf; - $conn->read($buf, 8192); + $conn->read($buf, 8192, 30); $conn->close(); @@ -191,5 +193,5 @@ } -sub timeoutstalled_exceeded { +sub timeoutstalled_exceeded_list { my $self = shift; my $tmpdir = $self->{tmpdir}; @@ -206,4 +208,5 @@ my $user = 'proftpd'; my $passwd = 'test'; + my $group = 'ftpd'; my $home_dir = File::Spec->rel2abs($tmpdir); my $uid = 500; @@ -224,5 +227,5 @@ auth_user_write($auth_user_file, $user, $passwd, $uid, $gid, $home_dir, '/bin/bash'); - auth_group_write($auth_group_file, 'ftpd', $gid, $user); + auth_group_write($auth_group_file, $group, $gid, $user); my $timeout_stalled = 1; @@ -276,16 +279,14 @@ my $buf; - $conn->read($buf, 8192); + $conn->read($buf, 8192, 30); $conn->close(); - my ($resp_code, $resp_msg); eval { $client->noop() }; unless ($@) { die("NOOP succeeded unexpectedly"); - - } else { - $resp_code = $client->response_code(); - $resp_msg = $client->response_msg(); - } + } + + my $resp_code = $client->response_code(); + my $resp_msg = $client->response_msg(); my $expected; @@ -331,3 +332,699 @@ } +sub timeoutstalled_exceeded_nlst { + my $self = shift; + my $tmpdir = $self->{tmpdir}; + + my $config_file = "$tmpdir/config.conf"; + my $pid_file = File::Spec->rel2abs("$tmpdir/config.pid"); + my $scoreboard_file = File::Spec->rel2abs("$tmpdir/config.scoreboard"); + + my $log_file = File::Spec->rel2abs('tests.log'); + + my $auth_user_file = File::Spec->rel2abs("$tmpdir/config.passwd"); + my $auth_group_file = File::Spec->rel2abs("$tmpdir/config.group"); + + my $user = 'proftpd'; + my $passwd = 'test'; + my $group = 'ftpd'; + my $home_dir = File::Spec->rel2abs($tmpdir); + my $uid = 500; + my $gid = 500; + + # Make sure that, if we're running as root, that the home directory has + # permissions/privs set for the account we create + if ($< == 0) { + unless (chmod(0755, $home_dir)) { + die("Can't set perms on $home_dir to 0755: $!"); + } + + unless (chown($uid, $gid, $home_dir)) { + die("Can't set owner of $home_dir to $uid/$gid: $!"); + } + } + + auth_user_write($auth_user_file, $user, $passwd, $uid, $gid, $home_dir, + '/bin/bash'); + auth_group_write($auth_group_file, $group, $gid, $user); + + my $timeout_stalled = 1; + + my $config = { + PidFile => $pid_file, + ScoreboardFile => $scoreboard_file, + SystemLog => $log_file, + + AuthUserFile => $auth_user_file, + AuthGroupFile => $auth_group_file, + + TimeoutStalled => $timeout_stalled, + + IfModules => { + 'mod_delay.c' => { + DelayEngine => 'off', + }, + }, + }; + + my ($port, $config_user, $config_group) = config_write($config_file, $config); + + # Open pipes, for use between the parent and child processes. Specifically, + # the child will indicate when it's done with its test by writing a message + # to the parent. + my ($rfh, $wfh); + unless (pipe($rfh, $wfh)) { + die("Can't open pipe: $!"); + } + + my $ex; + + # Fork child + $self->handle_sigchld(); + defined(my $pid = fork()) or die("Can't fork: $!"); + if ($pid) { + eval { + my $client = ProFTPD::TestSuite::FTP->new('127.0.0.1', $port); + + $client->login($user, $passwd); + + my $conn = $client->nlst_raw($home_dir); + unless ($conn) { + die("NLST failed: " . $client->response_code() . " " . + $client->response_msg()); + } + + # Wait for one second more than the stalled period + sleep($timeout_stalled + 1); + + my $buf; + $conn->read($buf, 8192, 30); + $conn->close(); + + eval { $client->noop() }; + unless ($@) { + die("NOOP succeeded unexpectedly"); + } + + my $resp_code = $client->response_code(); + my $resp_msg = $client->response_msg(); + + my $expected; + + # Perl's Net::Cmd module uses a very non-standard 599 code to + # indicate that the connection is closed + $expected = 599; + $self->assert($expected == $resp_code, + test_msg("Expected $expected, got $resp_code")); + + $expected = "Connection closed"; + $self->assert($expected eq $resp_msg, + test_msg("Expected '$expected', got '$resp_msg'")); + }; + + if ($@) { + $ex = $@; + } + + $wfh->print("done\n"); + $wfh->flush(); + + } else { + eval { server_wait($config_file, $rfh) }; + if ($@) { + warn($@); + exit 1; + } + + exit 0; + } + + # Stop server + server_stop($pid_file); + + $self->assert_child_ok($pid); + + if ($ex) { + die($ex); + } + + unlink($log_file); +} + +sub timeoutstalled_exceeded_mlsd { + my $self = shift; + my $tmpdir = $self->{tmpdir}; + + my $config_file = "$tmpdir/config.conf"; + my $pid_file = File::Spec->rel2abs("$tmpdir/config.pid"); + my $scoreboard_file = File::Spec->rel2abs("$tmpdir/config.scoreboard"); + + my $log_file = File::Spec->rel2abs('tests.log'); + + my $auth_user_file = File::Spec->rel2abs("$tmpdir/config.passwd"); + my $auth_group_file = File::Spec->rel2abs("$tmpdir/config.group"); + + my $user = 'proftpd'; + my $passwd = 'test'; + my $group = 'ftpd'; + my $home_dir = File::Spec->rel2abs($tmpdir); + my $uid = 500; + my $gid = 500; + + # Make sure that, if we're running as root, that the home directory has + # permissions/privs set for the account we create + if ($< == 0) { + unless (chmod(0755, $home_dir)) { + die("Can't set perms on $home_dir to 0755: $!"); + } + + unless (chown($uid, $gid, $home_dir)) { + die("Can't set owner of $home_dir to $uid/$gid: $!"); + } + } + + auth_user_write($auth_user_file, $user, $passwd, $uid, $gid, $home_dir, + '/bin/bash'); + auth_group_write($auth_group_file, $group, $gid, $user); + + my $timeout_stalled = 1; + + my $config = { + PidFile => $pid_file, + ScoreboardFile => $scoreboard_file, + SystemLog => $log_file, + + AuthUserFile => $auth_user_file, + AuthGroupFile => $auth_group_file, + + TimeoutStalled => $timeout_stalled, + + IfModules => { + 'mod_delay.c' => { + DelayEngine => 'off', + }, + }, + }; + + my ($port, $config_user, $config_group) = config_write($config_file, $config); + + # Open pipes, for use between the parent and child processes. Specifically, + # the child will indicate when it's done with its test by writing a message + # to the parent. + my ($rfh, $wfh); + unless (pipe($rfh, $wfh)) { + die("Can't open pipe: $!"); + } + + my $ex; + + # Fork child + $self->handle_sigchld(); + defined(my $pid = fork()) or die("Can't fork: $!"); + if ($pid) { + eval { + my $client = ProFTPD::TestSuite::FTP->new('127.0.0.1', $port); + + $client->login($user, $passwd); + + my $conn = $client->mlsd_raw($home_dir); + unless ($conn) { + die("MLSD failed: " . $client->response_code() . " " . + $client->response_msg()); + } + + # Wait for one second more than the stalled period + sleep($timeout_stalled + 1); + + my $buf; + $conn->read($buf, 8192, 30); + $conn->close(); + + eval { $client->noop() }; + unless ($@) { + die("NOOP succeeded unexpectedly"); + } + + my $resp_code = $client->response_code(); + my $resp_msg = $client->response_msg(); + + my $expected; + + # Perl's Net::Cmd module uses a very non-standard 599 code to + # indicate that the connection is closed + $expected = 599; + $self->assert($expected == $resp_code, + test_msg("Expected $expected, got $resp_code")); + + $expected = "Connection closed"; + $self->assert($expected eq $resp_msg, + test_msg("Expected '$expected', got '$resp_msg'")); + }; + + if ($@) { + $ex = $@; + } + + $wfh->print("done\n"); + $wfh->flush(); + + } else { + eval { server_wait($config_file, $rfh) }; + if ($@) { + warn($@); + exit 1; + } + + exit 0; + } + + # Stop server + server_stop($pid_file); + + $self->assert_child_ok($pid); + + if ($ex) { + die($ex); + } + + unlink($log_file); +} + +sub timeoutstalled_exceeded_retr { + my $self = shift; + my $tmpdir = $self->{tmpdir}; + + my $config_file = "$tmpdir/config.conf"; + my $pid_file = File::Spec->rel2abs("$tmpdir/config.pid"); + my $scoreboard_file = File::Spec->rel2abs("$tmpdir/config.scoreboard"); + + my $log_file = File::Spec->rel2abs('tests.log'); + + my $auth_user_file = File::Spec->rel2abs("$tmpdir/config.passwd"); + my $auth_group_file = File::Spec->rel2abs("$tmpdir/config.group"); + + my $user = 'proftpd'; + my $passwd = 'test'; + my $group = 'ftpd'; + my $home_dir = File::Spec->rel2abs($tmpdir); + my $uid = 500; + my $gid = 500; + + # Make sure that, if we're running as root, that the home directory has + # permissions/privs set for the account we create + if ($< == 0) { + unless (chmod(0755, $home_dir)) { + die("Can't set perms on $home_dir to 0755: $!"); + } + + unless (chown($uid, $gid, $home_dir)) { + die("Can't set owner of $home_dir to $uid/$gid: $!"); + } + } + + auth_user_write($auth_user_file, $user, $passwd, $uid, $gid, $home_dir, + '/bin/bash'); + auth_group_write($auth_group_file, $group, $gid, $user); + + my $timeout_stalled = 1; + + my $config = { + PidFile => $pid_file, + ScoreboardFile => $scoreboard_file, + SystemLog => $log_file, + + AuthUserFile => $auth_user_file, + AuthGroupFile => $auth_group_file, + + TimeoutStalled => $timeout_stalled, + + IfModules => { + 'mod_delay.c' => { + DelayEngine => 'off', + }, + }, + }; + + my ($port, $config_user, $config_group) = config_write($config_file, $config); + + # Open pipes, for use between the parent and child processes. Specifically, + # the child will indicate when it's done with its test by writing a message + # to the parent. + my ($rfh, $wfh); + unless (pipe($rfh, $wfh)) { + die("Can't open pipe: $!"); + } + + my $ex; + + # Fork child + $self->handle_sigchld(); + defined(my $pid = fork()) or die("Can't fork: $!"); + if ($pid) { + eval { + my $client = ProFTPD::TestSuite::FTP->new('127.0.0.1', $port); + + $client->login($user, $passwd); + + my $conn = $client->retr_raw($config_file); + unless ($conn) { + die("RETR failed: " . $client->response_code() . " " . + $client->response_msg()); + } + + # Wait for one second more than the stalled period + sleep($timeout_stalled + 1); + + my $buf; + $conn->read($buf, 8192, 30); + $conn->close(); + + eval { $client->noop() }; + unless ($@) { + die("NOOP succeeded unexpectedly"); + } + + my $resp_code = $client->response_code(); + my $resp_msg = $client->response_msg(); + + my $expected; + + # Perl's Net::Cmd module uses a very non-standard 599 code to + # indicate that the connection is closed + $expected = 599; + $self->assert($expected == $resp_code, + test_msg("Expected $expected, got $resp_code")); + + $expected = "Connection closed"; + $self->assert($expected eq $resp_msg, + test_msg("Expected '$expected', got '$resp_msg'")); + }; + + if ($@) { + $ex = $@; + } + + $wfh->print("done\n"); + $wfh->flush(); + + } else { + eval { server_wait($config_file, $rfh) }; + if ($@) { + warn($@); + exit 1; + } + + exit 0; + } + + # Stop server + server_stop($pid_file); + + $self->assert_child_ok($pid); + + if ($ex) { + die($ex); + } + + unlink($log_file); +} + +sub timeoutstalled_exceeded_stor { + my $self = shift; + my $tmpdir = $self->{tmpdir}; + + my $config_file = "$tmpdir/config.conf"; + my $pid_file = File::Spec->rel2abs("$tmpdir/config.pid"); + my $scoreboard_file = File::Spec->rel2abs("$tmpdir/config.scoreboard"); + + my $log_file = File::Spec->rel2abs('tests.log'); + + my $auth_user_file = File::Spec->rel2abs("$tmpdir/config.passwd"); + my $auth_group_file = File::Spec->rel2abs("$tmpdir/config.group"); + + my $user = 'proftpd'; + my $passwd = 'test'; + my $group = 'ftpd'; + my $home_dir = File::Spec->rel2abs($tmpdir); + my $uid = 500; + my $gid = 500; + + # Make sure that, if we're running as root, that the home directory has + # permissions/privs set for the account we create + if ($< == 0) { + unless (chmod(0755, $home_dir)) { + die("Can't set perms on $home_dir to 0755: $!"); + } + + unless (chown($uid, $gid, $home_dir)) { + die("Can't set owner of $home_dir to $uid/$gid: $!"); + } + } + + auth_user_write($auth_user_file, $user, $passwd, $uid, $gid, $home_dir, + '/bin/bash'); + auth_group_write($auth_group_file, $group, $gid, $user); + + my $timeout_stalled = 1; + + my $config = { + PidFile => $pid_file, + ScoreboardFile => $scoreboard_file, + SystemLog => $log_file, + + AuthUserFile => $auth_user_file, + AuthGroupFile => $auth_group_file, + + TimeoutStalled => $timeout_stalled, + + IfModules => { + 'mod_delay.c' => { + DelayEngine => 'off', + }, + }, + }; + + my ($port, $config_user, $config_group) = config_write($config_file, $config); + + # Open pipes, for use between the parent and child processes. Specifically, + # the child will indicate when it's done with its test by writing a message + # to the parent. + my ($rfh, $wfh); + unless (pipe($rfh, $wfh)) { + die("Can't open pipe: $!"); + } + + my $ex; + + # Fork child + $self->handle_sigchld(); + defined(my $pid = fork()) or die("Can't fork: $!"); + if ($pid) { + eval { + my $client = ProFTPD::TestSuite::FTP->new('127.0.0.1', $port); + + $client->login($user, $passwd); + + my $conn = $client->stor_raw('foo.bar.baz'); + unless ($conn) { + die("STOR failed: " . $client->response_code() . " " . + $client->response_msg()); + } + + # Wait for one second more than the stalled period + sleep($timeout_stalled + 1); + + my $buf; + $conn->read($buf, 8192, 30); + $conn->close(); + + eval { $client->noop() }; + unless ($@) { + die("NOOP succeeded unexpectedly"); + } + + my $resp_code = $client->response_code(); + my $resp_msg = $client->response_msg(); + + my $expected; + + # Perl's Net::Cmd module uses a very non-standard 599 code to + # indicate that the connection is closed + $expected = 599; + $self->assert($expected == $resp_code, + test_msg("Expected $expected, got $resp_code")); + + $expected = "Connection closed"; + $self->assert($expected eq $resp_msg, + test_msg("Expected '$expected', got '$resp_msg'")); + }; + + if ($@) { + $ex = $@; + } + + $wfh->print("done\n"); + $wfh->flush(); + + } else { + eval { server_wait($config_file, $rfh) }; + if ($@) { + warn($@); + exit 1; + } + + exit 0; + } + + # Stop server + server_stop($pid_file); + + $self->assert_child_ok($pid); + + if ($ex) { + die($ex); + } + + unlink($log_file); +} + +sub timeoutstalled_exceeded_retr_usesendfile_on { + my $self = shift; + my $tmpdir = $self->{tmpdir}; + + my $config_file = "$tmpdir/config.conf"; + my $pid_file = File::Spec->rel2abs("$tmpdir/config.pid"); + my $scoreboard_file = File::Spec->rel2abs("$tmpdir/config.scoreboard"); + + my $log_file = File::Spec->rel2abs('tests.log'); + + my $auth_user_file = File::Spec->rel2abs("$tmpdir/config.passwd"); + my $auth_group_file = File::Spec->rel2abs("$tmpdir/config.group"); + + my $user = 'proftpd'; + my $passwd = 'test'; + my $group = 'ftpd'; + my $home_dir = File::Spec->rel2abs($tmpdir); + my $uid = 500; + my $gid = 500; + + # Make sure that, if we're running as root, that the home directory has + # permissions/privs set for the account we create + if ($< == 0) { + unless (chmod(0755, $home_dir)) { + die("Can't set perms on $home_dir to 0755: $!"); + } + + unless (chown($uid, $gid, $home_dir)) { + die("Can't set owner of $home_dir to $uid/$gid: $!"); + } + } + + auth_user_write($auth_user_file, $user, $passwd, $uid, $gid, $home_dir, + '/bin/bash'); + auth_group_write($auth_group_file, $group, $gid, $user); + + my $timeout_stalled = 1; + + my $config = { + PidFile => $pid_file, + ScoreboardFile => $scoreboard_file, + SystemLog => $log_file, + + AuthUserFile => $auth_user_file, + AuthGroupFile => $auth_group_file, + + TimeoutStalled => $timeout_stalled, + UseSendfile => 'on', + + IfModules => { + 'mod_delay.c' => { + DelayEngine => 'off', + }, + }, + }; + + my ($port, $config_user, $config_group) = config_write($config_file, $config); + + # Open pipes, for use between the parent and child processes. Specifically, + # the child will indicate when it's done with its test by writing a message + # to the parent. + my ($rfh, $wfh); + unless (pipe($rfh, $wfh)) { + die("Can't open pipe: $!"); + } + + my $ex; + + # Fork child + $self->handle_sigchld(); + defined(my $pid = fork()) or die("Can't fork: $!"); + if ($pid) { + eval { + my $client = ProFTPD::TestSuite::FTP->new('127.0.0.1', $port); + + $client->login($user, $passwd); + + my $conn = $client->retr_raw($config_file); + unless ($conn) { + die("RETR failed: " . $client->response_code() . " " . + $client->response_msg()); + } + + # Wait for one second more than the stalled period + sleep($timeout_stalled + 1); + + my $buf; + $conn->read($buf, 8192, 30); + $conn->close(); + + eval { $client->noop() }; + unless ($@) { + die("NOOP succeeded unexpectedly"); + } + + my $resp_code = $client->response_code(); + my $resp_msg = $client->response_msg(); + + my $expected; + + # Perl's Net::Cmd module uses a very non-standard 599 code to + # indicate that the connection is closed + $expected = 599; + $self->assert($expected == $resp_code, + test_msg("Expected $expected, got $resp_code")); + + $expected = "Connection closed"; + $self->assert($expected eq $resp_msg, + test_msg("Expected '$expected', got '$resp_msg'")); + }; + + if ($@) { + $ex = $@; + } + + $wfh->print("done\n"); + $wfh->flush(); + + } else { + eval { server_wait($config_file, $rfh) }; + if ($@) { + warn($@); + exit 1; + } + + exit 0; + } + + # Stop server + server_stop($pid_file); + + $self->assert_child_ok($pid); + + if ($ex) { + die($ex); + } + + unlink($log_file); +} + 1;