X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAuth.pm;h=3ef2660656e758c3dcdc67df10b96b7ada8ec64b;hb=feacad49259a8288edefa4c771fc028dd6380ca0;hp=7df576b1fc5e467eb4e09eb272647ac8bd9263a4;hpb=6bce748cc1d86df064d7a7677d9985c50bf2921b;p=kivitendo-erp.git diff --git a/SL/Auth.pm b/SL/Auth.pm index 7df576b1f..3ef266065 100644 --- a/SL/Auth.pm +++ b/SL/Auth.pm @@ -23,6 +23,9 @@ use SL::DBUtils; 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(); @@ -118,19 +121,19 @@ sub _read_auth_config { if (!$self->{authenticator}) { my $locale = Locale->new('en'); - $self->mini_error($locale->text('No or an unknown authenticantion module specified in "config/lx_office.conf".')); + $self->mini_error($locale->text('No or an unknown authenticantion module specified in "config/kivitendo.conf".')); } my $cfg = $self->{DB_config}; if (!$cfg) { my $locale = Locale->new('en'); - $self->mini_error($locale->text('config/lx_office.conf: Key "DB_config" is missing.')); + $self->mini_error($locale->text('config/kivitendo.conf: Key "DB_config" is missing.')); } if (!$cfg->{host} || !$cfg->{db} || !$cfg->{user}) { my $locale = Locale->new('en'); - $self->mini_error($locale->text('config/lx_office.conf: Missing parameters in "authentication/database". Required parameters are "host", "db" and "user".')); + $self->mini_error($locale->text('config/kivitendo.conf: Missing parameters in "authentication/database". Required parameters are "host", "db" and "user".')); } $self->{authenticator}->verify_config(); @@ -146,14 +149,25 @@ sub authenticate_root { 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 { @@ -161,31 +175,27 @@ 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 { + my $failed_login_penalty = ($::lx_office_conf{authentication} || {})->{failed_login_penalty}; + sleep $failed_login_penalty if $failed_login_penalty; } sub get_stored_password { @@ -320,7 +330,7 @@ sub create_database { my ($cluster_encoding) = $dbh->selectrow_array($query); if ($cluster_encoding && ($cluster_encoding =~ m/^(?:UTF-?8|UNICODE)$/i) && ($encoding !~ m/^(?:UTF-?8|UNICODE)$/i)) { - $error = $main::locale->text('Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.'); + $error = $main::locale->text('Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure kivitendo to use UTF-8 as well.'); } $dbh->disconnect(); @@ -404,11 +414,6 @@ sub change_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; @@ -420,15 +425,30 @@ sub read_all_users { 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')); } @@ -469,8 +489,15 @@ sub read_user { @user_data{qw(id login)} = @{$ref}{qw(id login)}; } - # The XUL/XML backed menu has been removed. - $user_data{menustyle} = 'v3' if lc($user_data{menustyle} || '') eq 'xml'; + # The XUL/XML & 'CSS new' backed menus have been removed. + my %menustyle_map = ( xml => 'new', v4 => 'v3' ); + $user_data{menustyle} = $menustyle_map{lc($user_data{menustyle} || '')} || $user_data{menustyle}; + + # The 'Win2000.css' stylesheet has been removed. + $user_data{stylesheet} = 'kivitendo.css' if ($user_data{stylesheet} || '') =~ m/win2000/i; + + # Set default language if selected language does not exist (anymore). + $user_data{countrycode} = $::lx_office_conf{system}->{language} unless $user_data{countrycode} && -d "locale/$user_data{countrycode}"; $sth->finish(); @@ -565,7 +592,17 @@ sub restore_session { $cookie = $sth->fetchrow_hashref; $sth->finish; - if (!$cookie || $cookie->{is_expired} || ($cookie->{ip_address} ne $ENV{REMOTE_ADDR})) { + # The session ID provided is valid in the following cases: + # 1. session ID exists in the database + # 2. hasn't expired yet + # 3. if form field '{AUTH}api_token' is given: form field must equal database column 'auth.session.api_token' for the session ID + # 4. if form field '{AUTH}api_token' is NOT given then: the requestee's IP address must match the stored IP address + $self->{api_token} = $cookie->{api_token} if $cookie; + my $api_token_cookie = $self->get_api_token_cookie; + my $cookie_is_bad = !$cookie || $cookie->{is_expired}; + $cookie_is_bad ||= $api_token_cookie && ($api_token_cookie ne $cookie->{api_token}) if $api_token_cookie; + $cookie_is_bad ||= $cookie->{ip_address} ne $ENV{REMOTE_ADDR} if !$api_token_cookie; + if ($cookie_is_bad) { $self->destroy_session(); $main::lxdebug->leave_sub(); return $cookie ? SESSION_EXPIRED : SESSION_NONE; @@ -676,6 +713,17 @@ sub destroy_session { $main::lxdebug->leave_sub(); } +sub active_session_ids { + my $self = shift; + my $dbh = $self->dbconnect; + + my $query = qq|SELECT id FROM auth.session|; + + my @ids = selectall_array_query($::form, $dbh, $query); + + return @ids; +} + sub expire_sessions { $main::lxdebug->enter_sub(); @@ -764,6 +812,11 @@ sub save_session { do_query($::form, $dbh, qq|INSERT INTO auth.session (id, ip_address, mtime) VALUES (?, ?, now())|, $session_id, $ENV{REMOTE_ADDR}); } + if ($self->{column_information}->has('api_token', 'session')) { + my ($stored_api_token) = $dbh->selectrow_array(qq|SELECT api_token FROM auth.session WHERE id = ?|, undef, $session_id); + do_query($::form, $dbh, qq|UPDATE auth.session SET api_token = ? WHERE id = ?|, $self->_create_session_id, $session_id) unless $stored_api_token; + } + my @values_to_save = grep { $_->{fetched} } values %{ $self->{SESSION} }; if (@values_to_save) { @@ -900,15 +953,25 @@ sub set_cookie_environment_variable { } sub get_session_cookie_name { - my $self = shift; + my ($self, %params) = @_; + + $params{type} ||= 'id'; + my $name = $self->{cookie_name} || 'lx_office_erp_session_id'; + $name .= '_api_token' if $params{type} eq 'api_token'; - return $self->{cookie_name} || 'lx_office_erp_session_id'; + return $name; } sub get_session_id { return $session_id; } +sub get_api_token_cookie { + my ($self) = @_; + + $::request->{cgi}->cookie($self->get_session_cookie_name(type => 'api_token')); +} + sub session_tables_present { $main::lxdebug->enter_sub(); @@ -995,7 +1058,7 @@ sub all_rights_full { ["batch_printing", $locale->text("Batch Printing")], ["--others", $locale->text("Others")], ["email_bcc", $locale->text("May set the BCC field when sending emails")], - ["config", $locale->text("Change Lx-Office installation settings (all menu entries beneath 'System')")], + ["config", $locale->text("Change kivitendo installation settings (all menu entries beneath 'System')")], ["admin", $locale->text("Administration (Used to access instance administration from user logins)")], );