Addressed test failures from users API changes

[bookstack] / app / Http / Controllers / Controller.php

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 47b03b28d48aaa29610ef562635670af6adbb630..13a86f6f7c78672ef99cdab9dedb566d1b148cec 100644 (file)
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -2,21 +2,21 @@
 
 namespace BookStack\Http\Controllers;
 
 
 namespace BookStack\Http\Controllers;
 

+use BookStack\Exceptions\NotifyException;

 use BookStack\Facades\Activity;
 use BookStack\Interfaces\Loggable;
 use BookStack\Facades\Activity;
 use BookStack\Interfaces\Loggable;

-use BookStack\HasCreatorAndUpdater;

 use BookStack\Model;
 use BookStack\Model;

-use finfo;
+use BookStack\Util\WebSafeMimeSniffer;

 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;

-use Illuminate\Http\Exceptions\HttpResponseException;

 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response;
 use Illuminate\Routing\Controller as BaseController;
 
 abstract class Controller extends BaseController
 {
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response;
 use Illuminate\Routing\Controller as BaseController;
 
 abstract class Controller extends BaseController
 {

-    use DispatchesJobs, ValidatesRequests;
+    use DispatchesJobs;
+    use ValidatesRequests;

 
     /**
      * Check if the current user is signed in.
 
     /**
      * Check if the current user is signed in.


@@ -48,17 +48,13 @@ abstract class Controller extends BaseController
     /**
      * On a permission error redirect to home and display.
      * the error as a notification.
     /**
      * On a permission error redirect to home and display.
      * the error as a notification.

+     *
+     * @return never

      */
     protected function showPermissionError()
     {
      */
     protected function showPermissionError()
     {

-        if (request()->wantsJson()) {
-            $response = response()->json(['error' => trans('errors.permissionJson')], 403);
-        } else {
-            $response = redirect('/');
-            $this->showErrorNotification(trans('errors.permission'));
-        }
-
-        throw new HttpResponseException($response);
+        $message = request()->wantsJson() ? trans('errors.permissionJson') : trans('errors.permission');
+        throw new NotifyException($message, '/', 403);

     }
 
     /**
     }
 
     /**


@@ -106,7 +102,7 @@ abstract class Controller extends BaseController
     /**
      * Send back a json error message.
      */
     /**
      * Send back a json error message.
      */

-    protected function jsonError(string $messageText = "", int $statusCode = 500): JsonResponse
+    protected function jsonError(string $messageText = '', int $statusCode = 500): JsonResponse

     {
         return response()->json(['message' => $messageText, 'status' => 'error'], $statusCode);
     }
     {
         return response()->json(['message' => $messageText, 'status' => 'error'], $statusCode);
     }


@@ -117,8 +113,9 @@ abstract class Controller extends BaseController
     protected function downloadResponse(string $content, string $fileName): Response
     {
         return response()->make($content, 200, [
     protected function downloadResponse(string $content, string $fileName): Response
     {
         return response()->make($content, 200, [

-            'Content-Type'        => 'application/octet-stream',
-            'Content-Disposition' => 'attachment; filename="' . $fileName . '"'
+            'Content-Type'           => 'application/octet-stream',
+            'Content-Disposition'    => 'attachment; filename="' . $fileName . '"',
+            'X-Content-Type-Options' => 'nosniff',

         ]);
     }
 
         ]);
     }
 


@@ -128,11 +125,12 @@ abstract class Controller extends BaseController
      */
     protected function inlineDownloadResponse(string $content, string $fileName): Response
     {
      */
     protected function inlineDownloadResponse(string $content, string $fileName): Response
     {

-        $finfo = new finfo(FILEINFO_MIME_TYPE);
-        $mime = $finfo->buffer($content) ?: 'application/octet-stream';
+        $mime = (new WebSafeMimeSniffer())->sniff($content);
+

         return response()->make($content, 200, [
         return response()->make($content, 200, [

-            'Content-Type'        => $mime,
-            'Content-Disposition' => 'inline; filename="' . $fileName . '"'
+            'Content-Type'           => $mime,
+            'Content-Disposition'    => 'inline; filename="' . $fileName . '"',
+            'X-Content-Type-Options' => 'nosniff',

         ]);
     }
 
         ]);
     }
 


@@ -162,7 +160,8 @@ abstract class Controller extends BaseController
 
     /**
      * Log an activity in the system.
 
     /**
      * Log an activity in the system.

-     * @param string|Loggable
+     *
+     * @param string|Loggable $detail

      */
     protected function logActivity(string $type, $detail = ''): void
     {
      */
     protected function logActivity(string $type, $detail = ''): void
     {


@@ -172,8 +171,8 @@ abstract class Controller extends BaseController
     /**
      * Get the validation rules for image files.
      */
     /**
      * Get the validation rules for image files.
      */

-    protected function getImageValidationRules(): string
+    protected function getImageValidationRules(): array

     {
     {

-        return 'image_extension|mimes:jpeg,png,gif,webp';
+        return ['image_extension', 'mimes:jpeg,png,gif,webp', 'max:' . (config('app.upload_limit') * 1000)];

     }
 }
     }
 }