[prev in list] [next in list] [prev in thread] [next in thread]
List: proftpd-committers
Subject: [ProFTPD-committers] CVS: proftpd/tests/t/lib/ProFTPD/Tests/Config
From: "TJ Saunders" <castaglia () users ! sourceforge ! net>
Date: 2010-08-27 20:39:52
Message-ID: E1Op5iK-0001au-Us () sfp-cvsdas-2 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Update of /cvsroot/proftp/proftpd/tests/t/lib/ProFTPD/Tests/Config
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv6110/t/lib/ProFTPD/Tests/Config
Modified Files:
AuthAliasOnly.pm
Log Message:
Regression/reproduction tests for Bug#3501.
Index: AuthAliasOnly.pm
===================================================================
RCS file: /cvsroot/proftp/proftpd/tests/t/lib/ProFTPD/Tests/Config/AuthAliasOnly.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AuthAliasOnly.pm 19 Jul 2009 23:35:12 -0000 1.1
+++ AuthAliasOnly.pm 27 Aug 2010 20:39:50 -0000 1.2
@@ -26,6 +26,16 @@
test_class => [qw(bug forking rootprivs)],
},
+ authaliasonly_on_anon_bug3501 => {
+ order => ++$order,
+ test_class => [qw(bug forking rootprivs)],
+ },
+
+ authaliasonly_on_system_bug3501 => {
+ order => ++$order,
+ test_class => [qw(bug forking rootprivs)],
+ },
+
};
sub new {
@@ -298,4 +308,270 @@
unlink($log_file);
}
+sub authaliasonly_on_anon_bug3501 {
+ 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 $test_file = File::Spec->rel2abs($config_file);
+
+ my $user = 'proftpd';
+ my $passwd = 'test';
+ 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, 'ftpd', $gid, $user);
+
+ my ($config_user, $config_group) = config_get_identity();
+
+ my $config = {
+ PidFile => $pid_file,
+ ScoreboardFile => $scoreboard_file,
+ SystemLog => $log_file,
+ User => $config_user,
+ Group => $config_group,
+
+ AuthUserFile => $auth_user_file,
+ AuthGroupFile => $auth_group_file,
+
+ Anonymous => {
+ $home_dir => {
+ User => $config_user,
+ Group => $config_group,
+ RequireValidShell => 'off',
+ UserAlias => "anonymous $config_user",
+ AuthAliasOnly => 'on',
+ },
+ },
+
+ IfModules => {
+ 'mod_delay.c' => {
+ DelayEngine => 'off',
+ },
+ },
+ };
+
+ my $port;
+ ($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);
+
+ my ($resp_code, $resp_msg) = $client->user($config_user);
+
+ my $expected;
+
+ $expected = 331;
+ $self->assert($expected == $resp_code,
+ test_msg("Expected $expected, got $resp_code"));
+
+ $expected = "Password required for $config_user";
+ $self->assert($expected eq $resp_msg,
+ test_msg("Expected '$expected', got '$resp_msg'"));
+
+ $client->quit();
+ };
+
+ 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 authaliasonly_on_system_bug3501 {
+ 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 $test_file = File::Spec->rel2abs($config_file);
+
+ my $user = 'proftpd';
+ my $passwd = 'test';
+ 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, 'ftpd', $gid, $user);
+
+ my ($config_user, $config_group) = config_get_identity();
+
+ my $config = {
+ PidFile => $pid_file,
+ ScoreboardFile => $scoreboard_file,
+ SystemLog => $log_file,
+ User => $config_user,
+ Group => $config_group,
+ DefaultServer => 'on',
+ RequireValidShell => 'on',
+
+ AuthUserFile => $auth_user_file,
+ AuthGroupFile => $auth_group_file,
+
+ Anonymous => {
+ $home_dir => {
+ User => $config_user,
+ Group => $config_group,
+ RequireValidShell => 'on',
+ UserAlias => "anonymous $config_user",
+ AuthAliasOnly => 'on',
+
+ Limit => {
+ WRITE => {
+ DenyAll => '',
+ },
+ },
+ },
+ },
+
+ IfModules => {
+ 'mod_delay.c' => {
+ DelayEngine => 'off',
+ },
+ },
+ };
+
+ my $port;
+ ($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);
+
+ my ($resp_code, $resp_msg) = $client->user($user);
+
+ my $expected;
+
+ $expected = 331;
+ $self->assert($expected == $resp_code,
+ test_msg("Expected $expected, got $resp_code"));
+
+ $expected = "Password required for $user";
+ $self->assert($expected eq $resp_msg,
+ test_msg("Expected '$expected', got '$resp_msg'"));
+
+ $client->quit();
+ };
+
+ 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;
------------------------------------------------------------------------------
Sell apps to millions through the Intel(R) Atom(Tm) Developer Program
Be part of this innovative community and reach millions of netbook users
worldwide. Take advantage of special opportunities to increase revenue and
speed time-to-market. Join now, and jumpstart your future.
http://p.sf.net/sfu/intel-atom-d2d
_______________________________________________
ProFTPD Committers Mailing List
proftpd-committers@proftpd.org
https://lists.sourceforge.net/lists/listinfo/proftp-committers
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic