Merge remote-tracking branch 'upstream/master'

[bookstack] / app / Exceptions / Handler.php

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 14d553ed0bb359b200dfc91a95bdc05ff92501ba..0eb62dc31aab20388e8047a39788ee0c3990e4dc 100644 (file)
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -3,12 +3,13 @@
 namespace BookStack\Exceptions;
 
 use Exception;
 namespace BookStack\Exceptions;
 
 use Exception;

-use Illuminate\Contracts\Validation\ValidationException;
+use Illuminate\Auth\AuthenticationException;
+use Illuminate\Validation\ValidationException;

 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;

-use PhpSpec\Exception\Example\ErrorException;

 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Auth\Access\AuthorizationException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Auth\Access\AuthorizationException;

+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 
 class Handler extends ExceptionHandler
 {
 
 class Handler extends ExceptionHandler
 {


@@ -26,10 +27,11 @@ class Handler extends ExceptionHandler
 
     /**
      * Report or log an exception.
 
     /**
      * Report or log an exception.

-     *

      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
      * @param  \Exception $e
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
      * @param  \Exception $e

+     * @return mixed
+     * @throws Exception

      */
     public function report(Exception $e)
     {
      */
     public function report(Exception $e)
     {


@@ -47,19 +49,81 @@ class Handler extends ExceptionHandler
     {
         // Handle notify exceptions which will redirect to the
         // specified location then show a notification message.
     {
         // Handle notify exceptions which will redirect to the
         // specified location then show a notification message.

-        if ($e instanceof NotifyException) {
-            \Session::flash('error', $e->message);
-            return response()->redirectTo($e->redirectLocation);
+        if ($this->isExceptionType($e, NotifyException::class)) {
+            session()->flash('error', $this->getOriginalMessage($e));
+            return redirect($e->redirectLocation);

         }
 
         // Handle pretty exceptions which will show a friendly application-fitting page
         // Which will include the basic message to point the user roughly to the cause.
         }
 
         // Handle pretty exceptions which will show a friendly application-fitting page
         // Which will include the basic message to point the user roughly to the cause.

-        if (($e instanceof PrettyException || $e->getPrevious() instanceof PrettyException)  && !config('app.debug')) {
-            $message = ($e instanceof PrettyException) ? $e->getMessage() : $e->getPrevious()->getMessage();
+        if ($this->isExceptionType($e, PrettyException::class)  && !config('app.debug')) {
+            $message = $this->getOriginalMessage($e);

             $code = ($e->getCode() === 0) ? 500 : $e->getCode();
             return response()->view('errors/' . $code, ['message' => $message], $code);
         }
 
             $code = ($e->getCode() === 0) ? 500 : $e->getCode();
             return response()->view('errors/' . $code, ['message' => $message], $code);
         }
 

+        // Handle 404 errors with a loaded session to enable showing user-specific information
+        if ($this->isExceptionType($e, NotFoundHttpException::class)) {
+            return \Route::respondWithRoute('fallback');
+        }
+

         return parent::render($request, $e);
     }
         return parent::render($request, $e);
     }

+
+    /**
+     * Check the exception chain to compare against the original exception type.
+     * @param Exception $e
+     * @param $type
+     * @return bool
+     */
+    protected function isExceptionType(Exception $e, $type)
+    {
+        do {
+            if (is_a($e, $type)) {
+                return true;
+            }
+        } while ($e = $e->getPrevious());
+        return false;
+    }
+
+    /**
+     * Get original exception message.
+     * @param Exception $e
+     * @return string
+     */
+    protected function getOriginalMessage(Exception $e)
+    {
+        do {
+            $message = $e->getMessage();
+        } while ($e = $e->getPrevious());
+        return $message;
+    }
+
+    /**
+     * Convert an authentication exception into an unauthenticated response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Auth\AuthenticationException  $exception
+     * @return \Illuminate\Http\Response
+     */
+    protected function unauthenticated($request, AuthenticationException $exception)
+    {
+        if ($request->expectsJson()) {
+            return response()->json(['error' => 'Unauthenticated.'], 401);
+        }
+
+        return redirect()->guest('login');
+    }
+
+    /**
+     * Convert a validation exception into a JSON response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Validation\ValidationException  $exception
+     * @return \Illuminate\Http\JsonResponse
+     */
+    protected function invalidJson($request, ValidationException $exception)
+    {
+        return response()->json($exception->errors(), $exception->status);
+    }

 }
 }