X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDispatcher.pm;h=3bf120668f919f0d3b17cb83308795f57f981547;hb=5dd469a517459d54610d9999f1b9c68a5ff29a73;hp=8c450ad771363ef0792d969aed1fb1a96341877b;hpb=3ff4ec3b71a043e3802ef21838a0cee6d8535e4e;p=kivitendo-erp.git diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm index 8c450ad77..3bf120668 100644 --- a/SL/Dispatcher.pm +++ b/SL/Dispatcher.pm @@ -5,16 +5,20 @@ use strict; 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. - push @INC, "SL"; # FCGI won't find modules that are not properly named. Help it by inclduging SL } use CGI qw( -no_xhtml); +use Config::Std; +use DateTime; +use Encode; use English qw(-no_match_vars); use SL::Auth; use SL::LXDebug; +use SL::LxOfficeConf; use SL::Locale; use SL::Common; -use Form; +use SL::Form; +use SL::Helper::DateTime; use List::Util qw(first); use File::Basename; @@ -22,6 +26,20 @@ use File::Basename; # number 'die' was called in. use constant END_OF_REQUEST => "END-OF-REQUEST\n"; +sub new { + my ($class, $interface) = @_; + + my $self = bless {}, $class; + $self->{interface} = lc($interface || 'cgi'); + + return $self; +} + +sub interface_type { + my ($self) = @_; + return $self->{interface} eq 'cgi' ? 'CGI' : 'FastCGI'; +} + sub pre_request_checks { if (!$::auth->session_tables_present) { if ($::form->{script} eq 'admin.pl') { @@ -39,10 +57,10 @@ sub show_error { my $template = shift; my $error_type = shift || ''; - $::locale = Locale->new($::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} = $::language; + $::myconfig{countrycode} = $::lx_office_conf{system}->{language}; $::form->{stylesheet} = 'css/lx-office-erp.css'; $::form->header; @@ -53,14 +71,8 @@ sub show_error { } sub pre_startup_setup { - eval { - package main; - require "config/lx-erp.conf"; - }; - eval { - package main; - require "config/lx-erp-local.conf"; - } if -f "config/lx-erp-local.conf"; + SL::LxOfficeConf->read; + _init_environment(); eval { package main; @@ -71,17 +83,15 @@ sub pre_startup_setup { # canonial globals. if it's not here, chances are it will get refactored someday. { no warnings 'once'; - $::userspath = "users"; - $::templates = "templates"; - $::memberfile = "users/members"; - $::menufile = "menu.ini"; - $::sendmail = "| /usr/sbin/sendmail -t"; $::lxdebug = LXDebug->new; - $::auth = SL::Auth->new; $::form = undef; %::myconfig = (); %::called_subs = (); # currently used for recursion detection } + + $SIG{__WARN__} = sub { + $::lxdebug->warn(@_); + } } sub pre_startup_checks { @@ -94,6 +104,7 @@ sub pre_startup { } sub require_main_code { + $::lxdebug->enter_sub; my ($script, $suffix) = @_; eval { @@ -115,48 +126,71 @@ sub require_main_code { }; $::form->error($EVAL_ERROR) if ($EVAL_ERROR); } + $::lxdebug->leave_sub; +} + +sub _require_controller { + my $controller = shift; + $controller =~ s|[^A-Za-z0-9_]||g; + + eval { + package main; + require "SL/Controller/${controller}.pm"; + } or die $EVAL_ERROR; +} + +sub _run_controller { + "SL::Controller::$_[0]"->new->_run_action($_[1]); } sub handle_request { + my $self = shift; + $self->{request} = shift; + $::lxdebug->enter_sub; $::lxdebug->begin_request; - my $interface = lc(shift || 'cgi'); - my ($script_name, $action); + my ($script, $path, $suffix, $script_name, $action, $routing_type); - if ($interface =~ m/^(?:fastcgi|fcgid|fcgi)$/) { - $script_name = $ENV{SCRIPT_NAME}; - unrequire_bin_mozilla(); + $script_name = $ENV{SCRIPT_NAME}; - } else { - $script_name = $0; - } + $self->unrequire_bin_mozilla; $::cgi = CGI->new(''); - $::locale = Locale->new($::language); + $::locale = Locale->new($::lx_office_conf{system}->{language}); $::form = Form->new; + $::auth = SL::Auth->new; %::called_subs = (); - eval { ($script_name, $action) = _route_request($script_name); 1; } or return; + eval { ($routing_type, $script_name, $action) = _route_request($script_name); 1; } or return; + + if ($routing_type eq 'old') { + $::form->{action} = lc $::form->{action}; + $::form->{action} =~ s/( |-|,|\#)/_/g; - my ($script, $path, $suffix) = fileparse($script_name, ".pl"); - require_main_code($script, $suffix); + ($script, $path, $suffix) = fileparse($script_name, ".pl"); + require_main_code($script, $suffix); - $::form->{script} = $script . $suffix; + $::form->{script} = $script . $suffix; + + } else { + _require_controller($script_name); + $::form->{script} = "controller.pl"; + } pre_request_checks(); eval { - $::form->error($::locale->text('System currently down for maintenance!')) if -e "$::userspath/nologin" && $script ne 'admin'; + my $session_result = $::auth->restore_session; + $::auth->create_or_refresh_session; + + $::form->error($::locale->text('System currently down for maintenance!')) if -e ($::lx_office_conf{paths}->{userspath} . "/nologin") && $script ne 'admin'; if ($script eq 'login' or $script eq 'admin' or $script eq 'kopf') { $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}"; - ::run($::auth->restore_session); - - } elsif ($action) { - # copy from am.pl routines - my $session_result = $::auth->restore_session; + ::run($session_result); + } else { show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result; %::myconfig = $::auth->read_user($::form->{login}); @@ -164,20 +198,26 @@ sub handle_request { $::locale = Locale->new($::myconfig{countrycode}); - show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($::form->{login}, $::form->{password}, 0); + show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($::form->{login}, $::form->{password}); $::auth->set_session_value('login', $::form->{login}, 'password', $::form->{password}); $::auth->create_or_refresh_session; + $::auth->delete_session_value('FLASH'); delete $::form->{password}; - map { $::form->{$_} = $::myconfig{$_} } qw(stylesheet charset) - unless $action eq 'save' && $::form->{type} eq 'preferences'; - - $::form->set_standard_title; - ::call_sub('::' . $::locale->findsub($action)); - - } else { - $::form->error($::locale->text('action= not defined!')); + if ($action) { + map { $::form->{$_} = $::myconfig{$_} } qw(stylesheet charset) + unless $action eq 'save' && $::form->{type} eq 'preferences'; + + $::form->set_standard_title; + if ($routing_type eq 'old') { + ::call_sub('::' . $::locale->findsub($action)); + } else { + _run_controller($script_name, $action); + } + } else { + $::form->error($::locale->text('action= not defined!')); + } } 1; @@ -192,13 +232,19 @@ sub handle_request { $::locale = undef; $::form = undef; $::myconfig = (); - Form::disconnect_standard_dbh(); + Form::disconnect_standard_dbh; + $::auth->expire_session_keys->save_session; + $::auth->dbdisconnect; + $::auth = undef; $::lxdebug->end_request; $::lxdebug->leave_sub; } sub unrequire_bin_mozilla { + my $self = shift; + return unless $self->_interface_is_fcgi; + for (keys %INC) { next unless m#^bin/mozilla/#; next if /\bcommon.pl$/; @@ -207,10 +253,17 @@ sub unrequire_bin_mozilla { } } +sub _interface_is_fcgi { + my $self = shift; + return $self->{interface} =~ m/^(?:fastcgi|fcgid|fcgi)$/; +} + sub _route_request { my $script_name = shift; - return $script_name =~ m/dispatcher\.pl$/ ? _route_dispatcher_request() : ($script_name, $::form->{action}); + return $script_name =~ m/dispatcher\.pl$/ ? ('old', _route_dispatcher_request()) + : $script_name =~ m/controller\.pl/ ? ('controller', _route_controller_request()) + : ('old', $script_name, $::form->{action}); } sub _route_dispatcher_request { @@ -243,6 +296,50 @@ sub _route_dispatcher_request { return ($script_name, $action); } +sub _route_controller_request { + my ($controller, $action); + + eval { + $::form->{action} =~ m|^ ( [A-Z] [A-Za-z0-9_]* ) / ( [a-z] [a-z0-9_]* ) $|x || die "Unroutable request -- inavlid controller/action.\n"; + ($controller, $action) = ($1, $2); + delete $::form->{action}; + + 1; + } or do { + $::form->{label_error} = $::cgi->pre($EVAL_ERROR); + show_error('generic/error'); + }; + + return ($controller, $action); +} + +sub get_standard_filehandles { + my $self = shift; + + return $self->{interface} =~ m/f(?:ast)cgi/i ? $self->{request}->GetHandles() : (\*STDIN, \*STDOUT, \*STDERR); +} + +sub _init_environment { + my %key_map = ( lib => { name => 'PERL5LIB', append_path => 1 }, + path => { name => 'PATH', append_path => 1 }, + ); + my $cfg = $::lx_office_conf{environment} || {}; + + while (my ($key, $value) = each %{ $cfg }) { + next unless $value; + + my $info = $key_map{$key} || {}; + $key = $info->{name} || $key; + + if ($info->{append_path}) { + $value = ':' . $value unless $value =~ m/^:/ || !$ENV{$key}; + $value = $ENV{$key} . $value; + } + + $ENV{$key} = $value; + } +} + package main; use strict;