[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/Modules
From: "TJ Saunders" <castaglia () users ! sourceforge ! net>
Date: 2009-09-30 20:51:47
Message-ID: E1Mt69L-0004yk-Fe () ddv4jf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Update of /cvsroot/proftp/proftpd/tests/t/lib/ProFTPD/Tests/Modules
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19078/tests/t/lib/ProFTPD/Tests/Modules
Modified Files:
mod_sql_passwd.pm
Log Message:
Add a SQLPasswordSaltFile directive to the new mod_sql_passwd module; it
is used to configure salts for the hashed passwords that mod_sql_passwd
handles. Doc update coming next.
Index: mod_sql_passwd.pm
===================================================================
RCS file: /cvsroot/proftp/proftpd/tests/t/lib/ProFTPD/Tests/Modules/mod_sql_passwd.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_sql_passwd.pm 9 Sep 2009 18:22:02 -0000 1.1
+++ mod_sql_passwd.pm 30 Sep 2009 20:51:45 -0000 1.2
@@ -51,6 +51,16 @@
test_class => [qw(forking)],
},
+ sql_passwd_salt_file => {
+ order => ++$order,
+ test_class => [qw(forking)],
+ },
+
+ sql_passwd_salt_file_trailing_newline => {
+ order => ++$order,
+ test_class => [qw(forking)],
+ },
+
};
sub new {
@@ -1187,4 +1197,353 @@
unlink($log_file);
}
+sub sql_passwd_salt_file {
+ my $self = shift;
+ my $tmpdir = $self->{tmpdir};
+
+ my $config_file = "$tmpdir/sqlpasswd.conf";
+ my $pid_file = File::Spec->rel2abs("$tmpdir/sqlpasswd.pid");
+ my $scoreboard_file = File::Spec->rel2abs("$tmpdir/sqlpasswd.scoreboard");
+
+ my $log_file = File::Spec->rel2abs('tests.log');
+
+ my $salt = '8Hkqr7bnPaZ52j81VvuoWdOEuq6EeXwpiIw5Q679xzvEqwe128';
+
+ my $user = 'proftpd';
+
+ # I used:
+ #
+ # Digest::SHA1::sha1_hex((lc("password")) . $salt);
+ #
+ # to generate this password.
+ my $passwd = '975838a6aebc87d384535df6f7226274813353aa';
+
+ my $home_dir = File::Spec->rel2abs($tmpdir);
+ my $uid = 500;
+ my $gid = 500;
+
+ my $db_file = File::Spec->rel2abs("$tmpdir/proftpd.db");
+
+ # Build up sqlite3 command to create users, groups tables and populate them
+ my $db_script = File::Spec->rel2abs("$tmpdir/proftpd.sql");
+
+ if (open(my $fh, "> $db_script")) {
+ print $fh <<EOS;
+CREATE TABLE users (
+ userid TEXT,
+ passwd TEXT,
+ uid INTEGER,
+ gid INTEGER,
+ homedir TEXT,
+ shell TEXT,
+ lastdir TEXT
+);
+INSERT INTO users (userid, passwd, uid, gid, homedir, shell) VALUES ('$user', \
'$passwd', 500, 500, '$home_dir', '/bin/bash'); +
+CREATE TABLE groups (
+ groupname TEXT,
+ gid INTEGER,
+ members TEXT
+);
+INSERT INTO groups (groupname, gid, members) VALUES ('ftpd', 500, '$user');
+EOS
+
+ unless (close($fh)) {
+ die("Can't write $db_script: $!");
+ }
+
+ } else {
+ die("Can't open $db_script: $!");
+ }
+
+ my $cmd = "sqlite3 $db_file < $db_script";
+
+ if ($ENV{TEST_VERBOSE}) {
+ print STDERR "Executing sqlite3: $cmd\n";
+ }
+
+ my @output = `$cmd`;
+ if (scalar(@output) &&
+ $ENV{TEST_VERBOSE}) {
+ print STDERR "Output: ", join('', @output), "\n";
+ }
+
+ my $salt_file = File::Spec->rel2abs("$home_dir/sqlpasswd.salt");
+ if (open(my $fh, "> $salt_file")) {
+ binmode($fh);
+ print $fh $salt;
+
+ unless (close($fh)) {
+ die("Can't write $salt_file: $!");
+ }
+
+ } else {
+ die("Can't open $salt_file: $!");
+ }
+
+ my $config = {
+ PidFile => $pid_file,
+ ScoreboardFile => $scoreboard_file,
+ SystemLog => $log_file,
+
+ IfModules => {
+ 'mod_delay.c' => {
+ DelayEngine => 'off',
+ },
+
+ 'mod_sql.c' => {
+ SQLAuthTypes => 'sha1',
+ SQLBackend => 'sqlite3',
+ SQLConnectInfo => $db_file,
+ SQLLogFile => $log_file,
+ },
+
+ 'mod_sql_passwd.c' => {
+ SQLPasswordEngine => 'on',
+ SQLPasswordEncoding => 'hex',
+ SQLPasswordSaltFile => $salt_file,
+ },
+ },
+ };
+
+ 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, "password");
+
+ my $resp_msgs = $client->response_msgs();
+ my $nmsgs = scalar(@$resp_msgs);
+
+ my $expected;
+
+ $expected = 1;
+ $self->assert($expected == $nmsgs,
+ test_msg("Expected $expected, got $nmsgs"));
+
+ $expected = "User proftpd logged in";
+ $self->assert($expected eq $resp_msgs->[0],
+ test_msg("Expected '$expected', got '$resp_msgs->[0]'"));
+
+ };
+
+ 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 sql_passwd_salt_file_trailing_newline {
+ my $self = shift;
+ my $tmpdir = $self->{tmpdir};
+
+ my $config_file = "$tmpdir/sqlpasswd.conf";
+ my $pid_file = File::Spec->rel2abs("$tmpdir/sqlpasswd.pid");
+ my $scoreboard_file = File::Spec->rel2abs("$tmpdir/sqlpasswd.scoreboard");
+
+ my $log_file = File::Spec->rel2abs('tests.log');
+
+ my $salt = '8Hkqr7bnPaZ52j81VvuoWdOEuq6EeXwpiIw5Q679xzvEqwe128';
+
+ my $user = 'proftpd';
+
+ # I used:
+ #
+ # Digest::SHA1::sha1_hex((lc("password")) . $salt);
+ #
+ # to generate this password.
+ my $passwd = '975838a6aebc87d384535df6f7226274813353aa';
+
+ my $home_dir = File::Spec->rel2abs($tmpdir);
+ my $uid = 500;
+ my $gid = 500;
+
+ my $db_file = File::Spec->rel2abs("$tmpdir/proftpd.db");
+
+ # Build up sqlite3 command to create users, groups tables and populate them
+ my $db_script = File::Spec->rel2abs("$tmpdir/proftpd.sql");
+
+ if (open(my $fh, "> $db_script")) {
+ print $fh <<EOS;
+CREATE TABLE users (
+ userid TEXT,
+ passwd TEXT,
+ uid INTEGER,
+ gid INTEGER,
+ homedir TEXT,
+ shell TEXT,
+ lastdir TEXT
+);
+INSERT INTO users (userid, passwd, uid, gid, homedir, shell) VALUES ('$user', \
'$passwd', 500, 500, '$home_dir', '/bin/bash'); +
+CREATE TABLE groups (
+ groupname TEXT,
+ gid INTEGER,
+ members TEXT
+);
+INSERT INTO groups (groupname, gid, members) VALUES ('ftpd', 500, '$user');
+EOS
+
+ unless (close($fh)) {
+ die("Can't write $db_script: $!");
+ }
+
+ } else {
+ die("Can't open $db_script: $!");
+ }
+
+ my $cmd = "sqlite3 $db_file < $db_script";
+
+ if ($ENV{TEST_VERBOSE}) {
+ print STDERR "Executing sqlite3: $cmd\n";
+ }
+
+ my @output = `$cmd`;
+ if (scalar(@output) &&
+ $ENV{TEST_VERBOSE}) {
+ print STDERR "Output: ", join('', @output), "\n";
+ }
+
+ my $salt_file = File::Spec->rel2abs("$home_dir/sqlpasswd.salt");
+ if (open(my $fh, "> $salt_file")) {
+ binmode($fh);
+
+ # In this case, we deliberately write a trailing newline with the salt,
+ # to make sure that mod_sql_passwd handles it.
+ print $fh "$salt\n";
+
+ unless (close($fh)) {
+ die("Can't write $salt_file: $!");
+ }
+
+ } else {
+ die("Can't open $salt_file: $!");
+ }
+
+ my $config = {
+ PidFile => $pid_file,
+ ScoreboardFile => $scoreboard_file,
+ SystemLog => $log_file,
+
+ IfModules => {
+ 'mod_delay.c' => {
+ DelayEngine => 'off',
+ },
+
+ 'mod_sql.c' => {
+ SQLAuthTypes => 'sha1',
+ SQLBackend => 'sqlite3',
+ SQLConnectInfo => $db_file,
+ SQLLogFile => $log_file,
+ },
+
+ 'mod_sql_passwd.c' => {
+ SQLPasswordEngine => 'on',
+ SQLPasswordEncoding => 'hex',
+ SQLPasswordSaltFile => $salt_file,
+ },
+ },
+ };
+
+ 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, "password");
+
+ my $resp_msgs = $client->response_msgs();
+ my $nmsgs = scalar(@$resp_msgs);
+
+ my $expected;
+
+ $expected = 1;
+ $self->assert($expected == $nmsgs,
+ test_msg("Expected $expected, got $nmsgs"));
+
+ $expected = "User proftpd logged in";
+ $self->assert($expected eq $resp_msgs->[0],
+ test_msg("Expected '$expected', got '$resp_msgs->[0]'"));
+
+ };
+
+ 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;
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
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