Skip to content

Commit

Permalink
Merge pull request #1623 from RotherOSS/issue-#1622-public_pl
Browse files Browse the repository at this point in the history 
Issue #1622 public pl
  • Loading branch information
@bschmalhofer
bschmalhofer authored Feb 18, 2022
2 parents 68f74fc + 95f99d6 commit c358b17
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 15 deletions.
12 changes: 6 additions & 6 deletions Kernel/Modules/PublicCalendar.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ sub Run {
for my $Needed (qw(CalendarID User Token)) {
$GetParam{$Needed} = $ParamObject->GetParam( Param => $Needed );
if ( !$GetParam{$Needed} ) {
return $LayoutObject->CustomerErrorScreen(
return $LayoutObject->PublicErrorScreen(
Message => $LayoutObject->{LanguageObject}->Translate( 'No %s!', $Needed ),
Comment => Translatable('Please contact the administrator.'),
);
Expand All @@ -59,7 +59,7 @@ sub Run {
Valid => 1,
);
if ( !%User ) {
return $LayoutObject->ErrorScreen(
return $LayoutObject->PublicErrorScreen(
Message => Translatable('No such user!'),
Comment => Translatable('Please contact the administrator.'),
);
Expand All @@ -74,14 +74,14 @@ sub Run {
);

if ( !%Calendar ) {
return $LayoutObject->ErrorScreen(
return $LayoutObject->PublicErrorScreen(
Message => Translatable('No permission!'),
Comment => Translatable('Please contact the administrator.'),
);
}

if ( $Calendar{ValidID} != 1 ) {
return $LayoutObject->ErrorScreen(
return $LayoutObject->PublicErrorScreen(
Message => Translatable('Invalid calendar!'),
Comment => Translatable('Please contact the administrator.'),
);
Expand All @@ -94,7 +94,7 @@ sub Run {
);

if ( $AccessToken ne $GetParam{Token} ) {
return $LayoutObject->ErrorScreen(
return $LayoutObject->PublicErrorScreen(
Message => Translatable('Invalid URL!'),
Comment => Translatable('Please contact the administrator.'),
);
Expand All @@ -107,7 +107,7 @@ sub Run {
);

if ( !$ICalString ) {
return $LayoutObject->ErrorScreen(
return $LayoutObject->PublicErrorScreen(
Message => Translatable('There was an error exporting the calendar!'),
Comment => Translatable('Please contact the administrator.'),
);
Expand Down
4 changes: 2 additions & 2 deletions Kernel/Modules/PublicRepository.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ sub Run {
my $LayoutObject = $Kernel::OM->Get('Kernel::Output::HTML::Layout');

if ( !$AccessControlRexExp ) {
return $LayoutObject->CustomerErrorScreen(
return $LayoutObject->PublicErrorScreen(
Message => Translatable('Need config Package::RepositoryAccessRegExp'),
);
}
else {
my $ParamObject = $Kernel::OM->Get('Kernel::System::Web::Request');
my $RemoteAddr = $ParamObject->RemoteAddr() || '';
if ( $RemoteAddr !~ /^$AccessControlRexExp$/ ) {
return $LayoutObject->CustomerErrorScreen(
return $LayoutObject->PublicErrorScreen(
Message =>
$LayoutObject->{LanguageObject}->Translate( 'Authentication failed from %s!', $RemoteAddr ),
);
Expand Down
72 changes: 69 additions & 3 deletions Kernel/Output/HTML/Layout.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

package Kernel::Output::HTML::Layout;

use v5.24;
use strict;
use warnings;
use v5.24;
use namespace::autoclean;
use utf8;

Expand Down Expand Up @@ -62,11 +62,11 @@ our @ObjectDependencies = (

=head1 NAME
Kernel::Output::HTML::Layout - all generic html functions
Kernel::Output::HTML::Layout - all generic HTML functions
=head1 DESCRIPTION
All generic html functions. E. g. to get options fields, template processing, ...
All generic HTML functions. E. g. to get options fields, template processing, ...
=head1 PUBLIC INTERFACE
Expand Down Expand Up @@ -4978,6 +4978,72 @@ sub CustomerNoPermission {
return $Output;
}

# similar to CustomerError() but neither the last log message nor the backtrace is printed
sub PublicError {
my ( $Self, %Param ) = @_;

# create & return output, using the same layout as in the customer interface
return $Self->Output(
TemplateFile => 'CustomerError',
Data => \%Param
);
}

# using PublicError() internally
sub PublicFatalError {
my ( $Self, %Param ) = @_;

# Prevent endless recursion in case of problems with Template engine.
return if $Self->{InFatalError}++;

if ( $Param{Message} ) {
$Kernel::OM->Get('Kernel::System::Log')->Log(
Caller => 1,
Priority => 'error',
Message => $Param{Message},
);
}

my $Output = join '',
$Self->CustomerHeader(
Area => 'Frontend',
Title => 'Fatal Error'
),
$Self->PublicError(%Param), # without last error message and without last traceback
$Self->CustomerFooter();

# Modify the output by applying the output filters.
$Output = $Self->ApplyOutputFilters( Output => $Output );

# The Content-Length will be set later in the middleware Plack::Middleware::ContentLength. This requires that
# there are no multi-byte characters in the delivered content. This is because the middleware
# uses core::length() for determining the content length.
$Kernel::OM->Get('Kernel::System::Encode')->EncodeOutput( \$Output );

# The OTOBO response object already has the HTPP headers.
# Enhance it with the HTTP status code and the content.
my $PlackResponse = Plack::Response->new(
200,
$Kernel::OM->Get('Kernel::System::Web::Response')->Headers(),
$Output
);

# The exception is caught be Plack::Middleware::HTTPExceptions
die Kernel::System::Web::Exception->new(
PlackResponse => $PlackResponse
);
}

# using PublicError() internally
sub PublicErrorScreen {
my ( $Self, %Param ) = @_;

return join '',
$Self->CustomerHeader( Title => 'Error' ),
$Self->PublicError(%Param),
$Self->CustomerFooter();
}

=head2 Ascii2RichText()
converts text to rich text
Expand Down
19 changes: 15 additions & 4 deletions Kernel/System/Web/InterfacePublic.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,21 +207,29 @@ sub Content {
my $LayoutObject = $Kernel::OM->Get('Kernel::Output::HTML::Layout');

if ( !$DBCanConnect ) {
$LayoutObject->CustomerFatalError(

# Show error without showing neither the last logmessage not the last traceback.
$LayoutObject->PublicFatalError(
Message => Translatable('Could not connect to the database.'),
Comment => Translatable('Please contact the administrator.'),
); # throws a Kernel::System::Web::Exception
}

if ( $ParamObject->Error() ) {
$LayoutObject->CustomerFatalError(

# Show error without showing neither the last logmessage not the last traceback.
$LayoutObject->PublicFatalError(
Message => $ParamObject->Error(),
Comment => Translatable('Please contact the administrator.'),
); # throws a Kernel::System::Web::Exception
}

# run modules if a version value exists
if ( !$Kernel::OM->Get('Kernel::System::Main')->Require("Kernel::Modules::$Param{Action}") ) {
$LayoutObject->CustomerFatalError(

# Show error without showing neither the last logmessage not the last traceback.
$LayoutObject->PublicFatalError(
Message => sprintf( Translatable(q{The action '%s' is not available.}), $Param{Action} ),
Comment => Translatable('Please contact the administrator.'),
); # throws a Kernel::System::Web::Exception
}
Expand All @@ -234,7 +242,10 @@ sub Content {
Message =>
"Module Kernel::Modules::$Param{Action} not registered in Kernel/Config.pm!",
);
$LayoutObject->CustomerFatalError(

# Show error without showing neither the last logmessage not the last traceback.
$LayoutObject->PublicFatalError(
Message => sprintf( Translatable(q{The action '%s' is not allowed.}), $Param{Action} ),
Comment => Translatable('Please contact the administrator.'),
); # throws a Kernel::System::Web::Exception
}
Expand Down

0 comments on commit c358b17

Please sign in to comment.