Item14237: Fixed HTTPResponse exceptions handling

foswiki · May 14, 2018 · b29c8eb · b29c8eb
1 parent 77e9d0f
commit b29c8eb
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 15 deletions.
diff --git a/core/lib/Foswiki/App.pm b/core/lib/Foswiki/App.pm
@@ -984,7 +984,9 @@ sub handleRequest {
                 $exception->generate;
             }
         }
-        elsif ( $e->isa('Foswiki::OopsException') ) {
+        elsif ($e->isa('Foswiki::OopsException')
+            || $e->isa("Foswiki::Exception::HTTPResponse") )
+        {
             $e->generate;
         }
         elsif ( $e->isa('Foswiki::EngineException') ) {

diff --git a/core/lib/Foswiki/Exception/HTTPError.pm b/core/lib/Foswiki/Exception/HTTPError.pm
@@ -20,20 +20,30 @@ extends qw<Foswiki::Exception::HTTPResponse>;
 
 has header => ( is => 'rw', default => '' );
 
+around generate => sub {
+    my $orig = shift;
+    my $this = shift;
+
+    $orig->( $this, @_ );
+
+    my $res = $this->response;
+    $res->header( -type => 'text/html' );
+    my $html = CGI::start_html( $this->status . ' ' . $this->header );
+    $html .= CGI::h1( {}, $this->header );
+    $html .= CGI::p( {}, $this->text );
+    $html .= CGI::p( {}, CGI::pre( $this->stacktrace ) ) if DEBUG;
+    $html .= CGI::end_html();
+    $res->print( Foswiki::encode_utf8($html) );
+};
+
 around stringify => sub {
     my $orig = shift;
     my $this = shift;
 
     my $res = $this->response;
     $res->body('');
     if ( $this->_useHTTP ) {
-        $res->header( -type => 'text/html', -status => $this->status );
-        my $html = CGI::start_html( $this->status . ' ' . $this->header );
-        $html .= CGI::h1( {}, $this->header );
-        $html .= CGI::p( {}, $this->text );
-        $html .= CGI::p( {}, CGI::pre( $this->stacktrace ) ) if DEBUG;
-        $html .= CGI::end_html();
-        $res->print($html);
+        $this->generate;
     }
     else {
         $res->print( $this->status . " "

diff --git a/core/lib/Foswiki/Exception/HTTPResponse.pm b/core/lib/Foswiki/Exception/HTTPResponse.pm
@@ -76,12 +76,28 @@ has '+text' => (
 
 =cut
 
+=begin TML
+
+---+++ ObjectMethod generate()
+
+This method is called by application allowing the exception to generate
+necessary response headers/body/etc. prior to reporting back to the user.
+
+=cut
+
+sub generate {
+    my $this = shift;
+    $this->response->status( $this->status );
+}
+
 sub _useHTTP {
     my $this = shift;
+    my $app  = $this->guessApp;
     return
-         defined($Foswiki::app)
-      && defined( $Foswiki::app->engine )
-      && $Foswiki::app->engine->HTTPCompliant;
+         defined($app)
+      && $app->has_engine
+      && defined( $app->engine )
+      && $app->engine->HTTPCompliant;
 }
 
 # Simplified version of stringify() method.
@@ -111,7 +127,7 @@ around prepareText => sub {
     my $orig = shift;
     my $this = shift;
 
-    return 'HTTP status code "' . $_[0]->status;
+    return 'HTTP status code "' . $this->status;
 };
 
 =begin TML
@@ -135,9 +151,9 @@ Initializer for =response= attribute.
 =cut
 
 sub prepareResponse {
-    return defined($Foswiki::app)
-      ? $Foswiki::app->response
-      : Foswiki::Response->new;
+    my $this = shift;
+    my $app  = $this->guessApp;
+    return defined($app) ? $app->response : Foswiki::Response->new;
 }
 
 1;