restart apache2 in postinst

[mfinanz.git] / SL / Dispatcher / AuthHandler / User.pm

diff --git a/SL/Dispatcher/AuthHandler/User.pm b/SL/Dispatcher/AuthHandler/User.pm
index acdf29c5ca427c44bb89b2943f339e6a0d7181d3..8b15e680980cf42c073391d87991933f885a80dd 100644 (file)
--- a/SL/Dispatcher/AuthHandler/User.pm
+++ b/SL/Dispatcher/AuthHandler/User.pm
@@ -1,23 +1,22 @@
 package SL::Dispatcher::AuthHandler::User;
 
 use strict;
-use parent qw(Rose::Object);
-
-use Encode ();
-use MIME::Base64 ();
+use parent qw(SL::Dispatcher::AuthHandler::Base);
 
+use SL::Helper::UserPreferences::DisplayPreferences;
 use SL::Layout::Dispatcher;
 
 sub handle {
   my ($self, %param) = @_;
 
-  my ($http_auth_login, $http_auth_password) = $self->_parse_http_basic_auth;
+  my ($http_auth_login,     $http_auth_password) = $self->_parse_http_basic_auth;
+  my ($http_headers_client, $http_headers_login) = $self->_parse_http_headers_auth;
 
-  my $login = $::form->{'{AUTH}login'} // $http_auth_login // $::auth->get_session_value('login');
+  my $login = $::form->{'{AUTH}login'} // $http_auth_login // $http_headers_login // $::auth->get_session_value('login');
 
   return $self->_error(%param) if !defined $login;
 
-  my $client_id = $::form->{'{AUTH}client_id'} // $::auth->get_session_value('client_id') // $::auth->get_default_client_id;
+  my $client_id = $::form->{'{AUTH}client_id'} // $http_headers_client // $::auth->get_session_value('client_id') // $::auth->get_default_client_id;
 
   return $self->_error(%param) if !$client_id || !$::auth->set_client($client_id);
 
@@ -26,11 +25,17 @@ sub handle {
   return $self->_error(%param) unless $::myconfig{login};
 
   $::locale = Locale->new($::myconfig{countrycode});
+
+  # user can force a layout version
+  my $user_prefs = SL::Helper::UserPreferences::DisplayPreferences->new();
+  $::request->is_mobile(0) if ($user_prefs->get_layout_style || '') eq 'desktop';
+  $::request->is_mobile(1) if ($user_prefs->get_layout_style || '') eq 'mobile';
   $::request->{layout} = $::request->is_mobile
     ? SL::Layout::Dispatcher->new(style => 'mobile')
     : SL::Layout::Dispatcher->new(style => $::myconfig{menustyle});
 
   my $ok   =  $::auth->is_api_token_cookie_valid;
+  $ok    ||=                            $http_headers_login && (SL::Auth::OK() == $::auth->authenticate($::myconfig{login}, \'dummy!'));
   $ok    ||=  $::form->{'{AUTH}login'}                      && (SL::Auth::OK() == $::auth->authenticate($::myconfig{login}, $::form->{'{AUTH}password'}));
   $ok    ||= !$::form->{'{AUTH}login'} &&  $http_auth_login && (SL::Auth::OK() == $::auth->authenticate($::myconfig{login}, $http_auth_password));
   $ok    ||= !$::form->{'{AUTH}login'} && !$http_auth_login && (SL::Auth::OK() == $::auth->authenticate($::myconfig{login}, undef));
@@ -53,26 +58,4 @@ sub _error {
   return 0;
 }
 
-sub _parse_http_basic_auth {
-  my ($self) = @_;
-
-  # See RFC 7617.
-
-  # Requires that the server passes the 'Authorization' header as the
-  # environment variable 'HTTP_AUTHORIZATION'. Example code for
-  # Apache:
-
-  # SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
-
-  my $data = $ENV{HTTP_AUTHORIZATION};
-
-  return unless ($data // '') =~ m{^basic +(.+)}i;
-
-  $data = Encode::decode('utf-8', MIME::Base64::decode($1));
-
-  return unless $data =~ m{(.+?):(.+)};
-
-  return ($1, $2);
-}
-
 1;