X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDispatcher.pm;h=35a351877f8f6ef84ac26f530141259780d4a3a0;hb=81fed28305f28aff317639f9a190cdf83a678ed4;hp=6512f0312714fa9ff48c233a6c7bc05cb2f10aa3;hpb=c6d0de695657e132931e883c08f1436974bc22f2;p=kivitendo-erp.git diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm index 6512f0312..35a351877 100644 --- a/SL/Dispatcher.pm +++ b/SL/Dispatcher.pm @@ -2,9 +2,18 @@ package SL::Dispatcher; 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 { - 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 CGI qw( -no_xhtml); @@ -12,25 +21,34 @@ 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::Dispatcher::AuthHandler; use SL::LXDebug; use SL::LxOfficeConf; use SL::Locale; use SL::Common; use SL::Form; use SL::Helper::DateTime; -use List::Util qw(first); -use File::Basename; +use SL::InstanceConfiguration; +use SL::Template::Plugin::HTMLFixes; +use SL::Layout::None; # 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'); + $self->{auth_handler} = SL::Dispatcher::AuthHandler->new; return $self; } @@ -41,38 +59,40 @@ sub interface_type { } sub pre_request_checks { + _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'); + show_error('login_screen/auth_db_unreachable'); } } - $::auth->expire_sessions; } sub show_error { $::lxdebug->enter_sub; my $template = shift; 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('Incorrect password!.') if ($error_type eq 'password'); - $::myconfig{countrycode} = $::lx_office_conf{system}->{language}; - $::form->{stylesheet} = 'css/lx-office-erp.css'; + $::form->{error} = $::locale->text('Incorrect password!') if ($error_type eq 'password'); - $::form->header; - print $::form->parse_html_template($template); + $::form->header(no_menu => 1); + print $::form->parse_html_template($template, \%params); $::lxdebug->leave_sub; ::end_of_request(); } sub pre_startup_setup { + my ($self) = @_; + SL::LxOfficeConf->read; - _init_environment(); eval { package main; @@ -87,12 +107,14 @@ sub pre_startup_setup { $::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 { @@ -100,8 +122,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 { @@ -133,10 +156,11 @@ sub require_main_code { sub _require_controller { my $controller = shift; $controller =~ s|[^A-Za-z0-9_]||g; + $controller = "SL/Controller/${controller}"; eval { package main; - require "SL/Controller/${controller}.pm"; + require "${controller}.pm"; } or die $EVAL_ERROR; } @@ -153,16 +177,22 @@ sub handle_request { my ($script, $path, $suffix, $script_name, $action, $routing_type); - $script_name = $ENV{SCRIPT_NAME}; - $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({}), + layout => SL::Layout::None->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; + eval { ($routing_type, $script_name, $action) = _route_request($ENV{SCRIPT_NAME}); 1; } or return; if ($routing_type eq 'old') { $::form->{action} = lc $::form->{action}; @@ -178,35 +208,44 @@ 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') { - $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}"; - ::run($session_result); + # 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'); + } - } else { - show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result; - %::myconfig = $::auth->read_user($::form->{login}); + if (($script eq 'login') && !$action) { + print $::request->{cgi}->redirect('controller.pl?action=LoginScreen/user_login'); - show_error('login/password_error', 'password') unless $::myconfig{login}; + } elsif ($script eq 'admin') { + $::form->{titlebar} = "kivitendo " . $::locale->text('Version') . " $::form->{version}"; + ::run($session_result); - $::locale = Locale->new($::myconfig{countrycode}); + } else { + if (SL::Auth::SESSION_EXPIRED == $session_result) { + print $::request->{cgi}->redirect('controller.pl?action=LoginScreen/user_login&error=session'); + } - show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($::form->{login}, $::form->{password}); + my %auth_result = $self->{auth_handler}->handle( + routing_type => $routing_type, + script => $script, + controller => $script_name, + action => $action, + ); - $::auth->set_session_value('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 } } unless $auth_result{keep_auth_vars}; if ($action) { - map { $::form->{$_} = $::myconfig{$_} } qw(stylesheet charset) + $::instance_conf->init if $auth_result{auth_level} eq 'user'; + + map { $::form->{$_} = $::myconfig{$_} } qw(charset) unless $action eq 'save' && $::form->{type} eq 'preferences'; $::form->set_standard_title; @@ -223,20 +262,30 @@ 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); + chdir SL::System::Process::exe_dir; eval { show_error('generic/error') }; } }; + $::form->footer; + # cleanup + $::auth->save_session; + $::auth->expire_sessions; + $::auth->reset; + $::locale = undef; $::form = undef; $::myconfig = (); + $::request = undef; Form::disconnect_standard_dbh; - $::auth->expire_session_keys->save_session; - $::auth->dbdisconnect; $::lxdebug->end_request; + + $self->_watch_for_changed_files; + $::lxdebug->leave_sub; } @@ -288,7 +337,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'); }; @@ -305,38 +354,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 _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 _init_environment { - my %key_map = ( lib => { name => 'PERL5LIB', append_path => 1 }, - path => { name => 'PATH', append_path => 1 }, - ); - my $cfg = $::lx_office_conf{environment} || {}; +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; - 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; - } + $::form->{title} = $::locale->text('Old configuration files'); + $::form->header; + print $::form->parse_html_template('login_screen/old_configuration_files', { FILES => \@old_files }); - $ENV{$key} = $value; - } + ::end_of_request(); } package main;