use strict;
+use constant SESSION_KEY_ROOT_AUTH => 'session_auth_status_root';
+use constant SESSION_KEY_USER_AUTH => 'session_auth_status_user';
+
sub new {
$main::lxdebug->enter_sub();
my ($self, $password) = @_;
- $password = SL::Auth::Password->hash_if_unhashed(login => 'root', password => $password);
+ my $session_root_auth = $self->get_session_value(SESSION_KEY_ROOT_AUTH());
+ if (defined $session_root_auth && $session_root_auth == OK) {
+ $::lxdebug->leave_sub;
+ return OK;
+ }
+
+ if (!defined $password) {
+ $::lxdebug->leave_sub;
+ return ERR_PASSWORD;
+ }
+
+ $password = SL::Auth::Password->hash(login => 'root', password => $password);
my $admin_password = SL::Auth::Password->hash_if_unhashed(login => 'root', password => $self->{admin_password}->());
- $main::lxdebug->leave_sub();
+ my $result = $password eq $admin_password ? OK : ERR_PASSWORD;
+ $self->set_session_value(SESSION_KEY_ROOT_AUTH() => $result);
- return OK if $password eq $admin_password;
- sleep 5;
- return ERR_PASSWORD;
+ $::lxdebug->leave_sub;
+ return $result;
}
sub authenticate {
my ($self, $login, $password) = @_;
- $main::lxdebug->leave_sub();
-
- my $result = $login ? $self->{authenticator}->authenticate($login, $password) : ERR_USER;
- return OK if $result eq OK;
- sleep 5;
- return $result;
-}
-
-sub store_credentials_in_session {
- my ($self, %params) = @_;
+ my $session_auth = $self->get_session_value(SESSION_KEY_USER_AUTH());
+ if (defined $session_auth && $session_auth == OK) {
+ $::lxdebug->leave_sub;
+ return OK;
+ }
- if (!$self->{authenticator}->requires_cleartext_password) {
- $params{password} = SL::Auth::Password->hash_if_unhashed(login => $params{login},
- password => $params{password},
- look_up_algorithm => 1,
- auth => $self);
+ if (!defined $password) {
+ $::lxdebug->leave_sub;
+ return ERR_PASSWORD;
}
- $self->set_session_value(login => $params{login}, password => $params{password});
-}
+ my $result = $login ? $self->{authenticator}->authenticate($login, $password) : ERR_USER;
+ $self->set_session_value(SESSION_KEY_USER_AUTH() => $result, login => $login);
-sub store_root_credentials_in_session {
- my ($self, $rpw) = @_;
+ $::lxdebug->leave_sub;
+ return $result;
+}
- $self->set_session_value(rpw => SL::Auth::Password->hash_if_unhashed(login => 'root', password => $rpw));
+sub punish_wrong_login {
+ sleep 5;
}
sub get_stored_password {
my $result = $self->{authenticator}->change_password($login, $new_password);
- $self->store_credentials_in_session(login => $login,
- password => $new_password,
- look_up_algorithm => 1,
- auth => $self);
-
$main::lxdebug->leave_sub();
return $result;
my $self = shift;
my $dbh = $self->dbconnect();
- my $query = qq|SELECT u.id, u.login, cfg.cfg_key, cfg.cfg_value
- FROM auth.user_config cfg
- LEFT JOIN auth."user" u ON (cfg.user_id = u.id)|;
+ my $query = qq|SELECT u.id, u.login, cfg.cfg_key, cfg.cfg_value, s.mtime AS last_action
+
+ FROM auth."user" AS u
+
+ LEFT JOIN auth.user_config AS cfg
+ ON (cfg.user_id = u.id)
+
+ LEFT JOIN auth.session_content AS sc_login
+ ON (sc_login.sess_key = 'login' AND sc_login.sess_value = ('--- ' \|\| u.login \|\| '\n'))
+
+ LEFT JOIN auth.session AS s
+ ON (s.id = sc_login.session_id)
+ |;
my $sth = prepare_execute_query($main::form, $dbh, $query);
my %users;
while (my $ref = $sth->fetchrow_hashref()) {
- $users{$ref->{login}} ||= { 'login' => $ref->{login}, 'id' => $ref->{id} };
+
+ $users{$ref->{login}} ||= {
+ 'login' => $ref->{login},
+ 'id' => $ref->{id},
+ 'last_action' => $ref->{last_action},
+ };
$users{$ref->{login}}->{$ref->{cfg_key}} = $ref->{cfg_value} if (($ref->{cfg_key} ne 'login') && ($ref->{cfg_key} ne 'id'));
}