Das Admin-Passwort nicht im Klartext in Session-Tabelle ablegen

diff --git a/SL/Auth.pm b/SL/Auth.pm
index 3ff6a1c3b8bf93493ddda1cce8a2d127af536996..5f3c65dd8abdc2b4e913520420935b3b89e5a611 100644 (file)
--- a/SL/Auth.pm
+++ b/SL/Auth.pm
@@ -137,12 +137,10 @@ sub _read_auth_config {
 sub authenticate_root {
   $main::lxdebug->enter_sub();
 
 sub authenticate_root {
   $main::lxdebug->enter_sub();
 

-  my $self           = shift;
-  my $password       = shift;
-  my $is_crypted     = shift;
+  my ($self, $password) = @_;

 
 

-  $password          = crypt $password, 'ro' if (!$password || !$is_crypted);
-  my $admin_password = crypt "$self->{admin_password}", 'ro';
+  $password             = SL::Auth::Password->hash_if_unhashed(login => 'root', password => $password);
+  my $admin_password    = SL::Auth::Password->hash_if_unhashed(login => 'root', password => $self->{admin_password});

 
   $main::lxdebug->leave_sub();
 
 
   $main::lxdebug->leave_sub();
 


@@ -173,6 +171,15 @@ sub store_credentials_in_session {
   $self->set_session_value(login => $params{login}, password => $params{password});
 }
 
   $self->set_session_value(login => $params{login}, password => $params{password});
 }
 

+sub store_root_credentials_in_session {
+  my ($self, $rpw) = @_;
+
+  $rpw = SL::Auth::Password->hash_if_unhashed(login => 'root', password => $rpw)
+    unless $self->{authenticator}->requires_cleartext_password;
+
+  $self->set_session_value(rpw => $rpw);
+}
+

 sub dbconnect {
   $main::lxdebug->enter_sub(2);
 
 sub dbconnect {
   $main::lxdebug->enter_sub(2);
 

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index efd16fecf068f804e3046fe354b10468ff7aeddf..4be5e330fd6395cb0e3bf10fd834de0b48dae352 100755 (executable)
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -73,7 +73,7 @@ sub run {
   $locale = $::locale;
   $auth   = $::auth;
 
   $locale = $::locale;
   $auth   = $::auth;
 

-  $::auth->set_session_value('rpw', $::form->{rpw}) if $session_result == SL::Auth->SESSION_OK;
+  $::auth->store_root_credentials_in_session($form->{rpw}) if $session_result == SL::Auth->SESSION_OK;

 
   $form->{stylesheet} = "lx-office-erp.css";
   $form->{favicon}    = "favicon.ico";
 
   $form->{stylesheet} = "lx-office-erp.css";
   $form->{favicon}    = "favicon.ico";


@@ -81,11 +81,12 @@ sub run {
   if ($form->{action}) {
     if ($auth->authenticate_root($form->{rpw}) != $auth->OK()) {
       $form->{error_message} = $locale->text('Incorrect Password!');
   if ($form->{action}) {
     if ($auth->authenticate_root($form->{rpw}) != $auth->OK()) {
       $form->{error_message} = $locale->text('Incorrect Password!');

+      $auth->delete_session_value('rpw');

       adminlogin();
     } else {
       if ($auth->session_tables_present()) {
       adminlogin();
     } else {
       if ($auth->session_tables_present()) {

-        $::auth->set_session_value('rpw', $::form->{rpw});
-        $::auth->create_or_refresh_session();
+        $::auth->store_root_credentials_in_session($::form->{rpw});
+        delete $::form->{rpw};

         _apply_dbupgrade_scripts();
       }
 
         _apply_dbupgrade_scripts();
       }