Customization: Added parent tag classes

[bookstack] / app / Exceptions / Handler.php

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 317b011d87de92f3369d7b1b3a993efacdd1c864..61e1263273bbf6dac1cd759109320e9b63e00bf3 100644 (file)
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -6,10 +6,13 @@ use Exception;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;

+use Illuminate\Http\Exceptions\PostTooLargeException;

 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;

+use Illuminate\Http\Response;

 use Illuminate\Validation\ValidationException;
 use Illuminate\Validation\ValidationException;

-use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\ErrorHandler\Error\FatalError;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;

 use Throwable;
 
 class Handler extends ExceptionHandler
 use Throwable;
 
 class Handler extends ExceptionHandler


@@ -17,16 +20,17 @@ class Handler extends ExceptionHandler
     /**
      * A list of the exception types that are not reported.
      *
     /**
      * A list of the exception types that are not reported.
      *

-     * @var array
+     * @var array<int, class-string<\Throwable>>

      */
     protected $dontReport = [
         NotFoundException::class,
      */
     protected $dontReport = [
         NotFoundException::class,

+        StoppedAuthenticationException::class,

     ];
 
     /**
     ];
 
     /**

-     * A list of the inputs that are never flashed for validation exceptions.
+     * A list of the inputs that are never flashed to the session on validation exceptions.

      *
      *

-     * @var array
+     * @var array<int, string>

      */
     protected $dontFlash = [
         'current_password',
      */
     protected $dontFlash = [
         'current_password',


@@ -34,6 +38,15 @@ class Handler extends ExceptionHandler
         'password_confirmation',
     ];
 
         'password_confirmation',
     ];
 

+    /**
+     * A function to run upon out of memory.
+     * If it returns a response, that will be provided back to the request
+     * upon an out of memory event.
+     *
+     * @var ?callable(): ?Response
+     */
+    protected $onOutOfMemory = null;
+

     /**
      * Report or log an exception.
      *
     /**
      * Report or log an exception.
      *


@@ -58,6 +71,17 @@ class Handler extends ExceptionHandler
      */
     public function render($request, Throwable $e)
     {
      */
     public function render($request, Throwable $e)
     {

+        if ($e instanceof FatalError && str_contains($e->getMessage(), 'bytes exhausted (tried to allocate') && $this->onOutOfMemory) {
+            $response = call_user_func($this->onOutOfMemory);
+            if ($response) {
+                return $response;
+            }
+        }
+
+        if ($e instanceof PostTooLargeException) {
+            $e = new NotifyException(trans('errors.server_post_limit'), '/', 413);
+        }
+

         if ($this->isApiRequest($request)) {
             return $this->renderApiException($e);
         }
         if ($this->isApiRequest($request)) {
             return $this->renderApiException($e);
         }


@@ -65,12 +89,30 @@ class Handler extends ExceptionHandler
         return parent::render($request, $e);
     }
 
         return parent::render($request, $e);
     }
 

+    /**
+     * Provide a function to be called when an out of memory event occurs.
+     * If the callable returns a response, this response will be returned
+     * to the request upon error.
+     */
+    public function prepareForOutOfMemory(callable $onOutOfMemory)
+    {
+        $this->onOutOfMemory = $onOutOfMemory;
+    }
+
+    /**
+     * Forget the current out of memory handler, if existing.
+     */
+    public function forgetOutOfMemoryHandler()
+    {
+        $this->onOutOfMemory = null;
+    }
+

     /**
      * Check if the given request is an API request.
      */
     protected function isApiRequest(Request $request): bool
     {
     /**
      * Check if the given request is an API request.
      */
     protected function isApiRequest(Request $request): bool
     {

-        return strpos($request->path(), 'api/') === 0;
+        return str_starts_with($request->path(), 'api/');

     }
 
     /**
     }
 
     /**


@@ -81,7 +123,7 @@ class Handler extends ExceptionHandler
         $code = 500;
         $headers = [];
 
         $code = 500;
         $headers = [];
 

-        if ($e instanceof HttpException) {
+        if ($e instanceof HttpExceptionInterface) {

             $code = $e->getStatusCode();
             $headers = $e->getHeaders();
         }
             $code = $e->getStatusCode();
             $headers = $e->getHeaders();
         }


@@ -97,14 +139,11 @@ class Handler extends ExceptionHandler
         ];
 
         if ($e instanceof ValidationException) {
         ];
 
         if ($e instanceof ValidationException) {

+            $responseData['error']['message'] = 'The given data was invalid.';

             $responseData['error']['validation'] = $e->errors();
             $code = $e->status;
         }
 
             $responseData['error']['validation'] = $e->errors();
             $code = $e->status;
         }
 

-        if (method_exists($e, 'getStatus')) {
-            $code = $e->getStatus();
-        }
-

         $responseData['error']['code'] = $code;
 
         return new JsonResponse($responseData, $code, $headers);
         $responseData['error']['code'] = $code;
 
         return new JsonResponse($responseData, $code, $headers);