X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDispatcher.pm;h=30a4b819ccb2e70c2a008a7fc7ade4d479b5eb7b;hb=217751aba9f1e746f67914e83bb669fc784d6eac;hp=9ba2b70cfc2563f966e3ab987f23671f200b4d52;hpb=f2af9def6777d0192a83c8a86f1332569c742051;p=kivitendo-erp.git diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm index 9ba2b70cf..30a4b819c 100644 --- a/SL/Dispatcher.pm +++ b/SL/Dispatcher.pm @@ -5,7 +5,6 @@ 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); @@ -13,19 +12,26 @@ 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 SL::Form; use SL::Helper::DateTime; -use Form; -use List::Util qw(first); -use File::Basename; +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) = @_; @@ -35,7 +41,14 @@ sub new { 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(); @@ -44,7 +57,6 @@ sub pre_request_checks { show_error('login/auth_db_unreachable'); } } - $::auth->expire_sessions; } sub show_error { @@ -52,11 +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; - $::form->{stylesheet} = 'css/lx-office-erp.css'; + $::myconfig{countrycode} = $::lx_office_conf{system}->{language}; $::form->header; print $::form->parse_html_template($template); @@ -66,18 +77,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) = @_; - read_config 'config/lx_office.conf' => %::lx_office_conf; - _decode_recursively(\%::lx_office_conf); - _init_environment(); + SL::LxOfficeConf->read; eval { package main; @@ -88,17 +90,18 @@ sub pre_startup_setup { # canonial globals. if it's not here, chances are it will get refactored someday. { no warnings 'once'; - $::menufile = "menu.ini"; $::lxdebug = LXDebug->new; $::auth = SL::Auth->new; $::form = undef; %::myconfig = (); - %::called_subs = (); # currently used for recursion detection + $::request = undef; } $SIG{__WARN__} = sub { $::lxdebug->warn(@_); - } + }; + + $self->_cache_file_modification_times; } sub pre_startup_checks { @@ -106,8 +109,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 { @@ -163,10 +167,15 @@ sub handle_request { $self->unrequire_bin_mozilla; - $::cgi = CGI->new(''); - $::locale = Locale->new($::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; eval { ($routing_type, $script_name, $action) = _route_request($script_name); 1; } or return; @@ -184,35 +193,34 @@ sub handle_request { $::form->{script} = "controller.pl"; } - pre_request_checks(); - eval { - my $session_result = $::auth->restore_session; - $::auth->create_or_refresh_session; + pre_request_checks(); $::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') { + 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}); + %::myconfig = $::auth->read_user(login => $::form->{login}); show_error('login/password_error', 'password') unless $::myconfig{login}; $::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')->save_session(); + $::auth->delete_session_value('FLASH'); delete $::form->{password}; if ($action) { - map { $::form->{$_} = $::myconfig{$_} } qw(stylesheet charset) + $::instance_conf->init; + + map { $::form->{$_} = $::myconfig{$_} } qw(charset) unless $action eq 'save' && $::form->{type} eq 'preferences'; $::form->set_standard_title; @@ -229,18 +237,27 @@ sub handle_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 + $::auth->save_session; + $::auth->expire_sessions; + $::auth->reset; + $::locale = undef; $::form = undef; $::myconfig = (); - Form::disconnect_standard_dbh unless $self->_interface_is_fcgi; + $::request = undef; + Form::disconnect_standard_dbh; $::lxdebug->end_request; + + $self->_watch_for_changed_files; + $::lxdebug->leave_sub; } @@ -292,7 +309,7 @@ sub _route_dispatcher_request { 1; } or do { - $::form->{label_error} = $::cgi->pre($EVAL_ERROR); + $::form->{label_error} = $::request->{cgi}->pre($EVAL_ERROR); show_error('generic/error'); }; @@ -309,50 +326,57 @@ sub _route_controller_request { 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); } -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 _decode_recursively { - my ($obj) = @_; +sub _watch_for_changed_files { + my ($self) = @_; - while (my ($key, $value) = each %{ $obj }) { - if (ref($value) eq 'HASH') { - _decode_recursively($value); - } else { - $obj->{$key} = decode('UTF-8', $value); - } - } + 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 _init_environment { - my %key_map = ( lib => { name => 'PERL5LIB', append_path => 1 }, - path => { name => 'PATH', append_path => 1 }, - ); - my $cfg = $::lx_office_conf{environment} || {}; +sub get_standard_filehandles { + my $self = shift; - while (my ($key, $value) = each %{ $cfg }) { - next unless $value; + return $self->{interface} =~ m/f(?:ast)cgi/i ? $self->{request}->GetHandles() : (\*STDIN, \*STDOUT, \*STDERR); +} - my $info = $key_map{$key} || {}; - $key = $info->{name} || $key; +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; - if ($info->{append_path}) { - $value = ':' . $value unless $value =~ m/^:/ || !$ENV{$key}; - $value = $ENV{$key} . $value; - } + $::form->{title} = $::locale->text('Old configuration files'); + $::form->header; + print $::form->parse_html_template('login/old_configuration_files', { FILES => \@old_files }); - $ENV{$key} = $value; - } + ::end_of_request(); } package main;