Formularfelder und Session-Keys für Logins umbenannt

[mfinanz.git] / SL / Dispatcher.pm

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 9c9e60566c6a7f10cdfcacb977343dade7a63ed3..747da04854ede10bf7998bafb00b49fc14e76550 100644 (file)
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -12,26 +12,33 @@ use Config::Std;
 use DateTime;
 use Encode;
 use English qw(-no_match_vars);
 use DateTime;
 use Encode;
 use English qw(-no_match_vars);

+use File::Basename;
+use List::MoreUtils qw(all);
+use List::Util qw(first);
+use POSIX;

 use SL::Auth;
 use SL::Auth;

+use SL::Dispatcher::AuthHandler;

 use SL::LXDebug;
 use SL::LxOfficeConf;
 use SL::Locale;
 use SL::Common;
 use SL::Form;
 use SL::Helper::DateTime;
 use SL::LXDebug;
 use SL::LxOfficeConf;
 use SL::Locale;
 use SL::Common;
 use SL::Form;
 use SL::Helper::DateTime;

+use SL::InstanceConfiguration;

 use SL::Template::Plugin::HTMLFixes;
 use SL::Template::Plugin::HTMLFixes;

-use List::Util qw(first);
-use File::Basename;

 
 # Trailing new line is added so that Perl will not add the line
 # number 'die' was called in.
 use constant END_OF_REQUEST => "END-OF-REQUEST\n";
 
 
 # Trailing new line is added so that Perl will not add the line
 # number 'die' was called in.
 use constant END_OF_REQUEST => "END-OF-REQUEST\n";
 

+my %fcgi_file_cache;
+

 sub new {
   my ($class, $interface) = @_;
 
   my $self           = bless {}, $class;
   $self->{interface} = lc($interface || 'cgi');
 sub new {
   my ($class, $interface) = @_;
 
   my $self           = bless {}, $class;
   $self->{interface} = lc($interface || 'cgi');

+  $self->{auth_handler} = SL::Dispatcher::AuthHandler->new;

 
   return $self;
 }
 
   return $self;
 }


@@ -58,23 +65,24 @@ sub show_error {
   $::lxdebug->enter_sub;
   my $template             = shift;
   my $error_type           = shift || '';
   $::lxdebug->enter_sub;
   my $template             = shift;
   my $error_type           = shift || '';

+  my %params               = @_;

 
   $::locale                = Locale->new($::lx_office_conf{system}->{language});
   $::form->{error}         = $::locale->text('The session is invalid or has expired.') if ($error_type eq 'session');
   $::form->{error}         = $::locale->text('Incorrect password!.')                   if ($error_type eq 'password');
   $::myconfig{countrycode} = $::lx_office_conf{system}->{language};
 
   $::locale                = Locale->new($::lx_office_conf{system}->{language});
   $::form->{error}         = $::locale->text('The session is invalid or has expired.') if ($error_type eq 'session');
   $::form->{error}         = $::locale->text('Incorrect password!.')                   if ($error_type eq 'password');
   $::myconfig{countrycode} = $::lx_office_conf{system}->{language};

-  $::form->{stylesheet}    = 'css/lx-office-erp.css';

 
   $::form->header;
 
   $::form->header;

-  print $::form->parse_html_template($template);
+  print $::form->parse_html_template($template, \%params);

   $::lxdebug->leave_sub;
 
   ::end_of_request();
 }
 
 sub pre_startup_setup {
   $::lxdebug->leave_sub;
 
   ::end_of_request();
 }
 
 sub pre_startup_setup {

+  my ($self) = @_;
+

   SL::LxOfficeConf->read;
   SL::LxOfficeConf->read;

-  _init_environment();

 
   eval {
     package main;
 
   eval {
     package main;


@@ -89,12 +97,14 @@ sub pre_startup_setup {
     $::auth        = SL::Auth->new;
     $::form        = undef;
     %::myconfig    = ();
     $::auth        = SL::Auth->new;
     $::form        = undef;
     %::myconfig    = ();

-    %::called_subs = (); # currently used for recursion detection
+    $::request     = undef;

   }
 
   $SIG{__WARN__} = sub {
     $::lxdebug->warn(@_);
   }
 
   $SIG{__WARN__} = sub {
     $::lxdebug->warn(@_);

-  }
+  };
+
+  $self->_cache_file_modification_times;

 }
 
 sub pre_startup_checks {
 }
 
 sub pre_startup_checks {


@@ -102,8 +112,9 @@ sub pre_startup_checks {
 }
 
 sub pre_startup {
 }
 
 sub pre_startup {

-  pre_startup_setup();
-  pre_startup_checks();
+  my ($self) = @_;
+  $self->pre_startup_setup;
+  $self->pre_startup_checks;

 }
 
 sub require_main_code {
 }
 
 sub require_main_code {


@@ -135,10 +146,11 @@ sub require_main_code {
 sub _require_controller {
   my $controller =  shift;
   $controller    =~ s|[^A-Za-z0-9_]||g;
 sub _require_controller {
   my $controller =  shift;
   $controller    =~ s|[^A-Za-z0-9_]||g;

+  $controller    =  "SL/Controller/${controller}";

 
   eval {
     package main;
 
   eval {
     package main;

-    require "SL/Controller/${controller}.pm";
+    require "${controller}.pm";

   } or die $EVAL_ERROR;
 }
 
   } or die $EVAL_ERROR;
 }
 


@@ -155,21 +167,19 @@ sub handle_request {
 
   my ($script, $path, $suffix, $script_name, $action, $routing_type);
 
 
   my ($script, $path, $suffix, $script_name, $action, $routing_type);
 

-  $script_name = $ENV{SCRIPT_NAME};
-

   $self->unrequire_bin_mozilla;
 
   $self->unrequire_bin_mozilla;
 

-  $::cgi         = CGI->new('');
-  $::locale      = Locale->new($::lx_office_conf{system}->{language});
-  $::form        = Form->new;
-  %::called_subs = ();
+  $::locale        = Locale->new($::lx_office_conf{system}->{language});
+  $::form          = Form->new;
+  $::instance_conf = SL::InstanceConfiguration->new;
+  $::request       = { cgi => CGI->new({}) };

 
   my $session_result = $::auth->restore_session;
   $::auth->create_or_refresh_session;
 
   $::form->read_cgi_input;
 
 
   my $session_result = $::auth->restore_session;
   $::auth->create_or_refresh_session;
 
   $::form->read_cgi_input;
 

-  eval { ($routing_type, $script_name, $action) = _route_request($script_name); 1; } or return;
+  eval { ($routing_type, $script_name, $action) = _route_request($ENV{SCRIPT_NAME}); 1; } or return;

 
   if ($routing_type eq 'old') {
     $::form->{action}  =  lc $::form->{action};
 
   if ($routing_type eq 'old') {
     $::form->{action}  =  lc $::form->{action};


@@ -196,21 +206,20 @@ sub handle_request {
 
     } else {
       show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result;
 
     } else {
       show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result;

-      %::myconfig = $::auth->read_user($::form->{login});

 
 

-      show_error('login/password_error', 'password') unless $::myconfig{login};
+      my $auth_level = $self->{auth_handler}->handle(
+        routing_type => $routing_type,
+        script       => $script,
+        controller   => $script_name,
+        action       => $action,
+      );

 
 

-      $::locale = Locale->new($::myconfig{countrycode});
-
-      show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($::form->{login}, $::form->{password});
-
-      $::auth->store_credentials_in_session(login => $::form->{login}, password => $::form->{password});
-      $::auth->create_or_refresh_session;
-      $::auth->delete_session_value('FLASH');
-      delete $::form->{password};
+      delete @{ $::form }{ grep { m/^\{AUTH\}/ } keys %{ $::form } };

 
       if ($action) {
 
       if ($action) {

-        map { $::form->{$_} = $::myconfig{$_} } qw(stylesheet charset)
+        $::instance_conf->init if $auth_level eq 'user';
+
+        map { $::form->{$_} = $::myconfig{$_} } qw(charset)

           unless $action eq 'save' && $::form->{type} eq 'preferences';
 
         $::form->set_standard_title;
           unless $action eq 'save' && $::form->{type} eq 'preferences';
 
         $::form->set_standard_title;


@@ -227,22 +236,27 @@ sub handle_request {
     1;
   } or do {
     if ($EVAL_ERROR ne END_OF_REQUEST) {
     1;
   } or do {
     if ($EVAL_ERROR ne END_OF_REQUEST) {

-      $::form->{label_error} = $::cgi->pre($EVAL_ERROR);
+      print STDERR $EVAL_ERROR;
+      $::form->{label_error} = $::request->{cgi}->pre($EVAL_ERROR);

       eval { show_error('generic/error') };
     }
   };
 
   # cleanup
       eval { show_error('generic/error') };
     }
   };
 
   # cleanup

-  $::auth->expire_session_keys->save_session;
+  $::auth->save_session;

   $::auth->expire_sessions;
   $::auth->reset;
 
   $::locale   = undef;
   $::form     = undef;
   $::myconfig = ();
   $::auth->expire_sessions;
   $::auth->reset;
 
   $::locale   = undef;
   $::form     = undef;
   $::myconfig = ();

+  $::request  = undef;

   Form::disconnect_standard_dbh;
 
   $::lxdebug->end_request;
   Form::disconnect_standard_dbh;
 
   $::lxdebug->end_request;

+
+  $self->_watch_for_changed_files;
+

   $::lxdebug->leave_sub;
 }
 
   $::lxdebug->leave_sub;
 }
 


@@ -294,7 +308,7 @@ sub _route_dispatcher_request {
 
     1;
   } or do {
 
     1;
   } or do {

-    $::form->{label_error} = $::cgi->pre($EVAL_ERROR);
+    $::form->{label_error} = $::request->{cgi}->pre($EVAL_ERROR);

     show_error('generic/error');
   };
 
     show_error('generic/error');
   };
 


@@ -311,38 +325,46 @@ sub _route_controller_request {
 
     1;
   } or do {
 
     1;
   } or do {

-    $::form->{label_error} = $::cgi->pre($EVAL_ERROR);
+    $::form->{label_error} = $::request->{cgi}->pre($EVAL_ERROR);

     show_error('generic/error');
   };
 
   return ($controller, $action);
 }
 
     show_error('generic/error');
   };
 
   return ($controller, $action);
 }
 

-sub get_standard_filehandles {
-  my $self = shift;
+sub _cache_file_modification_times {
+  my ($self) = @_;

 
 

-  return $self->{interface} =~ m/f(?:ast)cgi/i ? $self->{request}->GetHandles() : (\*STDIN, \*STDOUT, \*STDERR);
+  return unless $self->_interface_is_fcgi && $::lx_office_conf{debug}->{restart_fcgi_process_on_changes};
+
+  require File::Find;
+  require POSIX;
+
+  my $wanted = sub {
+    return unless $File::Find::name =~ m/\.(?:pm|f?pl|html|conf|conf\.default)$/;
+    $fcgi_file_cache{ $File::Find::name } = (stat $File::Find::name)[9];
+  };
+
+  my $cwd = POSIX::getcwd();
+  File::Find::find($wanted, map { "${cwd}/${_}" } qw(config bin SL templates/webpages));
+  map { my $name = "${cwd}/${_}"; $fcgi_file_cache{$name} = (stat $name)[9] } qw(admin.pl dispatcher.fpl);

 }
 
 }
 

-sub _init_environment {
-  my %key_map = ( lib  => { name => 'PERL5LIB', append_path => 1 },
-                  path => { name => 'PATH',     append_path => 1 },
-                );
-  my $cfg     = $::lx_office_conf{environment} || {};
+sub _watch_for_changed_files {
+  my ($self) = @_;

 
 

-  while (my ($key, $value) = each %{ $cfg }) {
-    next unless $value;
+  return unless $self->_interface_is_fcgi && $::lx_office_conf{debug}->{restart_fcgi_process_on_changes};

 
 

-    my $info = $key_map{$key} || {};
-    $key     = $info->{name}  || $key;
+  my $ok = all { (stat($_))[9] == $fcgi_file_cache{$_} } keys %fcgi_file_cache;
+  return if $ok;
+  $::lxdebug->message(LXDebug::DEBUG1(), "Program modifications detected. Restarting.");
+  exit;
+}

 
 

-    if ($info->{append_path}) {
-      $value = ':' . $value unless $value =~ m/^:/ || !$ENV{$key};
-      $value = $ENV{$key} . $value;
-    }
+sub get_standard_filehandles {
+  my $self = shift;

 
 

-    $ENV{$key} = $value;
-  }
+  return $self->{interface} =~ m/f(?:ast)cgi/i ? $self->{request}->GetHandles() : (\*STDIN, \*STDOUT, \*STDERR);

 }
 
 sub _check_for_old_config_files {
 }
 
 sub _check_for_old_config_files {


@@ -350,7 +372,6 @@ sub _check_for_old_config_files {
   return unless @old_files;
 
   $::form->{title}      = $::locale->text('Old configuration files');
   return unless @old_files;
 
   $::form->{title}      = $::locale->text('Old configuration files');

-  $::form->{stylesheet} = 'lx-office-erp.css';

   $::form->header;
   print $::form->parse_html_template('login/old_configuration_files', { FILES => \@old_files });
 
   $::form->header;
   print $::form->parse_html_template('login/old_configuration_files', { FILES => \@old_files });