ExportFormatter: Add book description and check for empty book and chapter descriptio...

[bookstack] / app / Http / Kernel.php

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 64782fedcfbe3ce930fb8317c7e809eae79f8f5a..30714e2ac59ce6b2901a0ff579a0d5aebbd34295 100644 (file)
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -1,6 +1,7 @@
-<?php namespace BookStack\Http;
+<?php
+
+namespace BookStack\Http;

 
 

-use BookStack\Http\Middleware\ApiAuthenticate;

 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
 class Kernel extends HttpKernel
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
 class Kernel extends HttpKernel


@@ -10,29 +11,11 @@ class Kernel extends HttpKernel
      * These middleware are run during every request to your application.
      */
     protected $middleware = [
      * These middleware are run during every request to your application.
      */
     protected $middleware = [

-        \BookStack\Http\Middleware\CheckForMaintenanceMode::class,
+        \BookStack\Http\Middleware\PreventRequestsDuringMaintenance::class,

         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \BookStack\Http\Middleware\TrimStrings::class,
         \BookStack\Http\Middleware\TrustProxies::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \BookStack\Http\Middleware\TrimStrings::class,
         \BookStack\Http\Middleware\TrustProxies::class,

-
-    ];
-
-    /**
-     * The priority ordering of middleware.
-     */
-    protected $middlewarePriority = [
-        \BookStack\Http\Middleware\EncryptCookies::class,
-        \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-        \Illuminate\Session\Middleware\StartSession::class,
-        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-        \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        \BookStack\Http\Middleware\VerifyCsrfToken::class,
-        \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        \BookStack\Http\Middleware\Localization::class,
-        \BookStack\Http\Middleware\GlobalViewData::class,
-        \BookStack\Http\Middleware\Authenticate::class,
-        \BookStack\Http\Middleware\ApiAuthenticate::class,
-        \BookStack\Http\Middleware\ConfirmEmails::class,
+        \BookStack\Http\Middleware\PreventResponseCaching::class,

     ];
 
     /**
     ];
 
     /**


@@ -42,35 +25,36 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'web' => [
      */
     protected $middlewareGroups = [
         'web' => [

+            \BookStack\Http\Middleware\ApplyCspRules::class,

             \BookStack\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \BookStack\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,

-            \Illuminate\Session\Middleware\StartSession::class,
+            \BookStack\Http\Middleware\StartSessionExtended::class,

             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,

-            \Illuminate\Routing\Middleware\ThrottleRequests::class,

             \BookStack\Http\Middleware\VerifyCsrfToken::class,
             \BookStack\Http\Middleware\VerifyCsrfToken::class,

+            \BookStack\Http\Middleware\CheckEmailConfirmed::class,
+            \BookStack\Http\Middleware\RunThemeActions::class,

             \BookStack\Http\Middleware\Localization::class,
             \BookStack\Http\Middleware\Localization::class,

-            \BookStack\Http\Middleware\GlobalViewData::class,
-            \BookStack\Http\Middleware\ConfirmEmails::class,

         ],
         'api' => [
         ],
         'api' => [

-            'throttle:60,1',
+            \BookStack\Http\Middleware\ThrottleApiRequests::class,

             \BookStack\Http\Middleware\EncryptCookies::class,
             \BookStack\Http\Middleware\EncryptCookies::class,

-            \Illuminate\Session\Middleware\StartSession::class,
+            \BookStack\Http\Middleware\StartSessionIfCookieExists::class,

             \BookStack\Http\Middleware\ApiAuthenticate::class,
             \BookStack\Http\Middleware\ApiAuthenticate::class,

-            \BookStack\Http\Middleware\ConfirmEmails::class,
+            \BookStack\Http\Middleware\CheckEmailConfirmed::class,

         ],
     ];
 
     /**
         ],
     ];
 
     /**

-     * The application's route middleware.
+     * The application's middleware aliases.

      *
      * @var array
      */
      *
      * @var array
      */

-    protected $routeMiddleware = [
+    protected $middlewareAliases = [

         'auth'       => \BookStack\Http\Middleware\Authenticate::class,
         'auth'       => \BookStack\Http\Middleware\Authenticate::class,

-        'can'        => \Illuminate\Auth\Middleware\Authorize::class,
+        'can'        => \BookStack\Http\Middleware\CheckUserHasPermission::class,

         'guest'      => \BookStack\Http\Middleware\RedirectIfAuthenticated::class,
         'guest'      => \BookStack\Http\Middleware\RedirectIfAuthenticated::class,

-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'perm'       => \BookStack\Http\Middleware\PermissionMiddleware::class
+        'throttle'   => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'guard'      => \BookStack\Http\Middleware\CheckGuard::class,
+        'mfa-setup'  => \BookStack\Http\Middleware\AuthenticatedOrPendingMfa::class,

     ];
 }
     ];
 }