X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDispatcher.pm;h=97a2f45f4918160aa9aeba59fe291bba9fc3e0a9;hb=debd14edcc23a6168e827be861a052f396aee901;hp=8bd296804c3ea087e6d47728034c0e9593448fd2;hpb=90edf0b1ddcc2aa9ee7cdeb9b46e1ccbea6b0006;p=kivitendo-erp.git diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm index 8bd296804..97a2f45f4 100644 --- a/SL/Dispatcher.pm +++ b/SL/Dispatcher.pm @@ -5,24 +5,50 @@ 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 File::Basename; +use List::MoreUtils qw(all); +use List::Util qw(first); +use POSIX; use SL::Auth; use SL::LXDebug; +use SL::LxOfficeConf; use SL::Locale; use SL::Common; -use Form; -use List::Util qw(first); -use File::Basename; +use SL::Form; +use SL::Helper::DateTime; +use SL::InstanceConfiguration; +use SL::Template::Plugin::HTMLFixes; # 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'); + + return $self; +} + +sub interface_type { + my ($self) = @_; + return $self->{interface} eq 'cgi' ? 'CGI' : 'FastCGI'; +} + sub pre_request_checks { + _check_for_old_config_files(); + if (!$::auth->session_tables_present) { if ($::form->{script} eq 'admin.pl') { ::run(); @@ -31,7 +57,6 @@ sub pre_request_checks { show_error('login/auth_db_unreachable'); } } - $::auth->expire_sessions; } sub show_error { @@ -39,10 +64,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 +78,9 @@ 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"; + my ($self) = @_; + + SL::LxOfficeConf->read; eval { package main; @@ -71,11 +91,6 @@ 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; @@ -85,7 +100,9 @@ sub pre_startup_setup { $SIG{__WARN__} = sub { $::lxdebug->warn(@_); - } + }; + + $self->_cache_file_modification_times; } sub pre_startup_checks { @@ -93,8 +110,9 @@ sub pre_startup_checks { } sub pre_startup { - pre_startup_setup(); - pre_startup_checks(); + my ($self) = @_; + $self->pre_startup_setup; + $self->pre_startup_checks; } sub require_main_code { @@ -123,42 +141,70 @@ sub require_main_code { $::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); $script_name = $ENV{SCRIPT_NAME}; - unrequire_bin_mozilla($interface); + $self->unrequire_bin_mozilla; + + $::cgi = CGI->new(''); + $::locale = Locale->new($::lx_office_conf{system}->{language}); + $::form = Form->new; + %::called_subs = (); + $::instance_conf = SL::InstanceConfiguration->new; + + my $session_result = $::auth->restore_session; + $::auth->create_or_refresh_session; + + $::form->read_cgi_input; - $::cgi = CGI->new(''); - $::locale = Locale->new($::language); - $::form = Form->new; - %::called_subs = (); + eval { ($routing_type, $script_name, $action) = _route_request($script_name); 1; } or return; - eval { ($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; - pre_request_checks(); + } else { + _require_controller($script_name); + $::form->{script} = "controller.pl"; + } eval { - $::form->error($::locale->text('System currently down for maintenance!')) if -e "$::userspath/nologin" && $script ne 'admin'; + pre_request_checks(); - 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); + $::form->error($::locale->text('System currently down for maintenance!')) if -e ($::lx_office_conf{paths}->{userspath} . "/nologin") && $script ne 'admin'; - } elsif ($action) { - # copy from am.pl routines - my $session_result = $::auth->restore_session; + if ($script eq 'login' or $script eq 'admin') { + $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}"; + ::run($session_result); + } else { show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result; %::myconfig = $::auth->read_user($::form->{login}); @@ -166,42 +212,59 @@ 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->store_credentials_in_session(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) { + $::instance_conf->init; + + 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; } or do { if ($EVAL_ERROR ne END_OF_REQUEST) { + print STDERR $EVAL_ERROR; $::form->{label_error} = $::cgi->pre($EVAL_ERROR); eval { show_error('generic/error') }; } }; # cleanup + $::auth->save_session; + $::auth->expire_sessions; + $::auth->reset; + $::locale = undef; $::form = undef; $::myconfig = (); - Form::disconnect_standard_dbh(); + Form::disconnect_standard_dbh; $::lxdebug->end_request; + + $self->_watch_for_changed_files; + $::lxdebug->leave_sub; } sub unrequire_bin_mozilla { - return unless $_[0] =~ m/^(?:fastcgi|fcgid|fcgi)$/; + my $self = shift; + return unless $self->_interface_is_fcgi; for (keys %INC) { next unless m#^bin/mozilla/#; @@ -211,10 +274,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 { @@ -247,6 +317,70 @@ 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 _cache_file_modification_times { + my ($self) = @_; + + 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 _watch_for_changed_files { + my ($self) = @_; + + return unless $self->_interface_is_fcgi && $::lx_office_conf{debug}->{restart_fcgi_process_on_changes}; + + my $ok = all { (stat($_))[9] == $fcgi_file_cache{$_} } keys %fcgi_file_cache; + return if $ok; + $::lxdebug->message(LXDebug::DEBUG1(), "Program modifications detected. Restarting."); + exit; +} + +sub get_standard_filehandles { + my $self = shift; + + return $self->{interface} =~ m/f(?:ast)cgi/i ? $self->{request}->GetHandles() : (\*STDIN, \*STDOUT, \*STDERR); +} + +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; + + $::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 }); + + ::end_of_request(); +} + package main; use strict;