Upgrade-Script für alte SQL-Ledger -> Lx-Office 1.0 entfernt

[mfinanz.git] / SL / Dispatcher.pm

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 8301e56029d903500985df9efe00bf50e8858e7f..8329c5b75abb0406b141582968514f96e108d0a9 100644 (file)
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -2,11 +2,21 @@ package SL::Dispatcher;
 
 use strict;
 
 
 use strict;
 

+# Force scripts/locales.pl to parse these templates:
+#   parse_html_template('login_screen/auth_db_unreachable')
+#   parse_html_template('login_screen/user_login')
+#   parse_html_template('generic/error')
+

 BEGIN {
 BEGIN {

-  unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML).
-  push    @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
+  use SL::System::Process;
+  my $exe_dir = SL::System::Process::exe_dir;
+
+  unshift @INC, "${exe_dir}/modules/override"; # Use our own versions of various modules (e.g. YAML).
+  push    @INC, "${exe_dir}/modules/fallback"; # Only use our own versions of modules if there's no system version.
+  unshift @INC, $exe_dir;

 }
 
 }
 

+use Carp;

 use CGI qw( -no_xhtml);
 use Config::Std;
 use DateTime;
 use CGI qw( -no_xhtml);
 use Config::Std;
 use DateTime;


@@ -21,6 +31,7 @@ use SL::Dispatcher::AuthHandler;
 use SL::LXDebug;
 use SL::LxOfficeConf;
 use SL::Locale;
 use SL::LXDebug;
 use SL::LxOfficeConf;
 use SL::Locale;

+use SL::ClientJS;

 use SL::Common;
 use SL::Form;
 use SL::Helper::DateTime;
 use SL::Common;
 use SL::Form;
 use SL::Helper::DateTime;


@@ -48,17 +59,31 @@ sub interface_type {
   return $self->{interface} eq 'cgi' ? 'CGI' : 'FastCGI';
 }
 
   return $self->{interface} eq 'cgi' ? 'CGI' : 'FastCGI';
 }
 

+sub is_admin_request {
+  my %params = @_;
+  return ($params{script} eq 'admin.pl') || (($params{routing_type} eq 'controller') && ($params{script_name} eq 'Admin'));
+}
+

 sub pre_request_checks {
 sub pre_request_checks {

+  my (%params) = @_;
+

   _check_for_old_config_files();
 
   _check_for_old_config_files();
 

-  if (!$::auth->session_tables_present) {
-    if ($::form->{script} eq 'admin.pl') {
-      ::run();
-      ::end_of_request();
-    } else {
-      show_error('login/auth_db_unreachable');
-    }
+  if (!$::auth->session_tables_present && !is_admin_request(%params)) {
+    show_error('login_screen/auth_db_unreachable');

   }
   }

+
+  if ($::request->type !~ m/^ (?: html | js | json ) $/x) {
+    die $::locale->text("Invalid request type '#1'", $::request->type);
+  }
+}
+
+sub render_error_ajax {
+  my ($error) = @_;
+
+  SL::ClientJS->new
+    ->error($error)
+    ->render(SL::Controller::Base->new);

 }
 
 sub show_error {
 }
 
 sub show_error {


@@ -67,10 +92,12 @@ sub show_error {
   my $error_type           = shift || '';
   my %params               = @_;
 
   my $error_type           = shift || '';
   my %params               = @_;
 

-  $::locale                = Locale->new($::lx_office_conf{system}->{language});
+  $::myconfig{countrycode} = delete($params{countrycode}) || $::lx_office_conf{system}->{language};
+  $::locale                = Locale->new($::myconfig{countrycode});

   $::form->{error}         = $::locale->text('The session is invalid or has expired.') if ($error_type eq 'session');
   $::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->{error}         = $::locale->text('Incorrect password!')                    if ($error_type eq 'password');
+
+  return render_error_ajax($::form->{error}) if $::request->is_ajax;

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


@@ -104,6 +131,8 @@ sub pre_startup_setup {
     $::lxdebug->warn(@_);
   };
 
     $::lxdebug->warn(@_);
   };
 

+  $SIG{__DIE__} = sub { Carp::confess( @_ ) } if $::lx_office_conf{debug}->{backtrace_on_die};
+

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


@@ -172,14 +201,22 @@ sub handle_request {
   $::locale        = Locale->new($::lx_office_conf{system}->{language});
   $::form          = Form->new;
   $::instance_conf = SL::InstanceConfiguration->new;
   $::locale        = Locale->new($::lx_office_conf{system}->{language});
   $::form          = Form->new;
   $::instance_conf = SL::InstanceConfiguration->new;

-  $::request       = { cgi => CGI->new({}) };
+  $::request       = SL::Request->new(
+    cgi => CGI->new({}),
+    layout => SL::Layout::None->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($ENV{SCRIPT_NAME}); 1; } or return;
+  my %routing;
+  eval { %routing = _route_request($ENV{SCRIPT_NAME}); 1; } or return;
+  ($routing_type, $script_name, $action) = @routing{qw(type controller action)};
+  $::lxdebug->log_request($routing_type, $script_name, $action);
+
+  $::request->type(lc($routing{request_type} || 'html'));

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


@@ -196,26 +233,43 @@ sub handle_request {
   }
 
   eval {
   }
 
   eval {

-    pre_request_checks();
+    pre_request_checks(script => $script, action => $action, routing_type => $routing_type, script_name => $script_name);

 
 

-    $::form->error($::locale->text('System currently down for maintenance!')) if -e ($::lx_office_conf{paths}->{userspath} . "/nologin") && $script ne 'admin';
+    if (   SL::System::InstallationLock->is_locked
+        && !is_admin_request(script => $script, script_name => $script_name, routing_type => $routing_type)) {
+      $::form->error($::locale->text('System currently down for maintenance!'));
+    }
+
+    # For compatibility with a lot of database upgrade scripts etc:
+    # Re-write request to old 'login.pl?action=login' to new
+    # 'LoginScreen' controller. Make sure to load its code!
+    if (($script eq 'login') && ($action eq 'login')) {
+      ($routing_type, $script, $script_name, $action) = qw(controller controller LoginScreen login);
+      _require_controller('LoginScreen');
+    }
+
+    if (($script eq 'login') && !$action) {
+      print $::request->{cgi}->redirect('controller.pl?action=LoginScreen/user_login');

 
 

-    if ($script eq 'login' or $script eq 'admin') {
-      $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}";
+    } elsif ($script eq 'admin') {

       ::run($session_result);
 
     } else {
       ::run($session_result);
 
     } else {

-      show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result;
+      $self->redirect_to_login($script) if SL::Auth::SESSION_EXPIRED == $session_result;

 
 

-      my $auth_level = $self->{auth_handler}->handle(
+      my %auth_result = $self->{auth_handler}->handle(

         routing_type => $routing_type,
         script       => $script,
         controller   => $script_name,
         action       => $action,
       );
 
         routing_type => $routing_type,
         script       => $script,
         controller   => $script_name,
         action       => $action,
       );
 

+      ::end_of_request() unless $auth_result{auth_ok};
+
+      delete @{ $::form }{ grep { m/^\{AUTH\}/ } keys %{ $::form } } unless $auth_result{keep_auth_vars};
+

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

-        $::instance_conf->init if $auth_level eq 'user';
+        $::instance_conf->init if $auth_result{auth_level} eq 'user';

 
         map { $::form->{$_} = $::myconfig{$_} } qw(charset)
           unless $action eq 'save' && $::form->{type} eq 'preferences';
 
         map { $::form->{$_} = $::myconfig{$_} } qw(charset)
           unless $action eq 'save' && $::form->{type} eq 'preferences';


@@ -233,13 +287,22 @@ sub handle_request {
 
     1;
   } or do {
 
     1;
   } or do {

-    if ($EVAL_ERROR ne END_OF_REQUEST) {
-      print STDERR $EVAL_ERROR;
-      $::form->{label_error} = $::request->{cgi}->pre($EVAL_ERROR);
-      eval { show_error('generic/error') };
+    if (substr($EVAL_ERROR, 0, length(END_OF_REQUEST())) ne END_OF_REQUEST()) {
+      my $error = $EVAL_ERROR;
+      print STDERR $error;
+
+      if ($::request->is_ajax) {
+        eval { render_error_ajax($error) };
+      } else {
+        $::form->{label_error} = $::request->{cgi}->pre($error);
+        chdir SL::System::Process::exe_dir;
+        eval { show_error('generic/error') };
+      }

     }
   };
 
     }
   };
 

+  $::form->footer;
+

   # cleanup
   $::auth->save_session;
   $::auth->expire_sessions;
   # cleanup
   $::auth->save_session;
   $::auth->expire_sessions;


@@ -258,6 +321,13 @@ sub handle_request {
   $::lxdebug->leave_sub;
 }
 
   $::lxdebug->leave_sub;
 }
 

+sub redirect_to_login {
+  my ($self, $script) = @_;
+  my $action          = $script =~ m/^admin/i ? 'Admin/login' : 'LoginScreen/user_login&error=session';
+  print $::request->cgi->redirect("controller.pl?action=${action}");
+  ::end_of_request();
+}
+

 sub unrequire_bin_mozilla {
   my $self = shift;
   return unless $self->_interface_is_fcgi;
 sub unrequire_bin_mozilla {
   my $self = shift;
   return unless $self->_interface_is_fcgi;


@@ -278,9 +348,9 @@ sub _interface_is_fcgi {
 sub _route_request {
   my $script_name = shift;
 
 sub _route_request {
   my $script_name = shift;
 

-  return $script_name =~ m/dispatcher\.pl$/ ? ('old',        _route_dispatcher_request())
-       : $script_name =~ m/controller\.pl/  ? ('controller', _route_controller_request())
-       :                                      ('old',        $script_name, $::form->{action});
+  return $script_name =~ m/dispatcher\.pl$/ ? (type => 'old',        _route_dispatcher_request())
+       : $script_name =~ m/controller\.pl/  ? (type => 'controller', _route_controller_request())
+       :                                      (type => 'old',        controller => $script_name, action => $::form->{action});

 }
 
 sub _route_dispatcher_request {
 }
 
 sub _route_dispatcher_request {


@@ -310,24 +380,26 @@ sub _route_dispatcher_request {
     show_error('generic/error');
   };
 
     show_error('generic/error');
   };
 

-  return ($script_name, $action);
+  return (controller => $script_name, action => $action);

 }
 
 sub _route_controller_request {
 }
 
 sub _route_controller_request {

-  my ($controller, $action);
+  my ($controller, $action, $request_type);

 
   eval {
 
   eval {

-    $::form->{action}      =~ m|^ ( [A-Z] [A-Za-z0-9_]* ) / ( [a-z] [a-z0-9_]* ) $|x || die "Unroutable request -- inavlid controller/action.\n";
+    $::form->{action}      =~ m|^ ( [A-Z] [A-Za-z0-9_]* ) / ( [a-z] [a-z0-9_]* ) ( \. [a-zA-Z]+ )? $|x || die "Unroutable request -- inavlid controller/action.\n";

     ($controller, $action) =  ($1, $2);
     delete $::form->{action};
 
     ($controller, $action) =  ($1, $2);
     delete $::form->{action};
 

+    $request_type = $3 ? lc(substr($3, 1)) : 'html';
+

     1;
   } or do {
     $::form->{label_error} = $::request->{cgi}->pre($EVAL_ERROR);
     show_error('generic/error');
   };
 
     1;
   } or do {
     $::form->{label_error} = $::request->{cgi}->pre($EVAL_ERROR);
     show_error('generic/error');
   };
 

-  return ($controller, $action);
+  return (controller => $controller, action => $action, request_type => $request_type);

 }
 
 sub _cache_file_modification_times {
 }
 
 sub _cache_file_modification_times {


@@ -369,9 +441,9 @@ sub _check_for_old_config_files {
   my @old_files = grep { -f "config/${_}" } qw(authentication.pl console.conf lx-erp.conf lx-erp-local.conf);
   return unless @old_files;
 
   my @old_files = grep { -f "config/${_}" } qw(authentication.pl console.conf lx-erp.conf lx-erp-local.conf);
   return unless @old_files;
 

-  $::form->{title}      = $::locale->text('Old configuration files');
+  $::form->{title} = $::locale->text('Old configuration files');

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

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

 
   ::end_of_request();
 }
 
   ::end_of_request();
 }