|
From: Rob H. <for...@us...> - 2003-07-08 22:07:54
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory sc8-pr-cvs1:/tmp/cvs-serv30111/lib/SandWeb
Modified Files:
Auth.pm
Log Message:
* hackishly implemented Unix auth, identified what needs to be changed to make it cleaner
* must've forgot to checkin batch_download, here it is
Index: Auth.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Auth.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -U2 -r1.24 -r1.25
--- Auth.pm 6 Jan 2003 09:41:09 -0000 1.24
+++ Auth.pm 8 Jul 2003 22:07:51 -0000 1.25
@@ -35,4 +35,5 @@
use SandWeb::Auth::FlatFile;
+use SandWeb::Auth::Unix;
=head1
@@ -48,4 +49,5 @@
'log_obj' => $log,
'data_dir' => $config->{'paths'}->{'data_dir'},
+ 'users_dir' => $config->{'paths'}->{'users_dir'},
'cookie_path' => $config->{'cookie'}->{'path'},
'cookie_domain' => $config->{'cookie'}->{'domain'},
@@ -105,4 +107,5 @@
'_log_obj' => $args{'log_obj'},
'_data_dir' => $args{'data_dir'},
+ '_users_dir' => $args{'users_dir'},
'_cookie_path' => $args{'cookie_path'},
'_cookie_domain' => $args{'cookie_domain'},
@@ -167,14 +170,21 @@
my $username = $args{'username'};
my $password = $args{'password'};
- my $salt = $args{'salt'};
+ #my $salt = $args{'salt'};
my $log = $self->_logobj();
$log->debug("username: $username, password: $password\n");
- my $flatfile = SandWeb::Auth::FlatFile::->new(
+ #my $auth = SandWeb::Auth::FlatFile::->new(
+ # 'log_obj' => $log,
+ #);
+ my $auth = SandWeb::Auth::Unix::->new(
'log_obj' => $log,
);
- my $verified = $flatfile->verify_password($username, $password, $self->_get_data_dir(), $salt);
+ my $verified = $auth->verify_password(
+ $username,
+ $password,
+ $self->_get_users_dir(),
+ );
if ($verified) {
@@ -457,4 +467,8 @@
my $self = shift;
return $self->{'_data_dir'};
+}
+sub _get_users_dir {
+ my $self = shift;
+ return $self->{'_users_dir'};
}
sub _logobj {
|