Added method for using enity ownership in relation queries

It has a large linear-entity-scaling performance impact though.

.env.example.complete

@@ -80,9 +80,6 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
-# Command to use when email is sent via sendmail
-MAIL_SENDMAIL_COMMAND="/usr/sbin/sendmail -bs"
-
 # Cache & Session driver to use
 # Can be 'file', 'database', 'memcached' or 'redis'
 CACHE_DRIVER=file
@@ -271,7 +268,6 @@ OIDC_DUMP_USER_DETAILS=false
 OIDC_USER_TO_GROUPS=false
 OIDC_GROUPS_CLAIM=groups
 OIDC_REMOVE_FROM_GROUPS=false
-OIDC_EXTERNAL_ID_CLAIM=sub
 
 # Disable default third-party services such as Gravatar and Draw.IO
 # Service-specific options will override this option

.github/translators.txt

@@ -176,7 +176,7 @@ Alexander Predl (Harveyhase68) :: German
 Rem (Rem9000) :: Dutch
 Michał Stelmach (stelmach-web) :: Polish
 arniom :: French
-REMOVED_USER :: ; French; Dutch; Turkish
+REMOVED_USER :: ; Dutch; Turkish
 林祖年 (contagion) :: Chinese Traditional
 Siamak Guodarzi (siamakgoudarzi88) :: Persian
 Lis Maestrelo (lismtrl) :: Portuguese, Brazilian
@@ -283,13 +283,13 @@ Kuchinashi Hoshikawa (kuchinashi) :: Chinese Simplified
 digilady :: Greek
 Linus (LinusOP) :: Swedish
 Felipe Cardoso (felipecardosoruff) :: Portuguese, Brazilian
-RandomUser0815 :: German Informal; German
+RandomUser0815 :: German
 Ismael Mesquita (mesquitoliveira) :: Portuguese, Brazilian
 구인회 (laskdjlaskdj12) :: Korean
 LiZerui (CNLiZerui) :: Chinese Traditional
 Fabrice Boyer (FabriceBoyer) :: French
 mikael (bitcanon) :: Swedish
-Matthias Mai (schnapsidee) :: German; German Informal
+Matthias Mai (schnapsidee) :: German
 Ufuk Ayyıldız (ufukayyildiz) :: Turkish
 Jan Mitrof (jan.kachlik) :: Czech
 edwardsmirnov :: Russian
@@ -298,25 +298,3 @@ shotu :: French
 Cesar_Lopez_Aguillon :: Spanish
 bdewoop :: German
 dina davoudi (dina.davoudi) :: Persian
-Angelos Chouvardas (achouvardas) :: Greek
-rndrss :: Portuguese, Brazilian
-rirac294 :: Russian
-David Furman (thefourCraft) :: Hebrew
-Pafzedog :: French
-Yllelder :: Spanish
-Adrian Ocneanu (aocneanu) :: Romanian
-Eduardo Castanho (EduardoCastanho) :: Portuguese
-VIET NAM VPS (vietnamvps) :: Vietnamese
-m4tthi4s :: French
-toras9000 :: Japanese
-pathab :: German
-MichelSchoon85 :: Dutch
-Jøran Haugli (haugli92) :: Norwegian Bokmal
-Vasileios Kouvelis (VasilisKouvelis) :: Greek
-Dremski :: Bulgarian
-Frédéric SENE (nothingfr) :: French
-bendem :: French
-kostasdizas :: Greek
-Ricardo Schroeder (brownstone666) :: Portuguese, Brazilian
-Eitan MG (EitanMG) :: Hebrew
-Robin Flikkema (RobinFlikkema) :: Dutch

.github/workflows/test-migrations.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php: ['8.0', '8.1', '8.2']
+        php: ['7.4', '8.0', '8.1', '8.2']
     steps:
       - uses: actions/checkout@v1
 

.github/workflows/test-php.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php: ['8.0', '8.1', '8.2']
+        php: ['7.4', '8.0', '8.1', '8.2']
     steps:
     - uses: actions/checkout@v1
 
@@ -16,7 +16,7 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
-        extensions: gd, mbstring, json, curl, xml, mysql, ldap, gmp
+        extensions: gd, mbstring, json, curl, xml, mysql, ldap
 
     - name: Get Composer Cache Directory
       id: composer-cache

.gitignore

@@ -5,13 +5,12 @@ Homestead.yaml
 .idea
 npm-debug.log
 yarn-error.log
-/public/dist/*.map
+/public/dist
 /public/plugins
-/public/css/*.map
-/public/js/*.map
+/public/css
+/public/js
 /public/bower
 /public/build/
-/public/favicon.ico
 /storage/images
 _ide_helper.php
 /storage/debugbar

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2023, Dan Brown and the BookStack Project contributors.
+Copyright (c) 2015-2022, Dan Brown and the BookStack Project contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

app/Actions/Activity.php

@@ -2,12 +2,10 @@
 
 namespace BookStack\Actions;
 
-use BookStack\Auth\Permissions\JointPermission;
 use BookStack\Auth\User;
 use BookStack\Entities\Models\Entity;
 use BookStack\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Support\Str;
 
@@ -42,12 +40,6 @@ class Activity extends Model
         return $this->belongsTo(User::class);
     }
 
-    public function jointPermissions(): HasMany
-    {
-        return $this->hasMany(JointPermission::class, 'entity_id', 'entity_id')
-            ->whereColumn('activities.entity_type', '=', 'joint_permissions.entity_type');
-    }
-
     /**
      * Returns text from the language files, Looks up by using the activity key.
      */

app/Actions/ActivityQueries.php

@@ -15,6 +15,8 @@ class ActivityQueries
 {
     protected PermissionApplicator $permissions;
 
+    protected array $fieldsForLists = ['id', 'type', 'detail', 'activities.entity_type', 'activities.entity_id', 'user_id', 'created_at'];
+
     public function __construct(PermissionApplicator $permissions)
     {
         $this->permissions = $permissions;
@@ -25,9 +27,11 @@ class ActivityQueries
      */
     public function latest(int $count = 20, int $page = 0): array
     {
+        $query = Activity::query()->select($this->fieldsForLists);
         $activityList = $this->permissions
-            ->restrictEntityRelationQuery(Activity::query(), 'activities', 'entity_id', 'entity_type')
+            ->restrictEntityRelationQuery($query, 'activities', 'entity_id', 'entity_type')
             ->orderBy('created_at', 'desc')
+            ->whereNotNull('activities.entity_id')
             ->with(['user', 'entity'])
             ->skip($count * $page)
             ->take($count)
@@ -78,10 +82,12 @@ class ActivityQueries
      */
     public function userActivity(User $user, int $count = 20, int $page = 0): array
     {
+        $query = Activity::query()->select($this->fieldsForLists);
         $activityList = $this->permissions
-            ->restrictEntityRelationQuery(Activity::query(), 'activities', 'entity_id', 'entity_type')
+            ->restrictEntityRelationQuery($query, 'activities', 'entity_id', 'entity_type')
             ->orderBy('created_at', 'desc')
             ->where('user_id', '=', $user->id)
+            ->whereNotNull('activities.entity_id')
             ->skip($count * $page)
             ->take($count)
             ->get();

app/Actions/Favourite.php

@@ -2,9 +2,7 @@
 
 namespace BookStack\Actions;
 
-use BookStack\Auth\Permissions\JointPermission;
 use BookStack\Model;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 class Favourite extends Model
@@ -18,10 +16,4 @@ class Favourite extends Model
     {
         return $this->morphTo();
     }
-
-    public function jointPermissions(): HasMany
-    {
-        return $this->hasMany(JointPermission::class, 'entity_id', 'favouritable_id')
-            ->whereColumn('favourites.favouritable_type', '=', 'joint_permissions.entity_type');
-    }
 }

app/Actions/Tag.php

@@ -2,10 +2,8 @@
 
 namespace BookStack\Actions;
 
-use BookStack\Auth\Permissions\JointPermission;
 use BookStack\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
@@ -29,12 +27,6 @@ class Tag extends Model
         return $this->morphTo('entity');
     }
 
-    public function jointPermissions(): HasMany
-    {
-        return $this->hasMany(JointPermission::class, 'entity_id', 'entity_id')
-            ->whereColumn('tags.entity_type', '=', 'joint_permissions.entity_type');
-    }
-
     /**
      * Get a full URL to start a tag name search for this tag name.
      */

app/Actions/TagRepo.php

@@ -11,9 +11,11 @@ use Illuminate\Support\Facades\DB;
 
 class TagRepo
 {
-    public function __construct(
-        protected PermissionApplicator $permissions
-    ) {
+    protected PermissionApplicator $permissions;
+
+    public function __construct(PermissionApplicator $permissions)
+    {
+        $this->permissions = $permissions;
     }
 
     /**
@@ -27,15 +29,16 @@ class TagRepo
             $sort = 'value';
         }
 
+        $entityTypeCol = DB::getTablePrefix() . 'tags.entity_type';
         $query = Tag::query()
             ->select([
                 'name',
                 ($searchTerm || $nameFilter) ? 'value' : DB::raw('COUNT(distinct value) as `values`'),
                 DB::raw('COUNT(id) as usages'),
-                DB::raw('SUM(IF(entity_type = \'page\', 1, 0)) as page_count'),
-                DB::raw('SUM(IF(entity_type = \'chapter\', 1, 0)) as chapter_count'),
-                DB::raw('SUM(IF(entity_type = \'book\', 1, 0)) as book_count'),
-                DB::raw('SUM(IF(entity_type = \'bookshelf\', 1, 0)) as shelf_count'),
+                DB::raw("SUM(IF({$entityTypeCol} = 'page', 1, 0)) as page_count"),
+                DB::raw("SUM(IF({$entityTypeCol} = 'chapter', 1, 0)) as chapter_count"),
+                DB::raw("SUM(IF({$entityTypeCol} = 'book', 1, 0)) as book_count"),
+                DB::raw("SUM(IF({$entityTypeCol} = 'bookshelf', 1, 0)) as shelf_count"),
             ])
             ->orderBy($sort, $listOptions->getOrder());
 
@@ -88,7 +91,6 @@ class TagRepo
     {
         $query = Tag::query()
             ->select('*', DB::raw('count(*) as count'))
-            ->where('value', '!=', '')
             ->groupBy('value');
 
         if ($searchTerm) {

app/Actions/View.php

@@ -2,10 +2,8 @@
 
 namespace BookStack\Actions;
 
-use BookStack\Auth\Permissions\JointPermission;
 use BookStack\Interfaces\Viewable;
 use BookStack\Model;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
@@ -30,12 +28,6 @@ class View extends Model
         return $this->morphTo();
     }
 
-    public function jointPermissions(): HasMany
-    {
-        return $this->hasMany(JointPermission::class, 'entity_id', 'viewable_id')
-            ->whereColumn('views.viewable_type', '=', 'joint_permissions.entity_type');
-    }
-
     /**
      * Increment the current user's view count for the given viewable model.
      */

app/Auth/Access/Oidc/OidcService.php

@@ -198,8 +198,7 @@ class OidcService
      */
     protected function getUserDetails(OidcIdToken $token): array
     {
-        $idClaim = $this->config()['external_id_claim'];
-        $id = $token->getClaim($idClaim);
+        $id = $token->getClaim('sub');
 
         return [
             'external_id' => $id,

app/Auth/Permissions/CollapsedPermission.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace BookStack\Auth\Permissions;
+
+use BookStack\Model;
+
+/**
+ * @property int $id
+ * @property ?int $role_id
+ * @property ?int $user_id
+ * @property string $entity_type
+ * @property int $entity_id
+ * @property bool $view
+ */
+class CollapsedPermission extends Model
+{
+    protected $table = 'entity_permissions_collapsed';
+}

app/Auth/Permissions/CollapsedPermissionBuilder.php

@@ -0,0 +1,278 @@
+<?php
+
+namespace BookStack\Auth\Permissions;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\BookChild;
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\Page;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection as EloquentCollection;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * Collapsed permissions act as a "flattened" view of entity-level permissions in the system
+ * so inheritance does not have to managed as part of permission querying.
+ */
+class CollapsedPermissionBuilder
+{
+    /**
+     * Re-generate all collapsed permissions from scratch.
+     */
+    public function rebuildForAll()
+    {
+        DB::table('entity_permissions_collapsed')->truncate();
+
+        // Chunk through all books
+        $this->bookFetchQuery()->chunk(5, function (EloquentCollection $books) {
+            $this->buildForBooks($books, false);
+        });
+
+        // Chunk through all bookshelves
+        Bookshelf::query()->withTrashed()
+            ->select(['id'])
+            ->chunk(50, function (EloquentCollection $shelves) {
+                $this->generateCollapsedPermissions($shelves->all());
+            });
+    }
+
+    /**
+     * Rebuild the collapsed permissions for a particular entity.
+     */
+    public function rebuildForEntity(Entity $entity)
+    {
+        $entities = [$entity];
+        if ($entity instanceof Book) {
+            $books = $this->bookFetchQuery()->where('id', '=', $entity->id)->get();
+            $this->buildForBooks($books, true);
+
+            return;
+        }
+
+        /** @var BookChild $entity */
+        if ($entity->book) {
+            $entities[] = $entity->book;
+        }
+
+        if ($entity instanceof Page && $entity->chapter_id) {
+            $entities[] = $entity->chapter;
+        }
+
+        if ($entity instanceof Chapter) {
+            foreach ($entity->pages as $page) {
+                $entities[] = $page;
+            }
+        }
+
+        $this->buildForEntities($entities);
+    }
+
+    /**
+     * Get a query for fetching a book with its children.
+     */
+    protected function bookFetchQuery(): Builder
+    {
+        return Book::query()->withTrashed()
+            ->select(['id'])->with([
+                'chapters' => function ($query) {
+                    $query->withTrashed()->select(['id', 'book_id']);
+                },
+                'pages' => function ($query) {
+                    $query->withTrashed()->select(['id', 'book_id', 'chapter_id']);
+                },
+            ]);
+    }
+
+    /**
+     * Build collapsed permissions for the given books.
+     */
+    protected function buildForBooks(EloquentCollection $books, bool $deleteOld)
+    {
+        $entities = clone $books;
+
+        /** @var Book $book */
+        foreach ($books->all() as $book) {
+            foreach ($book->getRelation('chapters') as $chapter) {
+                $entities->push($chapter);
+            }
+            foreach ($book->getRelation('pages') as $page) {
+                $entities->push($page);
+            }
+        }
+
+        if ($deleteOld) {
+            $this->deleteForEntities($entities->all());
+        }
+
+        $this->generateCollapsedPermissions($entities->all());
+    }
+
+    /**
+     * Rebuild the collapsed permissions for a collection of entities.
+     */
+    protected function buildForEntities(array $entities)
+    {
+        $this->deleteForEntities($entities);
+        $this->generateCollapsedPermissions($entities);
+    }
+
+    /**
+     * Delete the stored collapsed permissions for a list of entities.
+     *
+     * @param Entity[] $entities
+     */
+    protected function deleteForEntities(array $entities)
+    {
+        $simpleEntities = $this->entitiesToSimpleEntities($entities);
+        $idsByType = $this->entitiesToTypeIdMap($simpleEntities);
+
+        DB::transaction(function () use ($idsByType) {
+            foreach ($idsByType as $type => $ids) {
+                foreach (array_chunk($ids, 1000) as $idChunk) {
+                    DB::table('entity_permissions_collapsed')
+                        ->where('entity_type', '=', $type)
+                        ->whereIn('entity_id', $idChunk)
+                        ->delete();
+                }
+            }
+        });
+    }
+
+    /**
+     * Convert the given list of entities into "SimpleEntityData" representations
+     * for faster usage and property access.
+     *
+     * @param Entity[] $entities
+     *
+     * @return SimpleEntityData[]
+     */
+    protected function entitiesToSimpleEntities(array $entities): array
+    {
+        $simpleEntities = [];
+
+        foreach ($entities as $entity) {
+            $attrs = $entity->getAttributes();
+            $simple = new SimpleEntityData();
+            $simple->id = $attrs['id'];
+            $simple->type = $entity->getMorphClass();
+            $simple->book_id = $attrs['book_id'] ?? null;
+            $simple->chapter_id = $attrs['chapter_id'] ?? null;
+            $simpleEntities[] = $simple;
+        }
+
+        return $simpleEntities;
+    }
+
+    /**
+     * Create & Save collapsed entity permissions.
+     *
+     * @param Entity[] $originalEntities
+     */
+    protected function generateCollapsedPermissions(array $originalEntities)
+    {
+        $entities = $this->entitiesToSimpleEntities($originalEntities);
+        $collapsedPermData = [];
+
+        // Fetch related entity permissions
+        $permissions = $this->getEntityPermissionsForEntities($entities);
+
+        // Create a mapping of explicit entity permissions
+        $permissionMap = new EntityPermissionMap($permissions);
+
+        // Create Joint Permission Data
+        foreach ($entities as $entity) {
+            array_push($collapsedPermData, ...$this->createCollapsedPermissionData($entity, $permissionMap));
+        }
+
+        DB::transaction(function () use ($collapsedPermData) {
+            foreach (array_chunk($collapsedPermData, 1000) as $dataChunk) {
+                DB::table('entity_permissions_collapsed')->insert($dataChunk);
+            }
+        });
+    }
+
+    /**
+     * Create collapsed permission data for the given entity using the given permission map.
+     */
+    protected function createCollapsedPermissionData(SimpleEntityData $entity, EntityPermissionMap $permissionMap): array
+    {
+        $chain = [
+            $entity->type . ':' . $entity->id,
+            $entity->chapter_id ? ('chapter:' . $entity->chapter_id) : null,
+            $entity->book_id ? ('book:' . $entity->book_id) : null,
+        ];
+
+        $permissionData = [];
+        $overridesApplied = [];
+
+        foreach ($chain as $entityTypeId) {
+            if ($entityTypeId === null) {
+                continue;
+            }
+
+            $permissions = $permissionMap->getForEntity($entityTypeId);
+            foreach ($permissions as $permission) {
+                $related = $permission->getAssignedType() . ':' . $permission->getAssignedTypeId();
+                if (!isset($overridesApplied[$related])) {
+                    $permissionData[] = [
+                        'role_id' => $permission->role_id,
+                        'user_id' => $permission->user_id,
+                        'view' => $permission->view,
+                        'entity_type' => $entity->type,
+                        'entity_id' => $entity->id,
+                    ];
+                    $overridesApplied[$related] = true;
+                }
+            }
+        }
+
+        return $permissionData;
+    }
+
+    /**
+     * From the given entity list, provide back a mapping of entity types to
+     * the ids of that given type. The type used is the DB morph class.
+     *
+     * @param SimpleEntityData[] $entities
+     *
+     * @return array<string, int[]>
+     */
+    protected function entitiesToTypeIdMap(array $entities): array
+    {
+        $idsByType = [];
+
+        foreach ($entities as $entity) {
+            if (!isset($idsByType[$entity->type])) {
+                $idsByType[$entity->type] = [];
+            }
+
+            $idsByType[$entity->type][] = $entity->id;
+        }
+
+        return $idsByType;
+    }
+
+    /**
+     * Get the entity permissions for all the given entities.
+     *
+     * @param SimpleEntityData[] $entities
+     *
+     * @return EntityPermission[]
+     */
+    protected function getEntityPermissionsForEntities(array $entities): array
+    {
+        $idsByType = $this->entitiesToTypeIdMap($entities);
+        $permissionFetch = EntityPermission::query()
+            ->where(function (Builder $query) use ($idsByType) {
+                foreach ($idsByType as $type => $ids) {
+                    $query->orWhere(function (Builder $query) use ($type, $ids) {
+                        $query->where('entity_type', '=', $type)->whereIn('entity_id', $ids);
+                    });
+                }
+            });
+
+        return $permissionFetch->get()->all();
+    }
+}

app/Auth/Permissions/EntityPermission.php

@@ -3,13 +3,14 @@
 namespace BookStack\Auth\Permissions;
 
 use BookStack\Auth\Role;
+use BookStack\Auth\User;
 use BookStack\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
  * @property int $id
  * @property int $role_id
+ * @property int $user_id
  * @property int $entity_id
  * @property string $entity_type
  * @property boolean $view
@@ -21,17 +22,9 @@ class EntityPermission extends Model
 {
     public const PERMISSIONS = ['view', 'create', 'update', 'delete'];
 
-    protected $fillable = ['role_id', 'view', 'create', 'update', 'delete'];
+    protected $fillable = ['role_id', 'user_id', 'view', 'create', 'update', 'delete'];
     public $timestamps = false;
 
-    /**
-     * Get this restriction's attached entity.
-     */
-    public function restrictable(): MorphTo
-    {
-        return $this->morphTo('restrictable');
-    }
-
     /**
      * Get the role assigned to this entity permission.
      */
@@ -39,4 +32,38 @@ class EntityPermission extends Model
     {
         return $this->belongsTo(Role::class);
     }
+
+    /**
+     * Get the user assigned to this entity permission.
+     */
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    /**
+     * Get the type of entity permission this is.
+     * Will be one of: user, role, fallback
+     */
+    public function getAssignedType(): string
+    {
+        if ($this->user_id) {
+            return 'user';
+        }
+
+        if ($this->role_id) {
+            return 'role';
+        }
+
+        return 'fallback';
+    }
+
+    /**
+     * Get the ID for the assigned type of permission.
+     * (Role/User ID). Defaults to 0 for fallback.
+     */
+    public function getAssignedTypeId(): int
+    {
+        return $this->user_id ?? $this->role_id ?? 0;
+    }
 }

app/Auth/Permissions/EntityPermissionEvaluator.php

@@ -1,141 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Permissions;
-
-use BookStack\Auth\Role;
-use BookStack\Entities\Models\Entity;
-use Illuminate\Database\Eloquent\Builder;
-
-class EntityPermissionEvaluator
-{
-    protected string $action;
-
-    public function __construct(string $action)
-    {
-        $this->action = $action;
-    }
-
-    public function evaluateEntityForUser(Entity $entity, array $userRoleIds): ?bool
-    {
-        if ($this->isUserSystemAdmin($userRoleIds)) {
-            return true;
-        }
-
-        $typeIdChain = $this->gatherEntityChainTypeIds(SimpleEntityData::fromEntity($entity));
-        $relevantPermissions = $this->getPermissionsMapByTypeId($typeIdChain, [...$userRoleIds, 0]);
-        $permitsByType = $this->collapseAndCategorisePermissions($typeIdChain, $relevantPermissions);
-
-        $status = $this->evaluatePermitsByType($permitsByType);
-
-        return is_null($status) ? null : $status === PermissionStatus::IMPLICIT_ALLOW || $status === PermissionStatus::EXPLICIT_ALLOW;
-    }
-
-    /**
-     * @param array<string, array<string, int>> $permitsByType
-     */
-    protected function evaluatePermitsByType(array $permitsByType): ?int
-    {
-        // Return grant or reject from role-level if exists
-        if (count($permitsByType['role']) > 0) {
-            return max($permitsByType['role']) ? PermissionStatus::EXPLICIT_ALLOW : PermissionStatus::EXPLICIT_DENY;
-        }
-
-        // Return fallback permission if exists
-        if (count($permitsByType['fallback']) > 0) {
-            return $permitsByType['fallback'][0] ? PermissionStatus::IMPLICIT_ALLOW : PermissionStatus::IMPLICIT_DENY;
-        }
-
-        return null;
-    }
-
-    /**
-     * @param string[] $typeIdChain
-     * @param array<string, EntityPermission[]> $permissionMapByTypeId
-     * @return array<string, array<string, int>>
-     */
-    protected function collapseAndCategorisePermissions(array $typeIdChain, array $permissionMapByTypeId): array
-    {
-        $permitsByType = ['fallback' => [], 'role' => []];
-
-        foreach ($typeIdChain as $typeId) {
-            $permissions = $permissionMapByTypeId[$typeId] ?? [];
-            foreach ($permissions as $permission) {
-                $roleId = $permission->role_id;
-                $type = $roleId === 0 ? 'fallback' : 'role';
-                if (!isset($permitsByType[$type][$roleId])) {
-                    $permitsByType[$type][$roleId] = $permission->{$this->action};
-                }
-            }
-
-            if (isset($permitsByType['fallback'][0])) {
-                break;
-            }
-        }
-
-        return $permitsByType;
-    }
-
-    /**
-     * @param string[] $typeIdChain
-     * @return array<string, EntityPermission[]>
-     */
-    protected function getPermissionsMapByTypeId(array $typeIdChain, array $filterRoleIds): array
-    {
-        $query = EntityPermission::query()->where(function (Builder $query) use ($typeIdChain) {
-            foreach ($typeIdChain as $typeId) {
-                $query->orWhere(function (Builder $query) use ($typeId) {
-                    [$type, $id] = explode(':', $typeId);
-                    $query->where('entity_type', '=', $type)
-                        ->where('entity_id', '=', $id);
-                });
-            }
-        });
-
-        if (!empty($filterRoleIds)) {
-            $query->where(function (Builder $query) use ($filterRoleIds) {
-                $query->whereIn('role_id', [...$filterRoleIds, 0]);
-            });
-        }
-
-        $relevantPermissions = $query->get(['entity_id', 'entity_type', 'role_id', $this->action])->all();
-
-        $map = [];
-        foreach ($relevantPermissions as $permission) {
-            $key = $permission->entity_type . ':' . $permission->entity_id;
-            if (!isset($map[$key])) {
-                $map[$key] = [];
-            }
-
-            $map[$key][] = $permission;
-        }
-
-        return $map;
-    }
-
-    /**
-     * @return string[]
-     */
-    protected function gatherEntityChainTypeIds(SimpleEntityData $entity): array
-    {
-        // The array order here is very important due to the fact we walk up the chain
-        // elsewhere in the class. Earlier items in the chain have higher priority.
-
-        $chain = [$entity->type . ':' . $entity->id];
-
-        if ($entity->type === 'page' && $entity->chapter_id) {
-            $chain[] = 'chapter:' . $entity->chapter_id;
-        }
-
-        if ($entity->type === 'page' || $entity->type === 'chapter') {
-            $chain[] = 'book:' . $entity->book_id;
-        }
-
-        return $chain;
-    }
-
-    protected function isUserSystemAdmin($userRoleIds): bool
-    {
-        $adminRoleId = Role::getSystemRole('admin')->id;
-        return in_array($adminRoleId, $userRoleIds);
-    }
-}

app/Auth/Permissions/EntityPermissionMap.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace BookStack\Auth\Permissions;
+
+class EntityPermissionMap
+{
+    protected array $map = [];
+
+    /**
+     * @param EntityPermission[] $permissions
+     */
+    public function __construct(array $permissions = [])
+    {
+        foreach ($permissions as $entityPermission) {
+            $this->addPermission($entityPermission);
+        }
+    }
+
+    protected function addPermission(EntityPermission $permission)
+    {
+        $entityCombinedId = $permission->entity_type . ':' . $permission->entity_id;
+
+        if (!isset($this->map[$entityCombinedId])) {
+            $this->map[$entityCombinedId] = [];
+        }
+
+        $this->map[$entityCombinedId][] = $permission;
+    }
+
+    /**
+     * @return EntityPermission[]
+     */
+    public function getForEntity(string $typeIdString): array
+    {
+        return $this->map[$typeIdString] ?? [];
+    }
+}

app/Auth/Permissions/JointPermission.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Permissions;
-
-use BookStack\Auth\Role;
-use BookStack\Entities\Models\Entity;
-use BookStack\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\MorphOne;
-
-class JointPermission extends Model
-{
-    protected $primaryKey = null;
-    public $timestamps = false;
-
-    /**
-     * Get the role that this points to.
-     */
-    public function role(): BelongsTo
-    {
-        return $this->belongsTo(Role::class);
-    }
-
-    /**
-     * Get the entity this points to.
-     */
-    public function entity(): MorphOne
-    {
-        return $this->morphOne(Entity::class, 'entity');
-    }
-}

app/Auth/Permissions/JointPermissionBuilder.php

@@ -1,292 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Permissions;
-
-use BookStack\Auth\Role;
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\BookChild;
-use BookStack\Entities\Models\Bookshelf;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\Page;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection as EloquentCollection;
-use Illuminate\Support\Facades\DB;
-
-/**
- * Joint permissions provide a pre-query "cached" table of view permissions for all core entity
- * types for all roles in the system. This class generates out that table for different scenarios.
- */
-class JointPermissionBuilder
-{
-    /**
-     * Re-generate all entity permission from scratch.
-     */
-    public function rebuildForAll()
-    {
-        JointPermission::query()->truncate();
-
-        // Get all roles (Should be the most limited dimension)
-        $roles = Role::query()->with('permissions')->get()->all();
-
-        // Chunk through all books
-        $this->bookFetchQuery()->chunk(5, function (EloquentCollection $books) use ($roles) {
-            $this->buildJointPermissionsForBooks($books, $roles);
-        });
-
-        // Chunk through all bookshelves
-        Bookshelf::query()->withTrashed()->select(['id', 'owned_by'])
-            ->chunk(50, function (EloquentCollection $shelves) use ($roles) {
-                $this->createManyJointPermissions($shelves->all(), $roles);
-            });
-    }
-
-    /**
-     * Rebuild the entity jointPermissions for a particular entity.
-     */
-    public function rebuildForEntity(Entity $entity)
-    {
-        $entities = [$entity];
-        if ($entity instanceof Book) {
-            $books = $this->bookFetchQuery()->where('id', '=', $entity->id)->get();
-            $this->buildJointPermissionsForBooks($books, Role::query()->with('permissions')->get()->all(), true);
-
-            return;
-        }
-
-        /** @var BookChild $entity */
-        if ($entity->book) {
-            $entities[] = $entity->book;
-        }
-
-        if ($entity instanceof Page && $entity->chapter_id) {
-            $entities[] = $entity->chapter;
-        }
-
-        if ($entity instanceof Chapter) {
-            foreach ($entity->pages as $page) {
-                $entities[] = $page;
-            }
-        }
-
-        $this->buildJointPermissionsForEntities($entities);
-    }
-
-    /**
-     * Build the entity jointPermissions for a particular role.
-     */
-    public function rebuildForRole(Role $role)
-    {
-        $roles = [$role];
-        $role->jointPermissions()->delete();
-        $role->load('permissions');
-
-        // Chunk through all books
-        $this->bookFetchQuery()->chunk(20, function ($books) use ($roles) {
-            $this->buildJointPermissionsForBooks($books, $roles);
-        });
-
-        // Chunk through all bookshelves
-        Bookshelf::query()->select(['id', 'owned_by'])
-            ->chunk(50, function ($shelves) use ($roles) {
-                $this->createManyJointPermissions($shelves->all(), $roles);
-            });
-    }
-
-    /**
-     * Get a query for fetching a book with its children.
-     */
-    protected function bookFetchQuery(): Builder
-    {
-        return Book::query()->withTrashed()
-            ->select(['id', 'owned_by'])->with([
-                'chapters' => function ($query) {
-                    $query->withTrashed()->select(['id', 'owned_by', 'book_id']);
-                },
-                'pages' => function ($query) {
-                    $query->withTrashed()->select(['id', 'owned_by', 'book_id', 'chapter_id']);
-                },
-            ]);
-    }
-
-    /**
-     * Build joint permissions for the given book and role combinations.
-     */
-    protected function buildJointPermissionsForBooks(EloquentCollection $books, array $roles, bool $deleteOld = false)
-    {
-        $entities = clone $books;
-
-        /** @var Book $book */
-        foreach ($books->all() as $book) {
-            foreach ($book->getRelation('chapters') as $chapter) {
-                $entities->push($chapter);
-            }
-            foreach ($book->getRelation('pages') as $page) {
-                $entities->push($page);
-            }
-        }
-
-        if ($deleteOld) {
-            $this->deleteManyJointPermissionsForEntities($entities->all());
-        }
-
-        $this->createManyJointPermissions($entities->all(), $roles);
-    }
-
-    /**
-     * Rebuild the entity jointPermissions for a collection of entities.
-     */
-    protected function buildJointPermissionsForEntities(array $entities)
-    {
-        $roles = Role::query()->get()->values()->all();
-        $this->deleteManyJointPermissionsForEntities($entities);
-        $this->createManyJointPermissions($entities, $roles);
-    }
-
-    /**
-     * Delete all the entity jointPermissions for a list of entities.
-     *
-     * @param Entity[] $entities
-     */
-    protected function deleteManyJointPermissionsForEntities(array $entities)
-    {
-        $simpleEntities = $this->entitiesToSimpleEntities($entities);
-        $idsByType = $this->entitiesToTypeIdMap($simpleEntities);
-
-        DB::transaction(function () use ($idsByType) {
-            foreach ($idsByType as $type => $ids) {
-                foreach (array_chunk($ids, 1000) as $idChunk) {
-                    DB::table('joint_permissions')
-                        ->where('entity_type', '=', $type)
-                        ->whereIn('entity_id', $idChunk)
-                        ->delete();
-                }
-            }
-        });
-    }
-
-    /**
-     * @param Entity[] $entities
-     *
-     * @return SimpleEntityData[]
-     */
-    protected function entitiesToSimpleEntities(array $entities): array
-    {
-        $simpleEntities = [];
-
-        foreach ($entities as $entity) {
-            $simple = SimpleEntityData::fromEntity($entity);
-            $simpleEntities[] = $simple;
-        }
-
-        return $simpleEntities;
-    }
-
-    /**
-     * Create & Save entity jointPermissions for many entities and roles.
-     *
-     * @param Entity[] $originalEntities
-     * @param Role[]   $roles
-     */
-    protected function createManyJointPermissions(array $originalEntities, array $roles)
-    {
-        $entities = $this->entitiesToSimpleEntities($originalEntities);
-        $jointPermissions = [];
-
-        // Fetch related entity permissions
-        $permissions = new MassEntityPermissionEvaluator($entities, 'view');
-
-        // Create a mapping of role permissions
-        $rolePermissionMap = [];
-        foreach ($roles as $role) {
-            foreach ($role->permissions as $permission) {
-                $rolePermissionMap[$role->getRawAttribute('id') . ':' . $permission->getRawAttribute('name')] = true;
-            }
-        }
-
-        // Create Joint Permission Data
-        foreach ($entities as $entity) {
-            foreach ($roles as $role) {
-                $jp = $this->createJointPermissionData(
-                    $entity,
-                    $role->getRawAttribute('id'),
-                    $permissions,
-                    $rolePermissionMap,
-                    $role->system_name === 'admin'
-                );
-                $jointPermissions[] = $jp;
-            }
-        }
-
-        DB::transaction(function () use ($jointPermissions) {
-            foreach (array_chunk($jointPermissions, 1000) as $jointPermissionChunk) {
-                DB::table('joint_permissions')->insert($jointPermissionChunk);
-            }
-        });
-    }
-
-    /**
-     * From the given entity list, provide back a mapping of entity types to
-     * the ids of that given type. The type used is the DB morph class.
-     *
-     * @param SimpleEntityData[] $entities
-     *
-     * @return array<string, int[]>
-     */
-    protected function entitiesToTypeIdMap(array $entities): array
-    {
-        $idsByType = [];
-
-        foreach ($entities as $entity) {
-            if (!isset($idsByType[$entity->type])) {
-                $idsByType[$entity->type] = [];
-            }
-
-            $idsByType[$entity->type][] = $entity->id;
-        }
-
-        return $idsByType;
-    }
-
-    /**
-     * Create entity permission data for an entity and role
-     * for a particular action.
-     */
-    protected function createJointPermissionData(SimpleEntityData $entity, int $roleId, MassEntityPermissionEvaluator $permissionMap, array $rolePermissionMap, bool $isAdminRole): array
-    {
-        // Ensure system admin role retains permissions
-        if ($isAdminRole) {
-            return $this->createJointPermissionDataArray($entity, $roleId, PermissionStatus::EXPLICIT_ALLOW, true);
-        }
-
-        // Return evaluated entity permission status if it has an affect.
-        $entityPermissionStatus = $permissionMap->evaluateEntityForRole($entity, $roleId);
-        if ($entityPermissionStatus !== null) {
-            return $this->createJointPermissionDataArray($entity, $roleId, $entityPermissionStatus, false);
-        }
-
-        // Otherwise default to the role-level permissions
-        $permissionPrefix = $entity->type . '-view';
-        $roleHasPermission = isset($rolePermissionMap[$roleId . ':' . $permissionPrefix . '-all']);
-        $roleHasPermissionOwn = isset($rolePermissionMap[$roleId . ':' . $permissionPrefix . '-own']);
-        $status = $roleHasPermission ? PermissionStatus::IMPLICIT_ALLOW : PermissionStatus::IMPLICIT_DENY;
-        return $this->createJointPermissionDataArray($entity, $roleId, $status, $roleHasPermissionOwn);
-    }
-
-    /**
-     * Create an array of data with the information of an entity jointPermissions.
-     * Used to build data for bulk insertion.
-     */
-    protected function createJointPermissionDataArray(SimpleEntityData $entity, int $roleId, int $permissionStatus, bool $hasPermissionOwn): array
-    {
-        $ownPermissionActive = ($hasPermissionOwn && $permissionStatus !== PermissionStatus::EXPLICIT_DENY && $entity->owned_by);
-
-        return [
-            'entity_id'   => $entity->id,
-            'entity_type' => $entity->type,
-            'role_id'     => $roleId,
-            'status'      => $permissionStatus,
-            'owner_id'    => $ownPermissionActive ? $entity->owned_by : null,
-        ];
-    }
-}

app/Auth/Permissions/MassEntityPermissionEvaluator.php

@@ -1,81 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Permissions;
-
-class MassEntityPermissionEvaluator extends EntityPermissionEvaluator
-{
-    /**
-     * @var SimpleEntityData[]
-     */
-    protected array $entitiesInvolved;
-    protected array $permissionMapCache;
-
-    public function __construct(array $entitiesInvolved, string $action)
-    {
-        $this->entitiesInvolved = $entitiesInvolved;
-        parent::__construct($action);
-    }
-
-    public function evaluateEntityForRole(SimpleEntityData $entity, int $roleId): ?int
-    {
-        $typeIdChain = $this->gatherEntityChainTypeIds($entity);
-        $relevantPermissions = $this->getPermissionMapByTypeIdForChainAndRole($typeIdChain, $roleId);
-        $permitsByType = $this->collapseAndCategorisePermissions($typeIdChain, $relevantPermissions);
-
-        return $this->evaluatePermitsByType($permitsByType);
-    }
-
-    /**
-     * @param string[] $typeIdChain
-     * @return array<string, EntityPermission[]>
-     */
-    protected function getPermissionMapByTypeIdForChainAndRole(array $typeIdChain, int $roleId): array
-    {
-        $allPermissions = $this->getPermissionMapByTypeIdAndRoleForAllInvolved();
-        $relevantPermissions = [];
-
-        // Filter down permissions to just those for current typeId
-        // and current roleID or fallback permissions.
-        foreach ($typeIdChain as $typeId) {
-            $relevantPermissions[$typeId] = [
-                ...($allPermissions[$typeId][$roleId] ?? []),
-                ...($allPermissions[$typeId][0] ?? [])
-            ];
-        }
-
-        return $relevantPermissions;
-    }
-
-    /**
-     * @return array<string, array<int, EntityPermission[]>>
-     */
-    protected function getPermissionMapByTypeIdAndRoleForAllInvolved(): array
-    {
-        if (isset($this->permissionMapCache)) {
-            return $this->permissionMapCache;
-        }
-
-        $entityTypeIdChain = [];
-        foreach ($this->entitiesInvolved as $entity) {
-            $entityTypeIdChain[] = $entity->type . ':' . $entity->id;
-        }
-
-        $permissionMap = $this->getPermissionsMapByTypeId($entityTypeIdChain, []);
-
-       // Manipulate permission map to also be keyed by roleId.
-        foreach ($permissionMap as $typeId => $permissions) {
-            $permissionMap[$typeId] = [];
-            foreach ($permissions as $permission) {
-                $roleId = $permission->getRawAttribute('role_id');
-                if (!isset($permissionMap[$typeId][$roleId])) {
-                    $permissionMap[$typeId][$roleId] = [];
-                }
-                $permissionMap[$typeId][$roleId][] = $permission;
-            }
-        }
-
-        $this->permissionMapCache = $permissionMap;
-
-        return $this->permissionMapCache;
-    }
-}

app/Auth/Permissions/PermissionApplicator.php

@@ -4,6 +4,7 @@ namespace BookStack\Auth\Permissions;
 
 use BookStack\Auth\Role;
 use BookStack\Auth\User;
+use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
 use BookStack\Model;
@@ -11,6 +12,8 @@ use BookStack\Traits\HasCreatorAndUpdater;
 use BookStack\Traits\HasOwner;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Database\Query\JoinClause;
+use Illuminate\Support\Facades\DB;
 use InvalidArgumentException;
 
 class PermissionApplicator
@@ -47,7 +50,7 @@ class PermissionApplicator
             return $hasRolePermission;
         }
 
-        $hasApplicableEntityPermissions = $this->hasEntityPermission($ownable, $userRoleIds, $action);
+        $hasApplicableEntityPermissions = $this->hasEntityPermission($ownable, $userRoleIds, $user->id, $action);
 
         return is_null($hasApplicableEntityPermissions) ? $hasRolePermission : $hasApplicableEntityPermissions;
     }
@@ -56,11 +59,75 @@ class PermissionApplicator
      * Check if there are permissions that are applicable for the given entity item, action and roles.
      * Returns null when no entity permissions are in force.
      */
-    protected function hasEntityPermission(Entity $entity, array $userRoleIds, string $action): ?bool
+    protected function hasEntityPermission(Entity $entity, array $userRoleIds, int $userId, string $action): ?bool
     {
         $this->ensureValidEntityAction($action);
 
-        return (new EntityPermissionEvaluator($action))->evaluateEntityForUser($entity, $userRoleIds);
+        $adminRoleId = Role::getSystemRole('admin')->id;
+        if (in_array($adminRoleId, $userRoleIds)) {
+            return true;
+        }
+
+        // The array order here is very important due to the fact we walk up the chain
+        // in the flattening loop below. Earlier items in the chain have higher priority.
+        $typeIdList = [$entity->getMorphClass() . ':' . $entity->id];
+        if ($entity instanceof Page && $entity->chapter_id) {
+            $typeIdList[] = 'chapter:' . $entity->chapter_id;
+        }
+
+        if ($entity instanceof Page || $entity instanceof Chapter) {
+            $typeIdList[] = 'book:' . $entity->book_id;
+        }
+
+        $relevantPermissions = EntityPermission::query()
+            ->where(function (Builder $query) use ($typeIdList) {
+                foreach ($typeIdList as $typeId) {
+                    $query->orWhere(function (Builder $query) use ($typeId) {
+                        [$type, $id] = explode(':', $typeId);
+                        $query->where('entity_type', '=', $type)
+                            ->where('entity_id', '=', $id);
+                    });
+                }
+            })->where(function (Builder $query) use ($userRoleIds, $userId) {
+                $query->whereIn('role_id', $userRoleIds)
+                    ->orWhere('user_id', '=', $userId)
+                    ->orWhere(function (Builder $query) {
+                        $query->whereNull(['role_id', 'user_id']);
+                    });
+            })->get(['entity_id', 'entity_type', 'role_id', 'user_id', $action])
+            ->all();
+
+        $permissionMap = new EntityPermissionMap($relevantPermissions);
+        $permitsByType = ['user' => [], 'fallback' => [], 'role' => []];
+
+        // Collapse and simplify permission structure
+        foreach ($typeIdList as $typeId) {
+            $permissions = $permissionMap->getForEntity($typeId);
+            foreach ($permissions as $permission) {
+                $related = $permission->getAssignedType();
+                $relatedId = $permission->getAssignedTypeId();
+                if (!isset($permitsByType[$related][$relatedId])) {
+                    $permitsByType[$related][$relatedId] = $permission->$action;
+                }
+            }
+        }
+
+        // Return user-level permission if exists
+        if (count($permitsByType['user']) > 0) {
+            return boolval(array_values($permitsByType['user'])[0]);
+        }
+
+        // Return grant or reject from role-level if exists
+        if (count($permitsByType['role']) > 0) {
+            return boolval(max($permitsByType['role']));
+        }
+
+        // Return fallback permission if exists
+        if (count($permitsByType['fallback']) > 0) {
+            return boolval($permitsByType['fallback'][0]);
+        }
+
+        return null;
     }
 
     /**
@@ -73,7 +140,10 @@ class PermissionApplicator
 
         $permissionQuery = EntityPermission::query()
             ->where($action, '=', true)
-            ->whereIn('role_id', $this->getCurrentUserRoleIds());
+            ->where(function (Builder $query) {
+                $query->whereIn('role_id', $this->getCurrentUserRoleIds())
+                ->orWhere('user_id', '=', $this->currentUser()->id);
+            });
 
         if (!empty($entityClass)) {
             /** @var Entity $entityInstance */
@@ -90,20 +160,140 @@ class PermissionApplicator
      * Limit the given entity query so that the query will only
      * return items that the user has view permission for.
      */
-    public function restrictEntityQuery(Builder $query): Builder
+    public function restrictEntityQuery(Builder $query, string $morphClass): Builder
     {
-        return $query->where(function (Builder $parentQuery) {
-            $parentQuery->whereHas('jointPermissions', function (Builder $permissionQuery) {
-                $permissionQuery->select(['entity_id', 'entity_type'])
-                    ->selectRaw('max(owner_id) as owner_id')
-                    ->selectRaw('max(status) as status')
-                    ->whereIn('role_id', $this->getCurrentUserRoleIds())
-                    ->groupBy(['entity_type', 'entity_id'])
-                    ->havingRaw('(status IN (1, 3) or (owner_id = ? and status != 2))', [$this->currentUser()->id]);
-            });
+        $this->applyPermissionsToQuery($query, $query->getModel()->getTable(), $morphClass, 'id', '');
+
+        return $query;
+    }
+
+    /**
+     * @param Builder|QueryBuilder $query
+     */
+    protected function applyPermissionsToQuery($query, string $queryTable, string $entityTypeLimiter, string $entityIdColumn, string $entityTypeColumn): void
+    {
+        if ($this->currentUser()->hasSystemRole('admin')) {
+            return;
+        }
+
+        $this->applyFallbackJoin($query, $queryTable, $entityTypeLimiter, $entityIdColumn, $entityTypeColumn);
+        $this->applyRoleJoin($query, $queryTable, $entityTypeLimiter, $entityIdColumn, $entityTypeColumn);
+        $this->applyUserJoin($query, $queryTable, $entityTypeLimiter, $entityIdColumn, $entityTypeColumn);
+        $this->applyPermissionWhereFilter($query, $queryTable, $entityTypeLimiter, $entityTypeColumn);
+    }
+
+    /**
+     * Apply the where condition to a permission restricting query, to limit based upon the values of the joined
+     * permission data. Query must have joins pre-applied.
+     * Either entityTypeLimiter or entityTypeColumn should be supplied, with the other empty.
+     * Both should not be applied since that would conflict upon intent.
+     * @param Builder|QueryBuilder $query
+     */
+    protected function applyPermissionWhereFilter($query, string $queryTable, string $entityTypeLimiter, string $entityTypeColumn)
+    {
+        $abilities = ['all' => [], 'own' => []];
+        $types = $entityTypeLimiter ? [$entityTypeLimiter] : ['page', 'chapter', 'bookshelf', 'book'];
+        $fullEntityTypeColumn = $queryTable . '.' . $entityTypeColumn;
+        foreach ($types as $type) {
+            $abilities['all'][$type] = userCan($type . '-view-all');
+            $abilities['own'][$type] = userCan($type . '-view-own');
+        }
+
+        $abilities['all'] = array_filter($abilities['all']);
+        $abilities['own'] = array_filter($abilities['own']);
+
+        $query->where(function (Builder $query) use ($abilities, $fullEntityTypeColumn, $entityTypeColumn) {
+            $query->where('perms_user', '=', 1)
+                ->orWhere(function (Builder $query) {
+                    $query->whereNull('perms_user')->where('perms_role', '=', 1);
+                })->orWhere(function (Builder $query) {
+                    $query->whereNull(['perms_user', 'perms_role'])
+                        ->where('perms_fallback', '=', 1);
+                });
+
+            if (count($abilities['all']) > 0) {
+                $query->orWhere(function (Builder $query) use ($abilities, $fullEntityTypeColumn, $entityTypeColumn) {
+                    $query->whereNull(['perms_user', 'perms_role', 'perms_fallback']);
+                    if ($entityTypeColumn) {
+                        $query->whereIn($fullEntityTypeColumn, array_keys($abilities['all']));
+                    }
+                });
+            }
+
+            if (count($abilities['own']) > 0) {
+                $query->orWhere(function (Builder $query) use ($abilities, $fullEntityTypeColumn, $entityTypeColumn) {
+                    $query->whereNull(['perms_user', 'perms_role', 'perms_fallback'])
+                        ->where('owned_by', '=', $this->currentUser()->id);
+                    if ($entityTypeColumn) {
+                        $query->whereIn($fullEntityTypeColumn, array_keys($abilities['all']));
+                    }
+                });
+            }
         });
     }
 
+    /**
+     * @param Builder|QueryBuilder $query
+     */
+    protected function applyPermissionJoin(callable $joinCallable, string $subAlias, $query, string $queryTable, string $entityTypeLimiter, string $entityIdColumn, string $entityTypeColumn)
+    {
+        $joinCondition = $this->getJoinCondition($queryTable, $subAlias, $entityIdColumn, $entityTypeColumn);
+
+        $query->joinSub(function (QueryBuilder $joinQuery) use ($joinCallable, $entityTypeLimiter) {
+            $joinQuery->select(['entity_id', 'entity_type'])->from('entity_permissions_collapsed')
+                ->groupBy('entity_id', 'entity_type');
+            $joinCallable($joinQuery);
+
+            if ($entityTypeLimiter) {
+                $joinQuery->where('entity_type', '=', $entityTypeLimiter);
+            }
+        }, $subAlias, $joinCondition, null, null, 'left');
+    }
+
+    /**
+     * @param Builder|QueryBuilder $query
+     */
+    protected function applyUserJoin($query, string $queryTable, string $entityTypeLimiter, string $entityIdColumn, string $entityTypeColumn)
+    {
+        $this->applyPermissionJoin(function (QueryBuilder $joinQuery) {
+            $joinQuery->selectRaw('max(view) as perms_user')
+                ->where('user_id', '=', $this->currentUser()->id);
+        }, 'p_u', $query, $queryTable, $entityTypeLimiter, $entityIdColumn, $entityTypeColumn);
+    }
+
+
+    /**
+     * @param Builder|QueryBuilder $query
+     */
+    protected function applyRoleJoin($query, string $queryTable, string $entityTypeLimiter, string $entityIdColumn, string $entityTypeColumn)
+    {
+        $this->applyPermissionJoin(function (QueryBuilder $joinQuery) {
+            $joinQuery->selectRaw('max(view) as perms_role')
+                ->whereIn('role_id', $this->getCurrentUserRoleIds());
+        }, 'p_r', $query, $queryTable, $entityTypeLimiter, $entityIdColumn, $entityTypeColumn);
+    }
+
+    /**
+     * @param Builder|QueryBuilder $query
+     */
+    protected function applyFallbackJoin($query, string $queryTable, string $entityTypeLimiter, string $entityIdColumn, string $entityTypeColumn)
+    {
+        $this->applyPermissionJoin(function (QueryBuilder $joinQuery) {
+            $joinQuery->selectRaw('max(view) as perms_fallback')
+                ->whereNull(['role_id', 'user_id']);
+        }, 'p_f', $query, $queryTable, $entityTypeLimiter, $entityIdColumn, $entityTypeColumn);
+    }
+
+    protected function getJoinCondition(string $queryTable, string $joinTableName, string $entityIdColumn, string $entityTypeColumn): callable
+    {
+        return function (JoinClause $join) use ($queryTable, $joinTableName, $entityIdColumn, $entityTypeColumn) {
+            $join->on($queryTable . '.' . $entityIdColumn, '=', $joinTableName . '.entity_id');
+            if ($entityTypeColumn) {
+                $join->on($queryTable . '.' . $entityTypeColumn, '=', $joinTableName . '.entity_type');
+            }
+        };
+    }
+
     /**
      * Extend the given page query to ensure draft items are not visible
      * unless created by the given user.
@@ -123,23 +313,28 @@ class PermissionApplicator
      * Filter items that have entities set as a polymorphic relation.
      * For simplicity, this will not return results attached to draft pages.
      * Draft pages should never really have related items though.
+     *
+     * @param Builder|QueryBuilder $query
      */
-    public function restrictEntityRelationQuery(Builder $query, string $tableName, string $entityIdColumn, string $entityTypeColumn): Builder
+    public function restrictEntityRelationQuery($query, string $tableName, string $entityIdColumn, string $entityTypeColumn)
     {
-        $tableDetails = ['tableName' => $tableName, 'entityIdColumn' => $entityIdColumn, 'entityTypeColumn' => $entityTypeColumn];
-        $pageMorphClass = (new Page())->getMorphClass();
-
-        return $this->restrictEntityQuery($query)
-            ->where(function ($query) use ($tableDetails, $pageMorphClass) {
-                /** @var Builder $query */
-                $query->where($tableDetails['entityTypeColumn'], '!=', $pageMorphClass)
-                ->orWhereExists(function (QueryBuilder $query) use ($tableDetails, $pageMorphClass) {
-                    $query->select('id')->from('pages')
-                        ->whereColumn('pages.id', '=', $tableDetails['tableName'] . '.' . $tableDetails['entityIdColumn'])
-                        ->where($tableDetails['tableName'] . '.' . $tableDetails['entityTypeColumn'], '=', $pageMorphClass)
-                        ->where('pages.draft', '=', false);
+        $query->leftJoinSub(function (QueryBuilder $query) {
+            $query->select(['id as entity_id', DB::raw("'page' as entity_type"), 'owned_by', 'deleted_at', 'draft'])->from('pages');
+            $tablesByType = ['page' => 'pages', 'book' => 'books', 'chapter' => 'chapters', 'bookshelf' => 'bookshelves'];
+            foreach ($tablesByType as $type => $table) {
+                $query->unionAll(function (QueryBuilder $query) use ($type, $table) {
+                    $query->select(['id as entity_id', DB::raw("'{$type}' as entity_type"), 'owned_by', 'deleted_at', DB::raw('0 as draft')])->from($table);
                 });
-            });
+            }
+        }, 'entities', function (JoinClause $join) use ($tableName, $entityIdColumn, $entityTypeColumn) {
+            $join->on($tableName . '.' . $entityIdColumn, '=', 'entities.entity_id')
+                 ->on($tableName . '.' . $entityTypeColumn, '=', 'entities.entity_type');
+        });
+
+        $this->applyPermissionsToQuery($query, $tableName, '', $entityIdColumn, $entityTypeColumn);
+        // TODO - Test page draft access (Might allow drafts which should not be seen)
+
+        return $query;
     }
 
     /**
@@ -150,21 +345,12 @@ class PermissionApplicator
      */
     public function restrictPageRelationQuery(Builder $query, string $tableName, string $pageIdColumn): Builder
     {
-        $fullPageIdColumn = $tableName . '.' . $pageIdColumn;
-        return $this->restrictEntityQuery($query)
-            ->where(function ($query) use ($fullPageIdColumn) {
-                /** @var Builder $query */
-                $query->whereExists(function (QueryBuilder $query) use ($fullPageIdColumn) {
-                    $query->select('id')->from('pages')
-                        ->whereColumn('pages.id', '=', $fullPageIdColumn)
-                        ->where('pages.draft', '=', false);
-                })->orWhereExists(function (QueryBuilder $query) use ($fullPageIdColumn) {
-                    $query->select('id')->from('pages')
-                        ->whereColumn('pages.id', '=', $fullPageIdColumn)
-                        ->where('pages.draft', '=', true)
-                        ->where('pages.created_by', '=', $this->currentUser()->id);
-                });
-            });
+        $morphClass = (new Page())->getMorphClass();
+
+        $this->applyPermissionsToQuery($query, $tableName, $morphClass, $pageIdColumn, '');
+        // TODO - Draft display
+        // TODO - Likely need owned_by entity join workaround as used above
+        return $query;
     }
 
     /**

app/Auth/Permissions/PermissionFormData.php

@@ -21,19 +21,32 @@ class PermissionFormData
     {
         return $this->entity->permissions()
             ->with('role')
-            ->where('role_id', '!=', 0)
+            ->whereNotNull('role_id')
             ->get()
             ->sortBy('role.display_name')
             ->all();
     }
 
+    /**
+     * Get the permissions with assigned users.
+     */
+    public function permissionsWithUsers(): array
+    {
+        return $this->entity->permissions()
+            ->with('user')
+            ->whereNotNull('user_id')
+            ->get()
+            ->sortBy('user.name')
+            ->all();
+    }
+
     /**
      * Get the roles that don't yet have specific permissions for the
      * entity we're managing permissions for.
      */
     public function rolesNotAssigned(): array
     {
-        $assigned = $this->entity->permissions()->pluck('role_id');
+        $assigned = $this->entity->permissions()->whereNotNull('role_id')->pluck('role_id');
         return Role::query()
             ->where('system_name', '!=', 'admin')
             ->whereNotIn('id', $assigned)
@@ -49,20 +62,19 @@ class PermissionFormData
     {
         /** @var ?EntityPermission $permission */
         $permission = $this->entity->permissions()
-            ->where('role_id', '=', 0)
+            ->whereNull(['role_id', 'user_id'])
             ->first();
         return $permission ?? (new EntityPermission());
     }
 
     /**
-     * Get the "Everyone Else" role entry.
+     * Check if the "Everyone else" option is inheriting default role system permissions.
+     * Is determined by any system entity_permission existing for the current entity.
      */
-    public function everyoneElseRole(): Role
+    public function everyoneElseInheriting(): bool
     {
-        return (new Role())->forceFill([
-            'id' => 0,
-            'display_name' => trans('entities.permissions_role_everyone_else'),
-            'description' => trans('entities.permissions_role_everyone_else_desc'),
-        ]);
+        return !$this->entity->permissions()
+            ->whereNull(['role_id', 'user_id'])
+            ->exists();
     }
 }

app/Auth/Permissions/PermissionStatus.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Permissions;
-
-class PermissionStatus
-{
-    const IMPLICIT_DENY = 0;
-    const IMPLICIT_ALLOW = 1;
-    const EXPLICIT_DENY = 2;
-    const EXPLICIT_ALLOW = 3;
-}

app/Auth/Permissions/PermissionsRepo.php

@@ -11,10 +11,13 @@ use Illuminate\Database\Eloquent\Collection;
 
 class PermissionsRepo
 {
-    protected JointPermissionBuilder $permissionBuilder;
+    protected CollapsedPermissionBuilder $permissionBuilder;
     protected array $systemRoles = ['admin', 'public'];
 
-    public function __construct(JointPermissionBuilder $permissionBuilder)
+    /**
+     * PermissionsRepo constructor.
+     */
+    public function __construct(CollapsedPermissionBuilder $permissionBuilder)
     {
         $this->permissionBuilder = $permissionBuilder;
     }
@@ -38,7 +41,7 @@ class PermissionsRepo
     /**
      * Get a role via its ID.
      */
-    public function getRoleById(int $id): Role
+    public function getRoleById($id): Role
     {
         return Role::query()->findOrFail($id);
     }
@@ -49,12 +52,11 @@ class PermissionsRepo
     public function saveNewRole(array $roleData): Role
     {
         $role = new Role($roleData);
-        $role->mfa_enforced = boolval($roleData['mfa_enforced'] ?? false);
+        $role->mfa_enforced = ($roleData['mfa_enforced'] ?? 'false') === 'true';
         $role->save();
 
-        $permissions = $roleData['permissions'] ?? [];
+        $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
         $this->assignRolePermissions($role, $permissions);
-        $this->permissionBuilder->rebuildForRole($role);
 
         Activity::add(ActivityType::ROLE_CREATE, $role);
 
@@ -63,45 +65,41 @@ class PermissionsRepo
 
     /**
      * Updates an existing role.
-     * Ensures Admin system role always have core permissions.
+     * Ensure Admin role always have core permissions.
      */
-    public function updateRole($roleId, array $roleData): Role
+    public function updateRole($roleId, array $roleData)
     {
         $role = $this->getRoleById($roleId);
 
-        if (isset($roleData['permissions'])) {
-            $this->assignRolePermissions($role, $roleData['permissions']);
-        }
-
-        $role->fill($roleData);
-        $role->save();
-        $this->permissionBuilder->rebuildForRole($role);
-
-        Activity::add(ActivityType::ROLE_UPDATE, $role);
-
-        return $role;
-    }
-
-    /**
-     * Assign a list of permission names to the given role.
-     */
-    protected function assignRolePermissions(Role $role, array $permissionNameArray = []): void
-    {
-        $permissions = [];
-        $permissionNameArray = array_values($permissionNameArray);
-
-        // Ensure the admin system role retains vital system permissions
+        $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
         if ($role->system_name === 'admin') {
-            $permissionNameArray = array_unique(array_merge($permissionNameArray, [
+            $permissions = array_merge($permissions, [
                 'users-manage',
                 'user-roles-manage',
                 'restrictions-manage-all',
                 'restrictions-manage-own',
                 'settings-manage',
-            ]));
+            ]);
         }
 
-        if (!empty($permissionNameArray)) {
+        $this->assignRolePermissions($role, $permissions);
+
+        $role->fill($roleData);
+        $role->mfa_enforced = ($roleData['mfa_enforced'] ?? 'false') === 'true';
+        $role->save();
+
+        Activity::add(ActivityType::ROLE_UPDATE, $role);
+    }
+
+    /**
+     * Assign a list of permission names to a role.
+     */
+    protected function assignRolePermissions(Role $role, array $permissionNameArray = [])
+    {
+        $permissions = [];
+        $permissionNameArray = array_values($permissionNameArray);
+
+        if ($permissionNameArray) {
             $permissions = RolePermission::query()
                 ->whereIn('name', $permissionNameArray)
                 ->pluck('id')
@@ -114,13 +112,13 @@ class PermissionsRepo
     /**
      * Delete a role from the system.
      * Check it's not an admin role or set as default before deleting.
-     * If a migration Role ID is specified the users assign to the current role
+     * If an migration Role ID is specified the users assign to the current role
      * will be added to the role of the specified id.
      *
      * @throws PermissionsException
      * @throws Exception
      */
-    public function deleteRole(int $roleId, int $migrateRoleId = 0): void
+    public function deleteRole($roleId, $migrateRoleId)
     {
         $role = $this->getRoleById($roleId);
 
@@ -131,7 +129,7 @@ class PermissionsRepo
             throw new PermissionsException(trans('errors.role_registration_default_cannot_delete'));
         }
 
-        if ($migrateRoleId !== 0) {
+        if ($migrateRoleId) {
             $newRole = Role::query()->find($migrateRoleId);
             if ($newRole) {
                 $users = $role->users()->pluck('id')->toArray();
@@ -140,7 +138,7 @@ class PermissionsRepo
         }
 
         $role->entityPermissions()->delete();
-        $role->jointPermissions()->delete();
+        $role->collapsedPermissions()->delete();
         Activity::add(ActivityType::ROLE_DELETE, $role);
         $role->delete();
     }

app/Auth/Permissions/RolePermission.php

@@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 /**
  * @property int $id
- * @property string $name
- * @property string $display_name
  */
 class RolePermission extends Model
 {

app/Auth/Permissions/SimpleEntityData.php

@@ -2,27 +2,10 @@
 
 namespace BookStack\Auth\Permissions;
 
-use BookStack\Entities\Models\Entity;
-
 class SimpleEntityData
 {
     public int $id;
     public string $type;
-    public int $owned_by;
     public ?int $book_id;
     public ?int $chapter_id;
-
-    public static function fromEntity(Entity $entity): self
-    {
-        $attrs = $entity->getAttributes();
-        $simple = new self();
-
-        $simple->id = $attrs['id'];
-        $simple->type = $entity->getMorphClass();
-        $simple->owned_by = $attrs['owned_by'] ?? 0;
-        $simple->book_id = $attrs['book_id'] ?? null;
-        $simple->chapter_id = $attrs['chapter_id'] ?? null;
-
-        return $simple;
-    }
 }

app/Auth/Role.php

@@ -2,8 +2,8 @@
 
 namespace BookStack\Auth;
 
+use BookStack\Auth\Permissions\CollapsedPermission;
 use BookStack\Auth\Permissions\EntityPermission;
-use BookStack\Auth\Permissions\JointPermission;
 use BookStack\Auth\Permissions\RolePermission;
 use BookStack\Interfaces\Loggable;
 use BookStack\Model;
@@ -27,14 +27,10 @@ class Role extends Model implements Loggable
 {
     use HasFactory;
 
-    protected $fillable = ['display_name', 'description', 'external_auth_id', 'mfa_enforced'];
+    protected $fillable = ['display_name', 'description', 'external_auth_id'];
 
     protected $hidden = ['pivot'];
 
-    protected $casts = [
-        'mfa_enforced' => 'boolean',
-    ];
-
     /**
      * The roles that belong to the role.
      */
@@ -43,14 +39,6 @@ class Role extends Model implements Loggable
         return $this->belongsToMany(User::class)->orderBy('name', 'asc');
     }
 
-    /**
-     * Get all related JointPermissions.
-     */
-    public function jointPermissions(): HasMany
-    {
-        return $this->hasMany(JointPermission::class);
-    }
-
     /**
      * The RolePermissions that belong to the role.
      */
@@ -67,6 +55,14 @@ class Role extends Model implements Loggable
         return $this->hasMany(EntityPermission::class);
     }
 
+    /**
+     * Get all related entity collapsed permissions.
+     */
+    public function collapsedPermissions(): HasMany
+    {
+        return $this->hasMany(CollapsedPermission::class);
+    }
+
     /**
      * Check if this role has a permission.
      */
@@ -111,13 +107,7 @@ class Role extends Model implements Loggable
      */
     public static function getSystemRole(string $systemName): ?self
     {
-        static $cache = [];
-
-        if (!isset($cache[$systemName])) {
-            $cache[$systemName] = static::query()->where('system_name', '=', $systemName)->first();
-        }
-
-        return $cache[$systemName];
+        return static::query()->where('system_name', '=', $systemName)->first();
     }
 
     /**

app/Auth/User.php

@@ -5,6 +5,8 @@ namespace BookStack\Auth;
 use BookStack\Actions\Favourite;
 use BookStack\Api\ApiToken;
 use BookStack\Auth\Access\Mfa\MfaValue;
+use BookStack\Auth\Permissions\CollapsedPermission;
+use BookStack\Auth\Permissions\EntityPermission;
 use BookStack\Entities\Tools\SlugGenerator;
 use BookStack\Interfaces\Loggable;
 use BookStack\Interfaces\Sluggable;
@@ -72,7 +74,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     protected $hidden = [
         'password', 'remember_token', 'system_name', 'email_confirmed', 'external_auth_id', 'email',
-        'created_at', 'updated_at', 'image_id', 'roles', 'avatar', 'user_id', 'pivot',
+        'created_at', 'updated_at', 'image_id', 'roles', 'avatar', 'user_id',
     ];
 
     /**
@@ -200,7 +202,6 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     public function attachRole(Role $role)
     {
         $this->roles()->attach($role->id);
-        $this->unsetRelation('roles');
     }
 
     /**
@@ -299,6 +300,22 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
             }, 'activities', 'users.id', '=', 'activities.user_id');
     }
 
+    /**
+     * Get the entity permissions assigned to this specific user.
+     */
+    public function entityPermissions(): HasMany
+    {
+        return $this->hasMany(EntityPermission::class);
+    }
+
+    /**
+     * Get all related entity collapsed permissions.
+     */
+    public function collapsedPermissions(): HasMany
+    {
+        return $this->hasMany(CollapsedPermission::class);
+    }
+
     /**
      * Get the url for editing this user.
      */

app/Auth/UserRepo.php

@@ -153,6 +153,8 @@ class UserRepo
         $user->apiTokens()->delete();
         $user->favourites()->delete();
         $user->mfaValues()->delete();
+        $user->collapsedPermissions()->delete();
+        $user->entityPermissions()->delete();
         $user->delete();
 
         // Delete user profile images
@@ -234,8 +236,6 @@ class UserRepo
      */
     protected function setUserRoles(User $user, array $roles)
     {
-        $roles = array_filter(array_values($roles));
-
         if ($this->demotingLastAdmin($user, $roles)) {
             throw new UserUpdateException(trans('errors.role_cannot_remove_only_admin'), $user->getEditUrl());
         }

app/Config/app.php

@@ -8,8 +8,6 @@
  * Do not edit this file unless you're happy to maintain any changes yourself.
  */
 
-use Illuminate\Support\Facades\Facade;
-
 return [
 
     // The environment to run BookStack in.
@@ -100,13 +98,7 @@ return [
     // Encryption cipher
     'cipher' => 'AES-256-CBC',
 
-    // Maintenance Mode Driver
-    'maintenance' => [
-        'driver' => 'file',
-        // 'store'  => 'redis',
-    ],
-
-    // Application Service Providers
+    // Application Services Provides
     'providers' => [
 
         // Laravel Framework Service Providers...
@@ -149,9 +141,58 @@ return [
         BookStack\Providers\ViewTweaksServiceProvider::class,
     ],
 
-    // Class Aliases
-    // This array of class aliases to be registered on application start.
-    'aliases' => Facade::defaultAliases()->merge([
+    /*
+    |--------------------------------------------------------------------------
+    | Class Aliases
+    |--------------------------------------------------------------------------
+    |
+    | This array of class aliases will be registered when this application
+    | is started. However, feel free to register as many as you wish as
+    | the aliases are "lazy" loaded so they don't hinder performance.
+    |
+    */
+
+    // Class aliases, Registered on application start
+    'aliases' => [
+        // Laravel
+        'App'          => Illuminate\Support\Facades\App::class,
+        'Arr'          => Illuminate\Support\Arr::class,
+        'Artisan'      => Illuminate\Support\Facades\Artisan::class,
+        'Auth'         => Illuminate\Support\Facades\Auth::class,
+        'Blade'        => Illuminate\Support\Facades\Blade::class,
+        'Bus'          => Illuminate\Support\Facades\Bus::class,
+        'Cache'        => Illuminate\Support\Facades\Cache::class,
+        'Config'       => Illuminate\Support\Facades\Config::class,
+        'Cookie'       => Illuminate\Support\Facades\Cookie::class,
+        'Crypt'        => Illuminate\Support\Facades\Crypt::class,
+        'Date'         => Illuminate\Support\Facades\Date::class,
+        'DB'           => Illuminate\Support\Facades\DB::class,
+        'Eloquent'     => Illuminate\Database\Eloquent\Model::class,
+        'Event'        => Illuminate\Support\Facades\Event::class,
+        'File'         => Illuminate\Support\Facades\File::class,
+        'Gate'         => Illuminate\Support\Facades\Gate::class,
+        'Hash'         => Illuminate\Support\Facades\Hash::class,
+        'Http'         => Illuminate\Support\Facades\Http::class,
+        'Lang'         => Illuminate\Support\Facades\Lang::class,
+        'Log'          => Illuminate\Support\Facades\Log::class,
+        'Mail'         => Illuminate\Support\Facades\Mail::class,
+        'Notification' => Illuminate\Support\Facades\Notification::class,
+        'Password'     => Illuminate\Support\Facades\Password::class,
+        'Queue'        => Illuminate\Support\Facades\Queue::class,
+        'RateLimiter'  => Illuminate\Support\Facades\RateLimiter::class,
+        'Redirect'     => Illuminate\Support\Facades\Redirect::class,
+        // 'Redis'        => Illuminate\Support\Facades\Redis::class,
+        'Request'      => Illuminate\Support\Facades\Request::class,
+        'Response'     => Illuminate\Support\Facades\Response::class,
+        'Route'        => Illuminate\Support\Facades\Route::class,
+        'Schema'       => Illuminate\Support\Facades\Schema::class,
+        'Session'      => Illuminate\Support\Facades\Session::class,
+        'Storage'      => Illuminate\Support\Facades\Storage::class,
+        'Str'          => Illuminate\Support\Str::class,
+        'URL'          => Illuminate\Support\Facades\URL::class,
+        'Validator'    => Illuminate\Support\Facades\Validator::class,
+        'View'         => Illuminate\Support\Facades\View::class,
+
         // Laravel Packages
         'Socialite'    => Laravel\Socialite\Facades\Socialite::class,
 
@@ -161,7 +202,7 @@ return [
         // Custom BookStack
         'Activity'    => BookStack\Facades\Activity::class,
         'Theme'       => BookStack\Facades\Theme::class,
-    ])->toArray(),
+    ],
 
     // Proxy configuration
     'proxies' => env('APP_PROXIES', ''),

app/Config/broadcasting.php

@@ -14,7 +14,7 @@ return [
     // This option controls the default broadcaster that will be used by the
     // framework when an event needs to be broadcast. This can be set to
     // any of the connections defined in the "connections" array below.
-    'default' => 'null',
+    'default' => env('BROADCAST_DRIVER', 'pusher'),
 
     // Broadcast Connections
     // Here you may define all of the broadcast connections that will be used
@@ -22,7 +22,21 @@ return [
     // each available type of connection are provided inside this array.
     'connections' => [
 
-        // Default options removed since we don't use broadcasting.
+        'pusher' => [
+            'driver'  => 'pusher',
+            'key'     => env('PUSHER_APP_KEY'),
+            'secret'  => env('PUSHER_APP_SECRET'),
+            'app_id'  => env('PUSHER_APP_ID'),
+            'options' => [
+                'cluster' => env('PUSHER_APP_CLUSTER'),
+                'useTLS'  => true,
+            ],
+        ],
+
+        'redis' => [
+            'driver'     => 'redis',
+            'connection' => 'default',
+        ],
 
         'log' => [
             'driver' => 'log',

app/Config/cache.php

@@ -87,6 +87,6 @@ return [
     |
     */
 
-    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_cache_'),
+    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_cache'),
 
 ];

app/Config/filesystems.php

@@ -33,20 +33,17 @@ return [
             'driver'     => 'local',
             'root'       => public_path(),
             'visibility' => 'public',
-            'throw'      => true,
         ],
 
         'local_secure_attachments' => [
             'driver' => 'local',
             'root'   => storage_path('uploads/files/'),
-            'throw'  => true,
         ],
 
         'local_secure_images' => [
             'driver'     => 'local',
             'root'       => storage_path('uploads/images/'),
             'visibility' => 'public',
-            'throw'      => true,
         ],
 
         's3' => [
@@ -57,7 +54,6 @@ return [
             'bucket'                  => env('STORAGE_S3_BUCKET', 'your-bucket'),
             'endpoint'                => env('STORAGE_S3_ENDPOINT', null),
             'use_path_style_endpoint' => env('STORAGE_S3_ENDPOINT', null) !== null,
-            'throw'                   => true,
         ],
 
     ],

app/Config/logging.php

@@ -21,15 +21,6 @@ return [
     // one of the channels defined in the "channels" configuration array.
     'default' => env('LOG_CHANNEL', 'single'),
 
-    // Deprecations Log Channel
-    // This option controls the log channel that should be used to log warnings
-    // regarding deprecated PHP and library features. This allows you to get
-    // your application ready for upcoming major versions of dependencies.
-    'deprecations' => [
-        'channel' => 'null',
-        'trace' => false,
-    ],
-
     // Log Channels
     // Here you may configure the log channels for your application. Out of
     // the box, Laravel uses the Monolog PHP logging library. This gives

app/Config/mail.php

@@ -14,7 +14,13 @@ return [
     // From Laravel 7+ this is MAIL_MAILER in laravel.
     // Kept as MAIL_DRIVER in BookStack to prevent breaking change.
     // Options: smtp, sendmail, log, array
-    'default' => env('MAIL_DRIVER', 'smtp'),
+    'driver' => env('MAIL_DRIVER', 'smtp'),
+
+    // SMTP host address
+    'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
+
+    // SMTP host port
+    'port' => env('MAIL_PORT', 587),
 
     // Global "From" address & name
     'from' => [
@@ -22,42 +28,17 @@ return [
         'name'    => env('MAIL_FROM_NAME', 'BookStack'),
     ],
 
-    // Mailer Configurations
-    // Available mailing methods and their settings.
-    'mailers' => [
-        'smtp' => [
-            'transport' => 'smtp',
-            'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
-            'port' => env('MAIL_PORT', 587),
-            'encryption' => env('MAIL_ENCRYPTION', 'tls'),
-            'username' => env('MAIL_USERNAME'),
-            'password' => env('MAIL_PASSWORD'),
-            'timeout' => null,
-            'local_domain' => env('MAIL_EHLO_DOMAIN'),
-        ],
+    // Email encryption protocol
+    'encryption' => env('MAIL_ENCRYPTION', 'tls'),
 
-        'sendmail' => [
-            'transport' => 'sendmail',
-            'path' => env('MAIL_SENDMAIL_COMMAND', '/usr/sbin/sendmail -bs'),
-        ],
+    // SMTP server username
+    'username' => env('MAIL_USERNAME'),
 
-        'log' => [
-            'transport' => 'log',
-            'channel' => env('MAIL_LOG_CHANNEL'),
-        ],
+    // SMTP server password
+    'password' => env('MAIL_PASSWORD'),
 
-        'array' => [
-            'transport' => 'array',
-        ],
-
-        'failover' => [
-            'transport' => 'failover',
-            'mailers' => [
-                'smtp',
-                'log',
-            ],
-        ],
-    ],
+    // Sendmail application path
+    'sendmail' => '/usr/sbin/sendmail -bs',
 
     // Email markdown configuration
     'markdown' => [
@@ -66,4 +47,11 @@ return [
             resource_path('views/vendor/mail'),
         ],
     ],
+
+    // Log Channel
+    // If you are using the "log" driver, you may specify the logging channel
+    // if you prefer to keep mail messages separate from other log entries
+    // for simpler reading. Otherwise, the default channel will be used.
+    'log_channel' => env('MAIL_LOG_CHANNEL'),
+
 ];

app/Config/oidc.php

@@ -8,12 +8,9 @@ return [
     // Dump user details after a login request for debugging purposes
     'dump_user_details' => env('OIDC_DUMP_USER_DETAILS', false),
 
-    // Claim, within an OpenId token, to find the user's display name
+    // Attribute, within a OpenId token, to find the user's display name
     'display_name_claims' => explode('|', env('OIDC_DISPLAY_NAME_CLAIMS', 'name')),
 
-    // Claim, within an OpenID token, to use to connect a BookStack user to the OIDC user.
-    'external_id_claim' => env('OIDC_EXTERNAL_ID_CLAIM', 'sub'),
-
     // OAuth2/OpenId client id, as configured in your Authorization server.
     'client_id' => env('OIDC_CLIENT_ID', null),
 

app/Config/setting-defaults.php

@@ -16,20 +16,11 @@ return [
     'app-editor'           => 'wysiwyg',
     'app-color'            => '#206ea7',
     'app-color-light'      => 'rgba(32,110,167,0.15)',
-    'link-color'           => '#206ea7',
     'bookshelf-color'      => '#a94747',
     'book-color'           => '#077b70',
     'chapter-color'        => '#af4d0d',
     'page-color'           => '#206ea7',
     'page-draft-color'     => '#7e50b1',
-    'app-color-dark'       => '#195785',
-    'app-color-light-dark' => 'rgba(32,110,167,0.15)',
-    'link-color-dark'      => '#429fe3',
-    'bookshelf-color-dark' => '#ff5454',
-    'book-color-dark'      => '#389f60',
-    'chapter-color-dark'   => '#ee7a2d',
-    'page-color-dark'      => '#429fe3',
-    'page-draft-color-dark' => '#a66ce8',
     'app-custom-head'      => false,
     'registration-enabled' => false,
 

app/Console/Commands/RegeneratePermissions.php

@@ -2,7 +2,7 @@
 
 namespace BookStack\Console\Commands;
 
-use BookStack\Auth\Permissions\JointPermissionBuilder;
+use BookStack\Auth\Permissions\CollapsedPermissionBuilder;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 
@@ -22,12 +22,12 @@ class RegeneratePermissions extends Command
      */
     protected $description = 'Regenerate all system permissions';
 
-    protected JointPermissionBuilder $permissionBuilder;
+    protected CollapsedPermissionBuilder $permissionBuilder;
 
     /**
      * Create a new command instance.
      */
-    public function __construct(JointPermissionBuilder $permissionBuilder)
+    public function __construct(CollapsedPermissionBuilder $permissionBuilder)
     {
         $this->permissionBuilder = $permissionBuilder;
         parent::__construct();

app/Entities/Models/Entity.php

@@ -7,9 +7,9 @@ use BookStack\Actions\Comment;
 use BookStack\Actions\Favourite;
 use BookStack\Actions\Tag;
 use BookStack\Actions\View;
+use BookStack\Auth\Permissions\CollapsedPermission;
 use BookStack\Auth\Permissions\EntityPermission;
-use BookStack\Auth\Permissions\JointPermission;
-use BookStack\Auth\Permissions\JointPermissionBuilder;
+use BookStack\Auth\Permissions\CollapsedPermissionBuilder;
 use BookStack\Auth\Permissions\PermissionApplicator;
 use BookStack\Entities\Tools\SlugGenerator;
 use BookStack\Interfaces\Deletable;
@@ -69,7 +69,7 @@ abstract class Entity extends Model implements Sluggable, Favouritable, Viewable
      */
     public function scopeVisible(Builder $query): Builder
     {
-        return app()->make(PermissionApplicator::class)->restrictEntityQuery($query);
+        return app()->make(PermissionApplicator::class)->restrictEntityQuery($query, $this->getMorphClass());
     }
 
     /**
@@ -187,11 +187,11 @@ abstract class Entity extends Model implements Sluggable, Favouritable, Viewable
     }
 
     /**
-     * Get the entity jointPermissions this is connected to.
+     * Get the entity collapsed permissions this is connected to.
      */
-    public function jointPermissions(): MorphMany
+    public function collapsedPermissions(): MorphMany
     {
-        return $this->morphMany(JointPermission::class, 'entity');
+        return $this->morphMany(CollapsedPermission::class, 'entity');
     }
 
     /**
@@ -292,7 +292,7 @@ abstract class Entity extends Model implements Sluggable, Favouritable, Viewable
      */
     public function rebuildPermissions()
     {
-        app()->make(JointPermissionBuilder::class)->rebuildForEntity(clone $this);
+        app()->make(CollapsedPermissionBuilder::class)->rebuildForEntity(clone $this);
     }
 
     /**

app/Entities/Tools/Markdown/CustomListItemRenderer.php

@@ -2,18 +2,18 @@
 
 namespace BookStack\Entities\Tools\Markdown;
 
-use League\CommonMark\Extension\CommonMark\Node\Block\ListItem;
-use League\CommonMark\Extension\CommonMark\Renderer\Block\ListItemRenderer;
+use League\CommonMark\Block\Element\AbstractBlock;
+use League\CommonMark\Block\Element\ListItem;
+use League\CommonMark\Block\Element\Paragraph;
+use League\CommonMark\Block\Renderer\BlockRendererInterface;
+use League\CommonMark\Block\Renderer\ListItemRenderer;
+use League\CommonMark\ElementRendererInterface;
 use League\CommonMark\Extension\TaskList\TaskListItemMarker;
-use League\CommonMark\Node\Block\Paragraph;
-use League\CommonMark\Node\Node;
-use League\CommonMark\Renderer\ChildNodeRendererInterface;
-use League\CommonMark\Renderer\NodeRendererInterface;
-use League\CommonMark\Util\HtmlElement;
+use League\CommonMark\HtmlElement;
 
-class CustomListItemRenderer implements NodeRendererInterface
+class CustomListItemRenderer implements BlockRendererInterface
 {
-    protected ListItemRenderer $baseRenderer;
+    protected $baseRenderer;
 
     public function __construct()
     {
@@ -23,11 +23,11 @@ class CustomListItemRenderer implements NodeRendererInterface
     /**
      * @return HtmlElement|string|null
      */
-    public function render(Node $node, ChildNodeRendererInterface $childRenderer)
+    public function render(AbstractBlock $block, ElementRendererInterface $htmlRenderer, bool $inTightList = false)
     {
-        $listItem = $this->baseRenderer->render($node, $childRenderer);
+        $listItem = $this->baseRenderer->render($block, $htmlRenderer, $inTightList);
 
-        if ($node instanceof ListItem && $this->startsTaskListItem($node) && $listItem instanceof HtmlElement) {
+        if ($this->startsTaskListItem($block)) {
             $listItem->setAttribute('class', 'task-list-item');
         }
 

app/Entities/Tools/Markdown/CustomStrikeThroughExtension.php

@@ -2,16 +2,16 @@
 
 namespace BookStack\Entities\Tools\Markdown;
 
-use League\CommonMark\Environment\EnvironmentBuilderInterface;
+use League\CommonMark\ConfigurableEnvironmentInterface;
 use League\CommonMark\Extension\ExtensionInterface;
 use League\CommonMark\Extension\Strikethrough\Strikethrough;
 use League\CommonMark\Extension\Strikethrough\StrikethroughDelimiterProcessor;
 
 class CustomStrikeThroughExtension implements ExtensionInterface
 {
-    public function register(EnvironmentBuilderInterface $environment): void
+    public function register(ConfigurableEnvironmentInterface $environment)
     {
         $environment->addDelimiterProcessor(new StrikethroughDelimiterProcessor());
-        $environment->addRenderer(Strikethrough::class, new CustomStrikethroughRenderer());
+        $environment->addInlineRenderer(Strikethrough::class, new CustomStrikethroughRenderer());
     }
 }

app/Entities/Tools/Markdown/CustomStrikethroughRenderer.php

@@ -2,23 +2,25 @@
 
 namespace BookStack\Entities\Tools\Markdown;
 
+use League\CommonMark\ElementRendererInterface;
 use League\CommonMark\Extension\Strikethrough\Strikethrough;
-use League\CommonMark\Node\Node;
-use League\CommonMark\Renderer\ChildNodeRendererInterface;
-use League\CommonMark\Renderer\NodeRendererInterface;
-use League\CommonMark\Util\HtmlElement;
+use League\CommonMark\HtmlElement;
+use League\CommonMark\Inline\Element\AbstractInline;
+use League\CommonMark\Inline\Renderer\InlineRendererInterface;
 
 /**
  * This is a somewhat clone of the League\CommonMark\Extension\Strikethrough\StrikethroughRender
  * class but modified slightly to use <s> HTML tags instead of <del> in order to
  * match front-end markdown-it rendering.
  */
-class CustomStrikethroughRenderer implements NodeRendererInterface
+class CustomStrikethroughRenderer implements InlineRendererInterface
 {
-    public function render(Node $node, ChildNodeRendererInterface $childRenderer)
+    public function render(AbstractInline $inline, ElementRendererInterface $htmlRenderer)
     {
-        Strikethrough::assertInstanceOf($node);
+        if (!($inline instanceof Strikethrough)) {
+            throw new \InvalidArgumentException('Incompatible inline type: ' . get_class($inline));
+        }
 
-        return new HtmlElement('s', $node->data->get('attributes'), $childRenderer->renderNodes($node->children()));
+        return new HtmlElement('s', $inline->getData('attributes', []), $htmlRenderer->renderInlines($inline->children()));
     }
 }

app/Entities/Tools/Markdown/MarkdownToHtml.php

@@ -4,12 +4,11 @@ namespace BookStack\Entities\Tools\Markdown;
 
 use BookStack\Facades\Theme;
 use BookStack\Theming\ThemeEvents;
-use League\CommonMark\Environment\Environment;
-use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension;
-use League\CommonMark\Extension\CommonMark\Node\Block\ListItem;
+use League\CommonMark\Block\Element\ListItem;
+use League\CommonMark\CommonMarkConverter;
+use League\CommonMark\Environment;
 use League\CommonMark\Extension\Table\TableExtension;
 use League\CommonMark\Extension\TaskList\TaskListExtension;
-use League\CommonMark\MarkdownConverter;
 
 class MarkdownToHtml
 {
@@ -22,16 +21,15 @@ class MarkdownToHtml
 
     public function convert(): string
     {
-        $environment = new Environment();
-        $environment->addExtension(new CommonMarkCoreExtension());
+        $environment = Environment::createCommonMarkEnvironment();
         $environment->addExtension(new TableExtension());
         $environment->addExtension(new TaskListExtension());
         $environment->addExtension(new CustomStrikeThroughExtension());
         $environment = Theme::dispatch(ThemeEvents::COMMONMARK_ENVIRONMENT_CONFIGURE, $environment) ?? $environment;
-        $converter = new MarkdownConverter($environment);
+        $converter = new CommonMarkConverter([], $environment);
 
-        $environment->addRenderer(ListItem::class, new CustomListItemRenderer(), 10);
+        $environment->addBlockRenderer(ListItem::class, new CustomListItemRenderer(), 10);
 
-        return $converter->convert($this->markdown)->getContent();
+        return $converter->convertToHtml($this->markdown);
     }
 }

app/Entities/Tools/PageContent.php

@@ -19,15 +19,20 @@ use Illuminate\Support\Str;
 
 class PageContent
 {
-    public function __construct(
-        protected Page $page
-    ) {
+    protected Page $page;
+
+    /**
+     * PageContent constructor.
+     */
+    public function __construct(Page $page)
+    {
+        $this->page = $page;
     }
 
     /**
      * Update the content of the page with new provided HTML.
      */
-    public function setNewHTML(string $html): void
+    public function setNewHTML(string $html)
     {
         $html = $this->extractBase64ImagesFromHtml($html);
         $this->page->html = $this->formatHtml($html);
@@ -38,7 +43,7 @@ class PageContent
     /**
      * Update the content of the page with new provided Markdown content.
      */
-    public function setNewMarkdown(string $markdown): void
+    public function setNewMarkdown(string $markdown)
     {
         $markdown = $this->extractBase64ImagesFromMarkdown($markdown);
         $this->page->markdown = $markdown;
@@ -52,7 +57,7 @@ class PageContent
      */
     protected function extractBase64ImagesFromHtml(string $htmlText): string
     {
-        if (empty($htmlText) || !str_contains($htmlText, 'data:image')) {
+        if (empty($htmlText) || strpos($htmlText, 'data:image') === false) {
             return $htmlText;
         }
 
@@ -86,7 +91,7 @@ class PageContent
      * Attempting to capture the whole data uri using regex can cause PHP
      * PCRE limits to be hit with larger, multi-MB, files.
      */
-    protected function extractBase64ImagesFromMarkdown(string $markdown): string
+    protected function extractBase64ImagesFromMarkdown(string $markdown)
     {
         $matches = [];
         $contentLength = strlen($markdown);
@@ -178,13 +183,32 @@ class PageContent
         $childNodes = $body->childNodes;
         $xPath = new DOMXPath($doc);
 
-        // Map to hold used ID references
+        // Set ids on top-level nodes
         $idMap = [];
-        // Map to hold changing ID references
-        $changeMap = [];
+        foreach ($childNodes as $index => $childNode) {
+            [$oldId, $newId] = $this->setUniqueId($childNode, $idMap);
+            if ($newId && $newId !== $oldId) {
+                $this->updateLinks($xPath, '#' . $oldId, '#' . $newId);
+            }
+        }
 
-        $this->updateIdsRecursively($body, 0, $idMap, $changeMap);
-        $this->updateLinks($xPath, $changeMap);
+        // Set ids on nested header nodes
+        $nestedHeaders = $xPath->query('//body//*//h1|//body//*//h2|//body//*//h3|//body//*//h4|//body//*//h5|//body//*//h6');
+        foreach ($nestedHeaders as $nestedHeader) {
+            [$oldId, $newId] = $this->setUniqueId($nestedHeader, $idMap);
+            if ($newId && $newId !== $oldId) {
+                $this->updateLinks($xPath, '#' . $oldId, '#' . $newId);
+            }
+        }
+
+        // Ensure no duplicate ids within child items
+        $idElems = $xPath->query('//body//*//*[@id]');
+        foreach ($idElems as $domElem) {
+            [$oldId, $newId] = $this->setUniqueId($domElem, $idMap);
+            if ($newId && $newId !== $oldId) {
+                $this->updateLinks($xPath, '#' . $oldId, '#' . $newId);
+            }
+        }
 
         // Generate inner html as a string
         $html = '';
@@ -199,53 +223,20 @@ class PageContent
     }
 
     /**
-     * For the given DOMNode, traverse its children recursively and update IDs
-     * where required (Top-level, headers & elements with IDs).
-     * Will update the provided $changeMap array with changes made, where keys are the old
-     * ids and the corresponding values are the new ids.
+     * Update the all links to the $old location to instead point to $new.
      */
-    protected function updateIdsRecursively(DOMNode $element, int $depth, array &$idMap, array &$changeMap): void
+    protected function updateLinks(DOMXPath $xpath, string $old, string $new)
     {
-        /* @var DOMNode $child */
-        foreach ($element->childNodes as $child) {
-            if ($child instanceof DOMElement && ($depth === 0 || in_array($child->nodeName, ['h1', 'h2', 'h3', 'h4', 'h5', 'h6']) || $child->getAttribute('id'))) {
-                [$oldId, $newId] = $this->setUniqueId($child, $idMap);
-                if ($newId && $newId !== $oldId && !isset($idMap[$oldId])) {
-                    $changeMap[$oldId] = $newId;
-                }
-            }
-
-            if ($child->hasChildNodes()) {
-                $this->updateIdsRecursively($child, $depth + 1, $idMap, $changeMap);
-            }
-        }
-    }
-
-    /**
-     * Update the all links in the given xpath to apply requires changes within the
-     * given $changeMap array.
-     */
-    protected function updateLinks(DOMXPath $xpath, array $changeMap): void
-    {
-        if (empty($changeMap)) {
-            return;
-        }
-
-        $links = $xpath->query('//body//*//*[@href]');
-        /** @var DOMElement $domElem */
-        foreach ($links as $domElem) {
-            $href = ltrim($domElem->getAttribute('href'), '#');
-            $newHref = $changeMap[$href] ?? null;
-            if ($newHref) {
-                $domElem->setAttribute('href', '#' . $newHref);
-            }
+        $old = str_replace('"', '', $old);
+        $matchingLinks = $xpath->query('//body//*//*[@href="' . $old . '"]');
+        foreach ($matchingLinks as $domElem) {
+            $domElem->setAttribute('href', $new);
         }
     }
 
     /**
      * Set a unique id on the given DOMElement.
-     * A map for existing ID's should be passed in to check for current existence,
-     * and this will be updated with any new IDs set upon elements.
+     * A map for existing ID's should be passed in to check for current existence.
      * Returns a pair of strings in the format [old_id, new_id].
      */
     protected function setUniqueId(DOMNode $element, array &$idMap): array
@@ -256,7 +247,7 @@ class PageContent
 
         // Stop if there's an existing valid id that has not already been used.
         $existingId = $element->getAttribute('id');
-        if (str_starts_with($existingId, 'bkmrk') && !isset($idMap[$existingId])) {
+        if (strpos($existingId, 'bkmrk') === 0 && !isset($idMap[$existingId])) {
             $idMap[$existingId] = true;
 
             return [$existingId, $existingId];
@@ -267,7 +258,7 @@ class PageContent
         // the same content is passed through.
         $contentId = 'bkmrk-' . mb_substr(strtolower(preg_replace('/\s+/', '-', trim($element->nodeValue))), 0, 20);
         $newId = urlencode($contentId);
-        $loopIndex = 1;
+        $loopIndex = 0;
 
         while (isset($idMap[$newId])) {
             $newId = urlencode($contentId . '-' . $loopIndex);
@@ -449,8 +440,8 @@ class PageContent
     {
         libxml_use_internal_errors(true);
         $doc = new DOMDocument();
-        $html = '<?xml encoding="utf-8" ?><body>' . $html . '</body>';
-        $doc->loadHTML($html);
+        $html = '<body>' . $html . '</body>';
+        $doc->loadHTML(mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'));
 
         return $doc;
     }

app/Entities/Tools/PermissionsUpdater.php

@@ -10,7 +10,6 @@ use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Entity;
 use BookStack\Facades\Activity;
 use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
 
 class PermissionsUpdater
 {
@@ -58,13 +57,30 @@ class PermissionsUpdater
     protected function formatPermissionsFromRequestToEntityPermissions(array $permissions): array
     {
         $formatted = [];
+        $columnsByType = [
+            'role' => 'role_id',
+            'user' => 'user_id',
+            'fallback' => '',
+        ];
 
-        foreach ($permissions as $roleId => $info) {
-            $entityPermissionData = ['role_id' => $roleId];
-            foreach (EntityPermission::PERMISSIONS as $permission) {
-                $entityPermissionData[$permission] = (($info[$permission] ?? false) === "true");
+        foreach ($permissions as $type => $byId) {
+            $column  = $columnsByType[$type] ?? null;
+            if (is_null($column)) {
+                continue;
+            }
+
+            foreach ($byId as $id => $info) {
+                $entityPermissionData = [];
+
+                if (!empty($column)) {
+                    $entityPermissionData[$column] = $id;
+                }
+
+                foreach (EntityPermission::PERMISSIONS as $permission) {
+                    $entityPermissionData[$permission] = (($info[$permission] ?? false) === "true");
+                }
+                $formatted[] = $entityPermissionData;
             }
-            $formatted[] = $entityPermissionData;
         }
 
         return $formatted;

app/Entities/Tools/TrashCan.php

@@ -372,7 +372,7 @@ class TrashCan
         $entity->permissions()->delete();
         $entity->tags()->delete();
         $entity->comments()->delete();
-        $entity->jointPermissions()->delete();
+        $entity->collapsedPermissions()->delete();
         $entity->searchTerms()->delete();
         $entity->deletions()->delete();
         $entity->favourites()->delete();

app/Exceptions/Handler.php

@@ -17,7 +17,7 @@ class Handler extends ExceptionHandler
     /**
      * A list of the exception types that are not reported.
      *
-     * @var array<int, class-string<\Throwable>>
+     * @var array
      */
     protected $dontReport = [
         NotFoundException::class,
@@ -25,9 +25,9 @@ class Handler extends ExceptionHandler
     ];
 
     /**
-     * A list of the inputs that are never flashed to the session on validation exceptions.
+     * A list of the inputs that are never flashed for validation exceptions.
      *
-     * @var array<int, string>
+     * @var array
      */
     protected $dontFlash = [
         'current_password',
@@ -98,7 +98,6 @@ class Handler extends ExceptionHandler
         ];
 
         if ($e instanceof ValidationException) {
-            $responseData['error']['message'] = 'The given data was invalid.';
             $responseData['error']['validation'] = $e->errors();
             $code = $e->status;
         }

app/Exceptions/WhoopsBookStackPrettyHandler.php

@@ -2,18 +2,25 @@
 
 namespace BookStack\Exceptions;
 
-use Illuminate\Contracts\Foundation\ExceptionRenderer;
+use Whoops\Handler\Handler;
 
-class BookStackExceptionHandlerPage implements ExceptionRenderer
+class WhoopsBookStackPrettyHandler extends Handler
 {
-    public function render($throwable)
+    /**
+     * @return int|null A handler may return nothing, or a Handler::HANDLE_* constant
+     */
+    public function handle()
     {
-        return view('errors.debug', [
-            'error'       => $throwable->getMessage(),
-            'errorClass'  => get_class($throwable),
-            'trace'       => $throwable->getTraceAsString(),
+        $exception = $this->getException();
+
+        echo view('errors.debug', [
+            'error'       => $exception->getMessage(),
+            'errorClass'  => get_class($exception),
+            'trace'       => $exception->getTraceAsString(),
             'environment' => $this->getEnvironment(),
         ])->render();
+
+        return Handler::QUIT;
     }
 
     protected function safeReturn(callable $callback, $default = null)

app/Http/Controllers/Api/ApiController.php

@@ -32,15 +32,10 @@ abstract class ApiController extends Controller
      */
     public function getValidationRules(): array
     {
-        return $this->rules();
-    }
+        if (method_exists($this, 'rules')) {
+            return $this->rules();
+        }
 
-    /**
-     * Get the validation rules for the actions in this controller.
-     * Defaults to a $rules property but can be a rules() method.
-     */
-    protected function rules(): array
-    {
         return $this->rules;
     }
 }

app/Http/Controllers/Api/AttachmentApiController.php

@@ -13,9 +13,11 @@ use Illuminate\Validation\ValidationException;
 
 class AttachmentApiController extends ApiController
 {
-    public function __construct(
-        protected AttachmentService $attachmentService
-    ) {
+    protected $attachmentService;
+
+    public function __construct(AttachmentService $attachmentService)
+    {
+        $this->attachmentService = $attachmentService;
     }
 
     /**
@@ -172,13 +174,13 @@ class AttachmentApiController extends ApiController
                 'name'        => ['required', 'min:1', 'max:255', 'string'],
                 'uploaded_to' => ['required', 'integer', 'exists:pages,id'],
                 'file'        => array_merge(['required_without:link'], $this->attachmentService->getFileValidationRules()),
-                'link'        => ['required_without:file', 'min:1', 'max:2000', 'safe_url'],
+                'link'        => ['required_without:file', 'min:1', 'max:255', 'safe_url'],
             ],
             'update' => [
                 'name'        => ['min:1', 'max:255', 'string'],
                 'uploaded_to' => ['integer', 'exists:pages,id'],
                 'file'        => $this->attachmentService->getFileValidationRules(),
-                'link'        => ['min:1', 'max:2000', 'safe_url'],
+                'link'        => ['min:1', 'max:255', 'safe_url'],
             ],
         ];
     }

app/Http/Controllers/Api/RoleApiController.php

@@ -1,136 +0,0 @@
-<?php
-
-namespace BookStack\Http\Controllers\Api;
-
-use BookStack\Auth\Permissions\PermissionsRepo;
-use BookStack\Auth\Role;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class RoleApiController extends ApiController
-{
-    protected PermissionsRepo $permissionsRepo;
-
-    protected array $fieldsToExpose = [
-        'display_name', 'description', 'mfa_enforced', 'external_auth_id', 'created_at', 'updated_at',
-    ];
-
-    protected $rules = [
-        'create' => [
-            'display_name'  => ['required', 'string', 'min:3', 'max:180'],
-            'description'   => ['string', 'max:180'],
-            'mfa_enforced'  => ['boolean'],
-            'external_auth_id' => ['string'],
-            'permissions'   => ['array'],
-            'permissions.*' => ['string'],
-        ],
-        'update' => [
-            'display_name'  => ['string', 'min:3', 'max:180'],
-            'description'   => ['string', 'max:180'],
-            'mfa_enforced'  => ['boolean'],
-            'external_auth_id' => ['string'],
-            'permissions'   => ['array'],
-            'permissions.*' => ['string'],
-        ]
-    ];
-
-    public function __construct(PermissionsRepo $permissionsRepo)
-    {
-        $this->permissionsRepo = $permissionsRepo;
-
-        // Checks for all endpoints in this controller
-        $this->middleware(function ($request, $next) {
-            $this->checkPermission('user-roles-manage');
-
-            return $next($request);
-        });
-    }
-
-    /**
-     * Get a listing of roles in the system.
-     * Requires permission to manage roles.
-     */
-    public function list()
-    {
-        $roles = Role::query()->select(['*'])
-            ->withCount(['users', 'permissions']);
-
-        return $this->apiListingResponse($roles, [
-            ...$this->fieldsToExpose,
-            'permissions_count',
-            'users_count',
-        ]);
-    }
-
-    /**
-     * Create a new role in the system.
-     * Permissions should be provided as an array of permission name strings.
-     * Requires permission to manage roles.
-     */
-    public function create(Request $request)
-    {
-        $data = $this->validate($request, $this->rules()['create']);
-
-        $role = null;
-        DB::transaction(function () use ($data, &$role) {
-            $role = $this->permissionsRepo->saveNewRole($data);
-        });
-
-        $this->singleFormatter($role);
-
-        return response()->json($role);
-    }
-
-    /**
-     * View the details of a single role.
-     * Provides the permissions and a high-level list of the users assigned.
-     * Requires permission to manage roles.
-     */
-    public function read(string $id)
-    {
-        $user = $this->permissionsRepo->getRoleById($id);
-        $this->singleFormatter($user);
-
-        return response()->json($user);
-    }
-
-    /**
-     * Update an existing role in the system.
-     * Permissions should be provided as an array of permission name strings.
-     * An empty "permissions" array would clear granted permissions.
-     * In many cases, where permissions are changed, you'll want to fetch the existing
-     * permissions and then modify before providing in your update request.
-     * Requires permission to manage roles.
-     */
-    public function update(Request $request, string $id)
-    {
-        $data = $this->validate($request, $this->rules()['update']);
-        $role = $this->permissionsRepo->updateRole($id, $data);
-
-        $this->singleFormatter($role);
-
-        return response()->json($role);
-    }
-
-    /**
-     * Delete a role from the system.
-     * Requires permission to manage roles.
-     */
-    public function delete(string $id)
-    {
-        $this->permissionsRepo->deleteRole(intval($id));
-
-        return response('', 204);
-    }
-
-    /**
-     * Format the given role model for single-result display.
-     */
-    protected function singleFormatter(Role $role)
-    {
-        $role->load('users:id,name,slug');
-        $role->unsetRelation('permissions');
-        $role->setAttribute('permissions', $role->permissions()->orderBy('name', 'asc')->pluck('name'));
-        $role->makeVisible(['users', 'permissions']);
-    }
-}

app/Http/Controllers/Api/UserApiController.php

@@ -13,9 +13,9 @@ use Illuminate\Validation\Rules\Unique;
 
 class UserApiController extends ApiController
 {
-    protected UserRepo $userRepo;
+    protected $userRepo;
 
-    protected array $fieldsToExpose = [
+    protected $fieldsToExpose = [
         'email', 'created_at', 'updated_at', 'last_activity_at', 'external_auth_id',
     ];
 

app/Http/Controllers/AttachmentController.php

@@ -15,10 +15,16 @@ use Illuminate\Validation\ValidationException;
 
 class AttachmentController extends Controller
 {
-    public function __construct(
-        protected AttachmentService $attachmentService,
-        protected PageRepo $pageRepo
-    ) {
+    protected AttachmentService $attachmentService;
+    protected PageRepo $pageRepo;
+
+    /**
+     * AttachmentController constructor.
+     */
+    public function __construct(AttachmentService $attachmentService, PageRepo $pageRepo)
+    {
+        $this->attachmentService = $attachmentService;
+        $this->pageRepo = $pageRepo;
     }
 
     /**
@@ -106,7 +112,7 @@ class AttachmentController extends Controller
         try {
             $this->validate($request, [
                 'attachment_edit_name' => ['required', 'string', 'min:1', 'max:255'],
-                'attachment_edit_url'  => ['string', 'min:1', 'max:2000', 'safe_url'],
+                'attachment_edit_url'  => ['string', 'min:1', 'max:255', 'safe_url'],
             ]);
         } catch (ValidationException $exception) {
             return response()->view('attachments.manager-edit-form', array_merge($request->only(['attachment_edit_name', 'attachment_edit_url']), [
@@ -142,7 +148,7 @@ class AttachmentController extends Controller
             $this->validate($request, [
                 'attachment_link_uploaded_to' => ['required', 'integer', 'exists:pages,id'],
                 'attachment_link_name'        => ['required', 'string', 'min:1', 'max:255'],
-                'attachment_link_url'         => ['required', 'string', 'min:1', 'max:2000', 'safe_url'],
+                'attachment_link_url'         => ['required', 'string', 'min:1', 'max:255', 'safe_url'],
             ]);
         } catch (ValidationException $exception) {
             return response()->view('attachments.manager-link-form', array_merge($request->only(['attachment_link_name', 'attachment_link_url']), [

app/Http/Controllers/BookshelfController.php

@@ -64,7 +64,7 @@ class BookshelfController extends Controller
     public function create()
     {
         $this->checkPermission('bookshelf-create-all');
-        $books = Book::visible()->orderBy('name')->get(['name', 'id', 'slug', 'created_at', 'updated_at']);
+        $books = Book::visible()->orderBy('name')->get(['name', 'id', 'slug']);
         $this->setPageTitle(trans('entities.shelves_create'));
 
         return view('shelves.create', ['books' => $books]);
@@ -140,7 +140,7 @@ class BookshelfController extends Controller
         $this->checkOwnablePermission('bookshelf-update', $shelf);
 
         $shelfBookIds = $shelf->books()->get(['id'])->pluck('id');
-        $books = Book::visible()->whereNotIn('id', $shelfBookIds)->orderBy('name')->get(['name', 'id', 'slug', 'created_at', 'updated_at']);
+        $books = Book::visible()->whereNotIn('id', $shelfBookIds)->orderBy('name')->get(['name', 'id', 'slug']);
 
         $this->setPageTitle(trans('entities.shelves_edit_named', ['name' => $shelf->getShortName()]));
 

app/Http/Controllers/HomeController.php

@@ -10,7 +10,6 @@ use BookStack\Entities\Queries\TopFavourites;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\BookshelfRepo;
 use BookStack\Entities\Tools\PageContent;
-use BookStack\Uploads\FaviconHandler;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
 
@@ -128,15 +127,4 @@ class HomeController extends Controller
     {
         return response()->view('errors.404', [], 404);
     }
-
-    /**
-     * Serve the application favicon.
-     * Ensures a 'favicon.ico' file exists at the web root location (if writable) to be served
-     * directly by the webserver in the future.
-     */
-    public function favicon(FaviconHandler $favicons)
-    {
-        $exists = $favicons->restoreOriginalIfNotExists();
-        return response()->file($exists ? $favicons->getPath() : $favicons->getOriginalPath());
-    }
 }

app/Http/Controllers/Images/DrawioImageController.php

@@ -66,19 +66,14 @@ class DrawioImageController extends Controller
      */
     public function getAsBase64($id)
     {
-        try {
-            $image = $this->imageRepo->getById($id);
-        } catch (Exception $exception) {
-            return $this->jsonError(trans('errors.drawing_data_not_found'), 404);
-        }
-
-        if ($image->type !== 'drawio' || !userCan('page-view', $image->getPage())) {
-            return $this->jsonError(trans('errors.drawing_data_not_found'), 404);
+        $image = $this->imageRepo->getById($id);
+        if (is_null($image) || $image->type !== 'drawio' || !userCan('page-view', $image->getPage())) {
+            return $this->jsonError('Image data could not be found');
         }
 
         $imageData = $this->imageRepo->getImageData($image);
         if (is_null($imageData)) {
-            return $this->jsonError(trans('errors.drawing_data_not_found'), 404);
+            return $this->jsonError('Image data could not be found');
         }
 
         return response()->json([

app/Http/Controllers/PermissionsController.php

@@ -5,6 +5,7 @@ namespace BookStack\Http\Controllers;
 use BookStack\Auth\Permissions\EntityPermission;
 use BookStack\Auth\Permissions\PermissionFormData;
 use BookStack\Auth\Role;
+use BookStack\Auth\User;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
@@ -162,10 +163,35 @@ class PermissionsController extends Controller
     {
         $this->checkPermissionOr('restrictions-manage-all', fn() => userCan('restrictions-manage-own'));
 
+        /** @var Role $role */
         $role = Role::query()->findOrFail($roleId);
 
         return view('form.entity-permissions-row', [
-            'role' => $role,
+            'modelType' => 'role',
+            'modelId' => $role->id,
+            'modelName' => $role->display_name,
+            'modelDescription' => $role->description,
+            'permission' => new EntityPermission(),
+            'entityType' => $entityType,
+            'inheriting' => false,
+        ]);
+    }
+
+    /**
+     * Get an empty entity permissions form row for the given user.
+     */
+    public function formRowForUser(string $entityType, string $userId)
+    {
+        $this->checkPermissionOr('restrictions-manage-all', fn() => userCan('restrictions-manage-own'));
+
+        /** @var User $user */
+        $user  = User::query()->findOrFail($userId);
+
+        return view('form.entity-permissions-row', [
+            'modelType' => 'user',
+            'modelId' => $user->id,
+            'modelName' => $user->name,
+            'modelDescription' => '',
             'permission' => new EntityPermission(),
             'entityType' => $entityType,
             'inheriting' => false,

app/Http/Controllers/RoleController.php

@@ -74,17 +74,13 @@ class RoleController extends Controller
     public function store(Request $request)
     {
         $this->checkPermission('user-roles-manage');
-        $data = $this->validate($request, [
+        $this->validate($request, [
             'display_name' => ['required', 'min:3', 'max:180'],
             'description'  => ['max:180'],
-            'external_auth_id' => ['string'],
-            'permissions'  => ['array'],
-            'mfa_enforced' => ['string'],
         ]);
 
-        $data['permissions'] = array_keys($data['permissions'] ?? []);
-        $data['mfa_enforced'] = ($data['mfa_enforced'] ?? 'false') === 'true';
-        $this->permissionsRepo->saveNewRole($data);
+        $this->permissionsRepo->saveNewRole($request->all());
+        $this->showSuccessNotification(trans('settings.role_create_success'));
 
         return redirect('/settings/roles');
     }
@@ -104,21 +100,19 @@ class RoleController extends Controller
 
     /**
      * Updates a user role.
+     *
+     * @throws ValidationException
      */
     public function update(Request $request, string $id)
     {
         $this->checkPermission('user-roles-manage');
-        $data = $this->validate($request, [
+        $this->validate($request, [
             'display_name' => ['required', 'min:3', 'max:180'],
             'description'  => ['max:180'],
-            'external_auth_id' => ['string'],
-            'permissions'  => ['array'],
-            'mfa_enforced' => ['string'],
         ]);
 
-        $data['permissions'] = array_keys($data['permissions'] ?? []);
-        $data['mfa_enforced'] = ($data['mfa_enforced'] ?? 'false') === 'true';
-        $this->permissionsRepo->updateRole($id, $data);
+        $this->permissionsRepo->updateRole($id, $request->all());
+        $this->showSuccessNotification(trans('settings.role_update_success'));
 
         return redirect('/settings/roles');
     }
@@ -151,14 +145,15 @@ class RoleController extends Controller
         $this->checkPermission('user-roles-manage');
 
         try {
-            $migrateRoleId = intval($request->get('migrate_role_id') ?: "0");
-            $this->permissionsRepo->deleteRole($id, $migrateRoleId);
+            $this->permissionsRepo->deleteRole($id, $request->get('migrate_role_id'));
         } catch (PermissionsException $e) {
             $this->showErrorNotification($e->getMessage());
 
             return redirect()->back();
         }
 
+        $this->showSuccessNotification(trans('settings.role_delete_success'));
+
         return redirect('/settings/roles');
     }
 }

app/Http/Controllers/SettingController.php

@@ -4,14 +4,20 @@ namespace BookStack\Http\Controllers;
 
 use BookStack\Actions\ActivityType;
 use BookStack\Auth\User;
-use BookStack\Settings\AppSettingsStore;
 use BookStack\Uploads\ImageRepo;
 use Illuminate\Http\Request;
 
 class SettingController extends Controller
 {
+    protected ImageRepo $imageRepo;
+
     protected array $settingCategories = ['features', 'customization', 'registration'];
 
+    public function __construct(ImageRepo $imageRepo)
+    {
+        $this->imageRepo = $imageRepo;
+    }
+
     /**
      * Handle requests to the settings index path.
      */
@@ -42,17 +48,37 @@ class SettingController extends Controller
     /**
      * Update the specified settings in storage.
      */
-    public function update(Request $request, AppSettingsStore $store, string $category)
+    public function update(Request $request, string $category)
     {
         $this->ensureCategoryExists($category);
         $this->preventAccessInDemoMode();
         $this->checkPermission('settings-manage');
         $this->validate($request, [
-            'app_logo' => ['nullable', ...$this->getImageValidationRules()],
-            'app_icon' => ['nullable', ...$this->getImageValidationRules()],
+            'app_logo' => array_merge(['nullable'], $this->getImageValidationRules()),
         ]);
 
-        $store->storeFromUpdateRequest($request, $category);
+        // Cycles through posted settings and update them
+        foreach ($request->all() as $name => $value) {
+            $key = str_replace('setting-', '', trim($name));
+            if (strpos($name, 'setting-') !== 0) {
+                continue;
+            }
+            setting()->put($key, $value);
+        }
+
+        // Update logo image if set
+        if ($category === 'customization' && $request->hasFile('app_logo')) {
+            $logoFile = $request->file('app_logo');
+            $this->imageRepo->destroyByType('system');
+            $image = $this->imageRepo->saveNew($logoFile, 'system', 0, null, 86);
+            setting()->put('app-logo', $image->url);
+        }
+
+        // Clear logo image if requested
+        if ($category === 'customization' && $request->get('app_logo_reset', null)) {
+            $this->imageRepo->destroyByType('system');
+            setting()->remove('app-logo');
+        }
 
         $this->logActivity(ActivityType::SETTINGS_UPDATE, $category);
         $this->showSuccessNotification(trans('settings.settings_save_success'));

app/Http/Controllers/TagController.php

@@ -8,9 +8,11 @@ use Illuminate\Http\Request;
 
 class TagController extends Controller
 {
-    public function __construct(
-        protected TagRepo $tagRepo
-    ) {
+    protected TagRepo $tagRepo;
+
+    public function __construct(TagRepo $tagRepo)
+    {
+        $this->tagRepo = $tagRepo;
     }
 
     /**

app/Http/Controllers/UserController.php

@@ -164,8 +164,6 @@ class UserController extends Controller
         // Delete the profile image if reset option is in request
         if ($request->has('profile_image_reset')) {
             $this->imageRepo->destroyImage($user->avatar);
-            $user->image_id = 0;
-            $user->save();
         }
 
         $redirectUrl = userCan('users-manage') ? '/settings/users' : "/settings/users/{$user->id}";
@@ -197,7 +195,7 @@ class UserController extends Controller
         $this->checkPermissionOrCurrentUser('users-manage', $id);
 
         $user = $this->userRepo->getById($id);
-        $newOwnerId = intval($request->get('new_owner_id')) ?: null;
+        $newOwnerId = $request->get('new_owner_id', null);
 
         $this->userRepo->destroy($user, $newOwnerId);
 

app/Http/Request.php

@@ -9,8 +9,10 @@ class Request extends LaravelRequest
     /**
      * Override the default request methods to get the scheme and host
      * to directly use the custom APP_URL, if set.
+     *
+     * @return string
      */
-    public function getSchemeAndHttpHost(): string
+    public function getSchemeAndHttpHost()
     {
         $appUrl = config('app.url', null);
 
@@ -25,8 +27,10 @@ class Request extends LaravelRequest
      * Override the default request methods to get the base URL
      * to directly use the custom APP_URL, if set.
      * The base URL never ends with a / but should start with one if not empty.
+     *
+     * @return string
      */
-    public function getBaseUrl(): string
+    public function getBaseUrl()
     {
         $appUrl = config('app.url', null);
 

app/Providers/AppServiceProvider.php

@@ -8,16 +8,16 @@ use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
-use BookStack\Exceptions\BookStackExceptionHandlerPage;
+use BookStack\Exceptions\WhoopsBookStackPrettyHandler;
 use BookStack\Settings\SettingService;
 use BookStack\Util\CspService;
 use GuzzleHttp\Client;
-use Illuminate\Contracts\Foundation\ExceptionRenderer;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\ServiceProvider;
 use Psr\Http\Client\ClientInterface as HttpClientInterface;
+use Whoops\Handler\HandlerInterface;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -26,7 +26,7 @@ class AppServiceProvider extends ServiceProvider
      * @var string[]
      */
     public $bindings = [
-        ExceptionRenderer::class => BookStackExceptionHandlerPage::class,
+        HandlerInterface::class => WhoopsBookStackPrettyHandler::class,
     ];
 
     /**

app/Providers/EventServiceProvider.php

@@ -24,22 +24,11 @@ class EventServiceProvider extends ServiceProvider
     ];
 
     /**
-     * Register any events for your application.
+     * Register any other events for your application.
      *
      * @return void
      */
     public function boot()
     {
-        //
-    }
-
-    /**
-     * Determine if events and listeners should be automatically discovered.
-     *
-     * @return bool
-     */
-    public function shouldDiscoverEvents()
-    {
-        return false;
     }
 }

app/Providers/RouteServiceProvider.php

@@ -77,7 +77,7 @@ class RouteServiceProvider extends ServiceProvider
     protected function configureRateLimiting()
     {
         RateLimiter::for('api', function (Request $request) {
-            return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
+            return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());
         });
     }
 }

app/Providers/TranslationServiceProvider.php

@@ -3,41 +3,10 @@
 namespace BookStack\Providers;
 
 use BookStack\Translation\FileLoader;
-use BookStack\Translation\MessageSelector;
 use Illuminate\Translation\TranslationServiceProvider as BaseProvider;
-use Illuminate\Translation\Translator;
 
 class TranslationServiceProvider extends BaseProvider
 {
-    /**
-     * Register the service provider.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->registerLoader();
-
-        // This is a tweak upon Laravel's based translation service registration to allow
-        // usage of a custom MessageSelector class
-        $this->app->singleton('translator', function ($app) {
-            $loader = $app['translation.loader'];
-
-            // When registering the translator component, we'll need to set the default
-            // locale as well as the fallback locale. So, we'll grab the application
-            // configuration so we can easily get both of these values from there.
-            $locale = $app['config']['app.locale'];
-
-            $trans = new Translator($loader, $locale);
-            $trans->setFallback($app['config']['app.fallback_locale']);
-            $trans->setSelector(new MessageSelector());
-
-            return $trans;
-        });
-    }
-
-
-
     /**
      * Register the translation line loader.
      * Overrides the default register action from Laravel so a custom loader can be used.

app/Providers/ValidationRuleServiceProvider.php

@@ -21,8 +21,8 @@ class ValidationRuleServiceProvider extends ServiceProvider
 
         Validator::extend('safe_url', function ($attribute, $value, $parameters, $validator) {
             $cleanLinkName = strtolower(trim($value));
-            $isJs = str_starts_with($cleanLinkName, 'javascript:');
-            $isData = str_starts_with($cleanLinkName, 'data:');
+            $isJs = strpos($cleanLinkName, 'javascript:') === 0;
+            $isData = strpos($cleanLinkName, 'data:') === 0;
 
             return !$isJs && !$isData;
         });

app/References/CrossLinkParser.php

@@ -54,10 +54,10 @@ class CrossLinkParser
     {
         $links = [];
 
-        $html = '<?xml encoding="utf-8" ?><body>' . $html . '</body>';
+        $html = '<body>' . $html . '</body>';
         libxml_use_internal_errors(true);
         $doc = new DOMDocument();
-        $doc->loadHTML($html);
+        $doc->loadHTML(mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'));
 
         $xPath = new DOMXPath($doc);
         $anchors = $xPath->query('//a[@href]');

app/References/Reference.php

@@ -2,9 +2,7 @@
 
 namespace BookStack\References;
 
-use BookStack\Auth\Permissions\JointPermission;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
@@ -26,10 +24,4 @@ class Reference extends Model
     {
         return $this->morphTo('to');
     }
-
-    public function jointPermissions(): HasMany
-    {
-        return $this->hasMany(JointPermission::class, 'entity_id', 'from_id')
-            ->whereColumn('references.from_type', '=', 'joint_permissions.entity_type');
-    }
 }

app/References/ReferenceFetcher.php

@@ -5,7 +5,6 @@ namespace BookStack\References;
 use BookStack\Auth\Permissions\PermissionApplicator;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\Relation;
 
@@ -24,7 +23,8 @@ class ReferenceFetcher
      */
     public function getPageReferencesToEntity(Entity $entity): Collection
     {
-        $baseQuery = $this->queryPageReferencesToEntity($entity)
+        $baseQuery = $entity->referencesTo()
+            ->where('from_type', '=', (new Page())->getMorphClass())
             ->with([
                 'from'         => fn (Relation $query) => $query->select(Page::$listAttributes),
                 'from.book'    => fn (Relation $query) => $query->scopes('visible'),
@@ -47,8 +47,11 @@ class ReferenceFetcher
      */
     public function getPageReferenceCountToEntity(Entity $entity): int
     {
+        $baseQuery = $entity->referencesTo()
+            ->where('from_type', '=', (new Page())->getMorphClass());
+
         $count = $this->permissions->restrictEntityRelationQuery(
-            $this->queryPageReferencesToEntity($entity),
+            $baseQuery,
             'references',
             'from_id',
             'from_type'
@@ -56,12 +59,4 @@ class ReferenceFetcher
 
         return $count;
     }
-
-    protected function queryPageReferencesToEntity(Entity $entity): Builder
-    {
-        return Reference::query()
-            ->where('to_type', '=', $entity->getMorphClass())
-            ->where('to_id', '=', $entity->id)
-            ->where('from_type', '=', (new Page())->getMorphClass());
-    }
 }

app/Search/SearchIndex.php

@@ -15,18 +15,25 @@ class SearchIndex
 {
     /**
      * A list of delimiter characters used to break-up parsed content into terms for indexing.
+     *
+     * @var string
      */
-    public static string $delimiters = " \n\t.,!?:;()[]{}<>`'\"";
+    public static $delimiters = " \n\t.,!?:;()[]{}<>`'\"";
 
-    public function __construct(
-        protected EntityProvider $entityProvider
-    ) {
+    /**
+     * @var EntityProvider
+     */
+    protected $entityProvider;
+
+    public function __construct(EntityProvider $entityProvider)
+    {
+        $this->entityProvider = $entityProvider;
     }
 
     /**
      * Index the given entity.
      */
-    public function indexEntity(Entity $entity): void
+    public function indexEntity(Entity $entity)
     {
         $this->deleteEntityTerms($entity);
         $terms = $this->entityToTermDataArray($entity);
@@ -38,7 +45,7 @@ class SearchIndex
      *
      * @param Entity[] $entities
      */
-    public function indexEntities(array $entities): void
+    public function indexEntities(array $entities)
     {
         $terms = [];
         foreach ($entities as $entity) {
@@ -62,7 +69,7 @@ class SearchIndex
      *
      * @param callable(Entity, int, int):void|null $progressCallback
      */
-    public function indexAllEntities(?callable $progressCallback = null): void
+    public function indexAllEntities(?callable $progressCallback = null)
     {
         SearchTerm::query()->truncate();
 
@@ -94,7 +101,7 @@ class SearchIndex
     /**
      * Delete related Entity search terms.
      */
-    public function deleteEntityTerms(Entity $entity): void
+    public function deleteEntityTerms(Entity $entity)
     {
         $entity->searchTerms()->delete();
     }
@@ -105,12 +112,12 @@ class SearchIndex
      *
      * @returns array<string, int>
      */
-    protected function generateTermScoreMapFromText(string $text, float $scoreAdjustment = 1): array
+    protected function generateTermScoreMapFromText(string $text, int $scoreAdjustment = 1): array
     {
         $termMap = $this->textToTermCountMap($text);
 
         foreach ($termMap as $term => $count) {
-            $termMap[$term] = floor($count * $scoreAdjustment);
+            $termMap[$term] = $count * $scoreAdjustment;
         }
 
         return $termMap;
@@ -138,12 +145,12 @@ class SearchIndex
             'h6' => 1.5,
         ];
 
-        $html = '<?xml encoding="utf-8" ?><body>' . $html . '</body>';
+        $html = '<body>' . $html . '</body>';
         $html = str_ireplace(['<br>', '<br />', '<br/>'], "\n", $html);
 
         libxml_use_internal_errors(true);
         $doc = new DOMDocument();
-        $doc->loadHTML($html);
+        $doc->loadHTML(mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'));
 
         $topElems = $doc->documentElement->childNodes->item(0)->childNodes;
         /** @var DOMNode $child */

app/Search/SearchRunner.php

@@ -223,7 +223,7 @@ class SearchRunner
         });
         $subQuery->groupBy('entity_type', 'entity_id');
 
-        $entityQuery->joinSub($subQuery, 's', 'id', '=', 'entity_id');
+        $entityQuery->joinSub($subQuery, 's', 'id', '=', 's.entity_id');
         $entityQuery->addSelect('s.score');
         $entityQuery->orderBy('score', 'desc');
     }

app/Settings/AppSettingsStore.php

@@ -1,95 +0,0 @@
-<?php
-
-namespace BookStack\Settings;
-
-use BookStack\Uploads\FaviconHandler;
-use BookStack\Uploads\ImageRepo;
-use Illuminate\Http\Request;
-
-class AppSettingsStore
-{
-    public function __construct(
-        protected ImageRepo $imageRepo,
-        protected FaviconHandler $faviconHandler,
-    ) {
-    }
-
-    public function storeFromUpdateRequest(Request $request, string $category)
-    {
-        $this->storeSimpleSettings($request);
-        if ($category === 'customization') {
-            $this->updateAppLogo($request);
-            $this->updateAppIcon($request);
-        }
-    }
-
-    protected function updateAppIcon(Request $request): void
-    {
-        $sizes = [180, 128, 64, 32];
-
-        // Update icon image if set
-        if ($request->hasFile('app_icon')) {
-            $iconFile = $request->file('app_icon');
-            $this->destroyExistingSettingImage('app-icon');
-            $image = $this->imageRepo->saveNew($iconFile, 'system', 0, 256, 256);
-            setting()->put('app-icon', $image->url);
-
-            foreach ($sizes as $size) {
-                $this->destroyExistingSettingImage('app-icon-' . $size);
-                $icon = $this->imageRepo->saveNew($iconFile, 'system', 0, $size, $size);
-                setting()->put('app-icon-' . $size, $icon->url);
-            }
-
-            $this->faviconHandler->saveForUploadedImage($iconFile);
-        }
-
-        // Clear icon image if requested
-        if ($request->get('app_icon_reset')) {
-            $this->destroyExistingSettingImage('app-icon');
-            setting()->remove('app-icon');
-            foreach ($sizes as $size) {
-                $this->destroyExistingSettingImage('app-icon-' . $size);
-                setting()->remove('app-icon-' . $size);
-            }
-
-            $this->faviconHandler->restoreOriginal();
-        }
-    }
-
-    protected function updateAppLogo(Request $request): void
-    {
-        // Update logo image if set
-        if ($request->hasFile('app_logo')) {
-            $logoFile = $request->file('app_logo');
-            $this->destroyExistingSettingImage('app-logo');
-            $image = $this->imageRepo->saveNew($logoFile, 'system', 0, null, 86);
-            setting()->put('app-logo', $image->url);
-        }
-
-        // Clear logo image if requested
-        if ($request->get('app_logo_reset')) {
-            $this->destroyExistingSettingImage('app-logo');
-            setting()->remove('app-logo');
-        }
-    }
-
-    protected function storeSimpleSettings(Request $request): void
-    {
-        foreach ($request->all() as $name => $value) {
-            if (strpos($name, 'setting-') !== 0) {
-                continue;
-            }
-
-            $key = str_replace('setting-', '', trim($name));
-            setting()->put($key, $value);
-        }
-    }
-
-    protected function destroyExistingSettingImage(string $settingKey)
-    {
-        $existingVal = setting()->get($settingKey);
-        if ($existingVal) {
-            $this->imageRepo->destroyByUrlAndType($existingVal, 'system');
-        }
-    }
-}

app/Settings/SettingService.php

@@ -3,29 +3,49 @@
 namespace BookStack\Settings;
 
 use BookStack\Auth\User;
+use Illuminate\Contracts\Cache\Repository as Cache;
 
 /**
  * Class SettingService
  * The settings are a simple key-value database store.
  * For non-authenticated users, user settings are stored via the session instead.
- * A local array-based cache is used to for setting accesses across a request.
  */
 class SettingService
 {
-    protected array $localCache = [];
+    protected $setting;
+    protected $cache;
+    protected $localCache = [];
+
+    protected $cachePrefix = 'setting-';
+
+    /**
+     * SettingService constructor.
+     */
+    public function __construct(Setting $setting, Cache $cache)
+    {
+        $this->setting = $setting;
+        $this->cache = $cache;
+    }
 
     /**
      * Gets a setting from the database,
      * If not found, Returns default, Which is false by default.
      */
-    public function get(string $key, $default = null): mixed
+    public function get(string $key, $default = null)
     {
         if (is_null($default)) {
             $default = config('setting-defaults.' . $key, false);
         }
 
+        if (isset($this->localCache[$key])) {
+            return $this->localCache[$key];
+        }
+
         $value = $this->getValueFromStore($key) ?? $default;
-        return $this->formatValue($value, $default);
+        $formatted = $this->formatValue($value, $default);
+        $this->localCache[$key] = $formatted;
+
+        return $formatted;
     }
 
     /**
@@ -63,78 +83,52 @@ class SettingService
     }
 
     /**
-     * Gets a setting value from the local cache.
-     * Will load the local cache if not previously loaded.
+     * Gets a setting value from the cache or database.
+     * Looks at the system defaults if not cached or in database.
+     * Returns null if nothing is found.
      */
-    protected function getValueFromStore(string $key): mixed
+    protected function getValueFromStore(string $key)
     {
-        $cacheCategory = $this->localCacheCategory($key);
-        if (!isset($this->localCache[$cacheCategory])) {
-            $this->loadToLocalCache($cacheCategory);
+        // Check the cache
+        $cacheKey = $this->cachePrefix . $key;
+        $cacheVal = $this->cache->get($cacheKey, null);
+        if ($cacheVal !== null) {
+            return $cacheVal;
         }
 
-        return $this->localCache[$cacheCategory][$key] ?? null;
-    }
+        // Check the database
+        $settingObject = $this->getSettingObjectByKey($key);
+        if ($settingObject !== null) {
+            $value = $settingObject->value;
 
-    /**
-     * Put the given value into the local cached under the given key.
-     */
-    protected function putValueIntoLocalCache(string $key, mixed $value): void
-    {
-        $cacheCategory = $this->localCacheCategory($key);
-        if (!isset($this->localCache[$cacheCategory])) {
-            $this->loadToLocalCache($cacheCategory);
-        }
-
-        $this->localCache[$cacheCategory][$key] = $value;
-    }
-
-    /**
-     * Get the category for the given setting key.
-     * Will return 'app' for a general app setting otherwise 'user:<user_id>' for a user setting.
-     */
-    protected function localCacheCategory(string $key): string
-    {
-        if (str_starts_with($key, 'user:')) {
-            return implode(':', array_slice(explode(':', $key), 0, 2));
-        }
-
-        return 'app';
-    }
-
-    /**
-     * For the given category, load the relevant settings from the database into the local cache.
-     */
-    protected function loadToLocalCache(string $cacheCategory): void
-    {
-        $query = Setting::query();
-
-        if ($cacheCategory === 'app') {
-            $query->where('setting_key', 'not like', 'user:%');
-        } else {
-            $query->where('setting_key', 'like', $cacheCategory . ':%');
-        }
-        $settings = $query->toBase()->get();
-
-        if (!isset($this->localCache[$cacheCategory])) {
-            $this->localCache[$cacheCategory] = [];
-        }
-
-        foreach ($settings as $setting) {
-            $value = $setting->value;
-
-            if ($setting->type === 'array') {
+            if ($settingObject->type === 'array') {
                 $value = json_decode($value, true) ?? [];
             }
 
-            $this->localCache[$cacheCategory][$setting->setting_key] = $value;
+            $this->cache->forever($cacheKey, $value);
+
+            return $value;
+        }
+
+        return null;
+    }
+
+    /**
+     * Clear an item from the cache completely.
+     */
+    protected function clearFromCache(string $key)
+    {
+        $cacheKey = $this->cachePrefix . $key;
+        $this->cache->forget($cacheKey);
+        if (isset($this->localCache[$key])) {
+            unset($this->localCache[$key]);
         }
     }
 
     /**
      * Format a settings value.
      */
-    protected function formatValue(mixed $value, mixed $default): mixed
+    protected function formatValue($value, $default)
     {
         // Change string booleans to actual booleans
         if ($value === 'true') {
@@ -165,22 +159,21 @@ class SettingService
      * Add a setting to the database.
      * Values can be an array or a string.
      */
-    public function put(string $key, mixed $value): bool
+    public function put(string $key, $value): bool
     {
-        $setting = Setting::query()->firstOrNew([
+        $setting = $this->setting->newQuery()->firstOrNew([
             'setting_key' => $key,
         ]);
-
         $setting->type = 'string';
-        $setting->value = $value;
 
         if (is_array($value)) {
             $setting->type = 'array';
-            $setting->value = $this->formatArrayValue($value);
+            $value = $this->formatArrayValue($value);
         }
 
+        $setting->value = $value;
         $setting->save();
-        $this->putValueIntoLocalCache($key, $value);
+        $this->clearFromCache($key);
 
         return true;
     }
@@ -220,7 +213,7 @@ class SettingService
      * Can only take string value types since this may use
      * the session which is less flexible to data types.
      */
-    public function putForCurrentUser(string $key, string $value): bool
+    public function putForCurrentUser(string $key, string $value)
     {
         return $this->putUser(user(), $key, $value);
     }
@@ -242,19 +235,15 @@ class SettingService
         if ($setting) {
             $setting->delete();
         }
-
-        $cacheCategory = $this->localCacheCategory($key);
-        if (isset($this->localCache[$cacheCategory])) {
-            unset($this->localCache[$cacheCategory][$key]);
-        }
+        $this->clearFromCache($key);
     }
 
     /**
      * Delete settings for a given user id.
      */
-    public function deleteUserSettings(string $userId): void
+    public function deleteUserSettings(string $userId)
     {
-        Setting::query()
+        return $this->setting->newQuery()
             ->where('setting_key', 'like', $this->userKey($userId) . '%')
             ->delete();
     }
@@ -264,16 +253,7 @@ class SettingService
      */
     protected function getSettingObjectByKey(string $key): ?Setting
     {
-        return Setting::query()
-            ->where('setting_key', '=', $key)
-            ->first();
-    }
-
-    /**
-     * Empty the local setting value cache used by this service.
-     */
-    public function flushCache(): void
-    {
-        $this->localCache = [];
+        return $this->setting->newQuery()
+            ->where('setting_key', '=', $key)->first();
     }
 }

app/Theming/ThemeEvents.php

@@ -65,8 +65,8 @@ class ThemeEvents
      * Provides the commonmark library environment for customization before it's used to render markdown content.
      * If the listener returns a non-null value, that will be used as an environment instead.
      *
-     * @param \League\CommonMark\Environment\Environment $environment
-     * @returns \League\CommonMark\Environment\Environment|null
+     * @param \League\CommonMark\ConfigurableEnvironmentInterface $environment
+     * @returns \League\CommonMark\ConfigurableEnvironmentInterface|null
      */
     const COMMONMARK_ENVIRONMENT_CONFIGURE = 'commonmark_environment_configure';
 

app/Translation/MessageSelector.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace BookStack\Translation;
-
-use Illuminate\Translation\MessageSelector as BaseClass;
-
-/**
- * This is a customization of the default Laravel MessageSelector class to tweak pluralization,
- * so that is uses just the first part of the locale string to provide support with
- * non-standard locales such as "de_informal".
- */
-class MessageSelector extends BaseClass
-{
-    public function getPluralIndex($locale, $number)
-    {
-        $locale = explode('_', $locale)[0];
-        return parent::getPluralIndex($locale, $number);
-    }
-}

app/Uploads/Attachment.php

@@ -2,7 +2,6 @@
 
 namespace BookStack\Uploads;
 
-use BookStack\Auth\Permissions\JointPermission;
 use BookStack\Auth\Permissions\PermissionApplicator;
 use BookStack\Auth\User;
 use BookStack\Entities\Models\Entity;
@@ -10,9 +9,7 @@ use BookStack\Entities\Models\Page;
 use BookStack\Model;
 use BookStack\Traits\HasCreatorAndUpdater;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
  * @property int    $id
@@ -30,7 +27,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 class Attachment extends Model
 {
     use HasCreatorAndUpdater;
-    use HasFactory;
 
     protected $fillable = ['name', 'order'];
     protected $hidden = ['path', 'page'];
@@ -40,10 +36,12 @@ class Attachment extends Model
 
     /**
      * Get the downloadable file name for this upload.
+     *
+     * @return mixed|string
      */
-    public function getFileName(): string
+    public function getFileName()
     {
-        if (str_contains($this->name, '.')) {
+        if (strpos($this->name, '.') !== false) {
             return $this->name;
         }
 
@@ -58,18 +56,12 @@ class Attachment extends Model
         return $this->belongsTo(Page::class, 'uploaded_to');
     }
 
-    public function jointPermissions(): HasMany
-    {
-        return $this->hasMany(JointPermission::class, 'entity_id', 'uploaded_to')
-            ->where('joint_permissions.entity_type', '=', 'page');
-    }
-
     /**
      * Get the url of this file.
      */
     public function getUrl($openInline = false): string
     {
-        if ($this->external && !str_starts_with($this->path, 'http')) {
+        if ($this->external && strpos($this->path, 'http') !== 0) {
             return $this->path;
         }
 

app/Uploads/AttachmentService.php

@@ -9,7 +9,7 @@ use Illuminate\Contracts\Filesystem\Filesystem as Storage;
 use Illuminate\Filesystem\FilesystemManager;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
-use League\Flysystem\WhitespacePathNormalizer;
+use League\Flysystem\Util;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class AttachmentService
@@ -54,7 +54,7 @@ class AttachmentService
      */
     protected function adjustPathForStorageDisk(string $path): string
     {
-        $path = (new WhitespacePathNormalizer())->normalizePath(str_replace('uploads/files/', '', $path));
+        $path = Util::normalizePath(str_replace('uploads/files/', '', $path));
 
         if ($this->getStorageDiskName() === 'local_secure_attachments') {
             return $path;

app/Uploads/FaviconHandler.php

@@ -1,110 +0,0 @@
-<?php
-
-namespace BookStack\Uploads;
-
-use Illuminate\Http\UploadedFile;
-use Intervention\Image\ImageManager;
-
-class FaviconHandler
-{
-    protected string $path;
-
-    public function __construct(
-        protected ImageManager $imageTool
-    ) {
-        $this->path = public_path('favicon.ico');
-    }
-
-    /**
-     * Save the given UploadedFile instance as the application favicon.
-     */
-    public function saveForUploadedImage(UploadedFile $file): void
-    {
-        if (!is_writeable($this->path)) {
-            return;
-        }
-
-        $imageData = file_get_contents($file->getRealPath());
-        $image = $this->imageTool->make($imageData);
-        $image->resize(32, 32);
-        $bmpData = $image->encode('png');
-        $icoData = $this->pngToIco($bmpData, 32, 32);
-
-        file_put_contents($this->path, $icoData);
-    }
-
-    /**
-     * Restore the original favicon image.
-     * Returned boolean indicates if the copy occurred.
-     */
-    public function restoreOriginal(): bool
-    {
-        $permissionItem = file_exists($this->path) ? $this->path : dirname($this->path);
-        if (!is_writeable($permissionItem)) {
-            return false;
-        }
-
-        return copy($this->getOriginalPath(), $this->path);
-    }
-
-    /**
-     * Restore the original favicon image if no favicon image is already in use.
-     * Returns a boolean to indicate if the file exists.
-     */
-    public function restoreOriginalIfNotExists(): bool
-    {
-        if (file_exists($this->path)) {
-            return true;
-        }
-
-        return $this->restoreOriginal();
-    }
-
-    /**
-     * Get the path to the favicon file.
-     */
-    public function getPath(): string
-    {
-        return $this->path;
-    }
-
-    /**
-     * Get the path of the original favicon copy.
-     */
-    public function getOriginalPath(): string
-    {
-        return public_path('icon.ico');
-    }
-
-    /**
-     * Convert PNG image data to ICO file format.
-     * Built following the file format info from Wikipedia:
-     * https://en.wikipedia.org/wiki/ICO_(file_format)
-     */
-    protected function pngToIco(string $bmpData, int $width, int $height): string
-    {
-        // ICO header
-        $header = pack('v', 0x00); // Reserved. Must always be 0
-        $header .= pack('v', 0x01); // Specifies ico image
-        $header .= pack('v', 0x01); // Specifies number of images
-
-        // ICO Image Directory
-        $entry = hex2bin(dechex($width)); // Image width
-        $entry .= hex2bin(dechex($height)); // Image height
-        $entry .= "\0"; // Color palette, typically 0
-        $entry .= "\0"; // Reserved
-
-        // Color planes, Appears to remain 1 for bmp image data
-        $entry .= pack('v', 0x01);
-        // Bits per pixel, can range from 1 to 32. From testing conversion
-        // via intervention from png typically provides this as 24.
-        $entry .= pack('v', 0x00);
-        // Size of the image data in bytes
-        $entry .= pack('V', strlen($bmpData));
-        // Offset of the bmp data from file start
-        $entry .= pack('V', strlen($header) + strlen($entry) + 4);
-
-        // Join & return the combined parts of the ICO image data
-        return $header . $entry . $bmpData;
-    }
-}

app/Uploads/Image.php

@@ -2,12 +2,10 @@
 
 namespace BookStack\Uploads;
 
-use BookStack\Auth\Permissions\JointPermission;
 use BookStack\Entities\Models\Page;
 use BookStack\Model;
 use BookStack\Traits\HasCreatorAndUpdater;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
  * @property int    $id
@@ -27,12 +25,6 @@ class Image extends Model
     protected $fillable = ['name'];
     protected $hidden = [];
 
-    public function jointPermissions(): HasMany
-    {
-        return $this->hasMany(JointPermission::class, 'entity_id', 'uploaded_to')
-            ->where('joint_permissions.entity_type', '=', 'page');
-    }
-
     /**
      * Get a thumbnail for this image.
      *

app/Uploads/ImageRepo.php

@@ -123,10 +123,7 @@ class ImageRepo
     public function saveNew(UploadedFile $uploadFile, string $type, int $uploadedTo = 0, int $resizeWidth = null, int $resizeHeight = null, bool $keepRatio = true): Image
     {
         $image = $this->imageService->saveNewFromUpload($uploadFile, $type, $uploadedTo, $resizeWidth, $resizeHeight, $keepRatio);
-
-        if ($type !== 'system') {
-            $this->loadThumbs($image);
-        }
+        $this->loadThumbs($image);
 
         return $image;
     }
@@ -183,17 +180,13 @@ class ImageRepo
     }
 
     /**
-     * Destroy images that have a specific URL and type combination.
+     * Destroy all images of a certain type.
      *
      * @throws Exception
      */
-    public function destroyByUrlAndType(string $url, string $imageType): void
+    public function destroyByType(string $imageType): void
     {
-        $images = Image::query()
-            ->where('url', '=', $url)
-            ->where('type', '=', $imageType)
-            ->get();
-
+        $images = Image::query()->where('type', '=', $imageType)->get();
         foreach ($images as $image) {
             $this->destroyImage($image);
         }

app/Uploads/ImageService.php

@@ -20,7 +20,7 @@ use Illuminate\Support\Str;
 use Intervention\Image\Exception\NotSupportedException;
 use Intervention\Image\Image as InterventionImage;
 use Intervention\Image\ImageManager;
-use League\Flysystem\WhitespacePathNormalizer;
+use League\Flysystem\Util;
 use Psr\SimpleCache\InvalidArgumentException;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\StreamedResponse;
@@ -29,9 +29,10 @@ class ImageService
 {
     protected ImageManager $imageTool;
     protected Cache $cache;
+    protected $storageUrl;
     protected FilesystemManager $fileSystem;
 
-    protected static array $supportedExtensions = ['jpg', 'jpeg', 'png', 'gif', 'webp'];
+    protected static $supportedExtensions = ['jpg', 'jpeg', 'png', 'gif', 'webp'];
 
     public function __construct(ImageManager $imageTool, FilesystemManager $fileSystem, Cache $cache)
     {
@@ -72,7 +73,7 @@ class ImageService
      */
     protected function adjustPathForStorageDisk(string $path, string $imageType = ''): string
     {
-        $path = (new WhitespacePathNormalizer())->normalizePath(str_replace('uploads/images/', '', $path));
+        $path = Util::normalizePath(str_replace('uploads/images/', '', $path));
 
         if ($this->usingSecureImages($imageType)) {
             return $path;
@@ -547,7 +548,7 @@ class ImageService
             // Check the image file exists
             && $disk->exists($imagePath)
             // Check the file is likely an image file
-            && strpos($disk->mimeType($imagePath), 'image/') === 0;
+            && strpos($disk->getMimetype($imagePath), 'image/') === 0;
     }
 
     /**
@@ -660,21 +661,25 @@ class ImageService
      */
     private function getPublicUrl(string $filePath): string
     {
-        $storageUrl = config('filesystems.url');
+        if (is_null($this->storageUrl)) {
+            $storageUrl = config('filesystems.url');
 
-        // Get the standard public s3 url if s3 is set as storage type
-        // Uses the nice, short URL if bucket name has no periods in otherwise the longer
-        // region-based url will be used to prevent http issues.
-        if (!$storageUrl && config('filesystems.images') === 's3') {
-            $storageDetails = config('filesystems.disks.s3');
-            if (strpos($storageDetails['bucket'], '.') === false) {
-                $storageUrl = 'https://' . $storageDetails['bucket'] . '.s3.amazonaws.com';
-            } else {
-                $storageUrl = 'https://s3-' . $storageDetails['region'] . '.amazonaws.com/' . $storageDetails['bucket'];
+            // Get the standard public s3 url if s3 is set as storage type
+            // Uses the nice, short URL if bucket name has no periods in otherwise the longer
+            // region-based url will be used to prevent http issues.
+            if ($storageUrl == false && config('filesystems.images') === 's3') {
+                $storageDetails = config('filesystems.disks.s3');
+                if (strpos($storageDetails['bucket'], '.') === false) {
+                    $storageUrl = 'https://' . $storageDetails['bucket'] . '.s3.amazonaws.com';
+                } else {
+                    $storageUrl = 'https://s3-' . $storageDetails['region'] . '.amazonaws.com/' . $storageDetails['bucket'];
+                }
             }
+
+            $this->storageUrl = $storageUrl;
         }
 
-        $basePath = $storageUrl ?: url('/');
+        $basePath = ($this->storageUrl == false) ? url('/') : $this->storageUrl;
 
         return rtrim($basePath, '/') . $filePath;
     }

app/Util/CspService.php

@@ -126,7 +126,7 @@ class CspService
 
     protected function getAllowedIframeHosts(): array
     {
-        $hosts = config('app.iframe_hosts') ?? '';
+        $hosts = config('app.iframe_hosts', '');
 
         return array_filter(explode(' ', $hosts));
     }

app/Util/HtmlContentFilter.php

@@ -19,10 +19,10 @@ class HtmlContentFilter
             return $html;
         }
 
-        $html = '<?xml encoding="utf-8" ?><body>' . $html . '</body>';
+        $html = '<body>' . $html . '</body>';
         libxml_use_internal_errors(true);
         $doc = new DOMDocument();
-        $doc->loadHTML($html);
+        $doc->loadHTML(mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'));
         $xPath = new DOMXPath($doc);
 
         // Remove standard script tags

app/Util/LanguageManager.php

@@ -24,7 +24,6 @@ class LanguageManager
         'bg'          => ['iso' => 'bg_BG', 'windows' => 'Bulgarian'],
         'bs'          => ['iso' => 'bs_BA', 'windows' => 'Bosnian (Latin)'],
         'ca'          => ['iso' => 'ca', 'windows' => 'Catalan'],
-        'cs'          => ['iso' => 'cs_CZ', 'windows' => 'Czech'],
         'da'          => ['iso' => 'da_DK', 'windows' => 'Danish'],
         'de'          => ['iso' => 'de_DE', 'windows' => 'German'],
         'de_informal' => ['iso' => 'de_DE', 'windows' => 'German'],
@@ -121,17 +120,17 @@ class LanguageManager
         $isoLang = $this->localeMap[$language]['iso'] ?? '';
         $isoLangPrefix = explode('_', $isoLang)[0];
 
-        $locales = array_values(array_filter([
+        $locales = array_filter([
             $isoLang ? $isoLang . '.utf8' : false,
             $isoLang ?: false,
             $isoLang ? str_replace('_', '-', $isoLang) : false,
             $isoLang ? $isoLangPrefix . '.UTF-8' : false,
             $this->localeMap[$language]['windows'] ?? false,
             $language,
-        ]));
+        ]);
 
         if (!empty($locales)) {
-            setlocale(LC_TIME, $locales[0], ...array_slice($locales, 1));
+            setlocale(LC_TIME, ...$locales);
         }
     }
 }

app/helpers.php

@@ -55,8 +55,9 @@ function hasAppAccess(): bool
 }
 
 /**
- * Check if the current user has a permission. If an ownable element
- * is passed in the jointPermissions are checked against that particular item.
+ * Check if the current user has a permission.
+ * Checks a generic role permission or, if an ownable model is passed in, it will
+ * check against the given entity model, taking into account entity-level permissions.
  */
 function userCan(string $permission, Model $ownable = null): bool
 {

composer.json

@@ -8,7 +8,7 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": "^8.0.2",
+        "php": "^7.4|^8.0",
         "ext-curl": "*",
         "ext-dom": "*",
         "ext-fileinfo": "*",
@@ -19,37 +19,39 @@
         "bacon/bacon-qr-code": "^2.0",
         "barryvdh/laravel-dompdf": "^2.0",
         "barryvdh/laravel-snappy": "^1.0",
-        "doctrine/dbal": "^3.5",
+        "doctrine/dbal": "^3.1",
+        "filp/whoops": "^2.14",
         "guzzlehttp/guzzle": "^7.4",
         "intervention/image": "^2.7",
-        "laravel/framework": "^9.0",
+        "laravel/framework": "^8.68",
         "laravel/socialite": "^5.2",
         "laravel/tinker": "^2.6",
-        "league/commonmark": "^2.3",
-        "league/flysystem-aws-s3-v3": "^3.0",
+        "league/commonmark": "^1.6",
+        "league/flysystem-aws-s3-v3": "^1.0.29",
         "league/html-to-markdown": "^5.0.0",
         "league/oauth2-client": "^2.6",
         "onelogin/php-saml": "^4.0",
-        "phpseclib/phpseclib": "^3.0",
+        "phpseclib/phpseclib": "~3.0",
         "pragmarx/google2fa": "^8.0",
-        "predis/predis": "^2.1",
+        "predis/predis": "^1.1",
         "socialiteproviders/discord": "^4.1",
         "socialiteproviders/gitlab": "^4.1",
-        "socialiteproviders/microsoft-azure": "^5.1",
-        "socialiteproviders/okta": "^4.2",
+        "socialiteproviders/microsoft-azure": "^5.0.1",
+        "socialiteproviders/okta": "^4.1",
         "socialiteproviders/slack": "^4.1",
         "socialiteproviders/twitch": "^5.3",
         "ssddanbrown/htmldiff": "^1.0.2"
     },
     "require-dev": {
-        "fakerphp/faker": "^1.21",
+        "brianium/paratest": "^6.6",
+        "fakerphp/faker": "^1.16",
         "itsgoingd/clockwork": "^5.1",
-        "mockery/mockery": "^1.5",
-        "nunomaduro/collision": "^6.4",
-        "nunomaduro/larastan": "^2.4",
+        "mockery/mockery": "^1.4",
+        "nunomaduro/collision": "^5.10",
+        "nunomaduro/larastan": "^1.0",
         "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3.7",
-        "ssddanbrown/asserthtml": "^2.0"
+        "ssddanbrown/asserthtml": "^1.0"
     },
     "autoload": {
         "psr-4": {
@@ -71,6 +73,7 @@
         "format": "phpcbf",
         "lint": "phpcs",
         "test": "phpunit",
+        "t": "@php artisan test --parallel",
         "t-reset": "@php artisan test --recreate-databases",
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
@@ -99,7 +102,7 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "platform": {
-            "php": "8.0.2"
+            "php": "7.4.0"
         }
     },
     "extra": {
@@ -107,6 +110,6 @@
             "dont-discover": []
         }
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "prefer-stable": true
 }

crowdin.yml

@@ -1,10 +1,7 @@
 project_identifier: bookstack
 base_path: .
 preserve_hierarchy: false
-pull_request_title: Updated translations with latest Crowdin changes
-pull_request_labels:
-  - ":earth_africa: Translations"
 files:
-  - source: /lang/en/*.php
-    translation: /lang/%two_letters_code%/%original_file_name%
+  - source: /resources/lang/en/*.php
+    translation: /resources/lang/%two_letters_code%/%original_file_name%
     type: php

database/factories/Actions/TagFactory.php

@@ -21,7 +21,7 @@ class TagFactory extends Factory
     public function definition()
     {
         return [
-            'name'  => $this->faker->city(),
+            'name'  => $this->faker->city,
             'value' => $this->faker->sentence(3),
         ];
     }

database/factories/Actions/WebhookFactory.php

@@ -18,7 +18,7 @@ class WebhookFactory extends Factory
     {
         return [
             'name'     => 'My webhook for ' . $this->faker->country(),
-            'endpoint' => $this->faker->url(),
+            'endpoint' => $this->faker->url,
             'active'   => true,
             'timeout'  => 3,
         ];

database/factories/Auth/UserFactory.php

@@ -22,11 +22,11 @@ class UserFactory extends Factory
      */
     public function definition()
     {
-        $name = $this->faker->name();
+        $name = $this->faker->name;
 
         return [
             'name'            => $name,
-            'email'           => $this->faker->email(),
+            'email'           => $this->faker->email,
             'slug'            => Str::slug($name . '-' . Str::random(5)),
             'password'        => Str::random(10),
             'remember_token'  => Str::random(10),

database/factories/Entities/Models/BookFactory.php

@@ -22,9 +22,9 @@ class BookFactory extends Factory
     public function definition()
     {
         return [
-            'name'        => $this->faker->sentence(),
+            'name'        => $this->faker->sentence,
             'slug'        => Str::random(10),
-            'description' => $this->faker->paragraph(),
+            'description' => $this->faker->paragraph,
         ];
     }
 }

database/factories/Entities/Models/ChapterFactory.php

@@ -22,9 +22,9 @@ class ChapterFactory extends Factory
     public function definition()
     {
         return [
-            'name'        => $this->faker->sentence(),
+            'name'        => $this->faker->sentence,
             'slug'        => Str::random(10),
-            'description' => $this->faker->paragraph(),
+            'description' => $this->faker->paragraph,
         ];
     }
 }

database/factories/Entities/Models/PageFactory.php

@@ -24,7 +24,7 @@ class PageFactory extends Factory
         $html = '<p>' . implode('</p>', $this->faker->paragraphs(5)) . '</p>';
 
         return [
-            'name'           => $this->faker->sentence(),
+            'name'           => $this->faker->sentence,
             'slug'           => Str::random(10),
             'html'           => $html,
             'text'           => strip_tags($html),

database/factories/Uploads/AttachmentFactory.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace Database\Factories\Uploads;
-
-use BookStack\Auth\User;
-use BookStack\Entities\Models\Page;
-use Illuminate\Database\Eloquent\Factories\Factory;
-
-/**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\BookStack\Uploads\Attachment>
- */
-class AttachmentFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = \BookStack\Uploads\Attachment::class;
-
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition()
-    {
-        return [
-            'name' => $this->faker->words(2, true),
-            'path' => $this->faker->url(),
-            'extension' => '',
-            'external' => true,
-            'uploaded_to' => Page::factory(),
-            'created_by' => User::factory(),
-            'updated_by' => User::factory(),
-            'order' => 0,
-        ];
-    }
-}

database/factories/Uploads/ImageFactory.php

@@ -21,9 +21,9 @@ class ImageFactory extends Factory
     public function definition()
     {
         return [
-            'name'        => $this->faker->slug() . '.jpg',
-            'url'         => $this->faker->url(),
-            'path'        => $this->faker->url(),
+            'name'        => $this->faker->slug . '.jpg',
+            'url'         => $this->faker->url,
+            'path'        => $this->faker->url,
             'type'        => 'gallery',
             'uploaded_to' => 0,
         ];

database/migrations/2014_10_12_000000_create_users_table.php

@@ -3,7 +3,7 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-return new class extends Migration
+class CreateUsersTable extends Migration
 {
     /**
      * Run the migrations.
@@ -40,4 +40,4 @@ return new class extends Migration
     {
         Schema::drop('users');
     }
-};
+}

database/migrations/2014_10_12_100000_create_password_resets_table.php

@@ -3,7 +3,7 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-return new class extends Migration
+class CreatePasswordResetsTable extends Migration
 {
     /**
      * Run the migrations.
@@ -28,4 +28,4 @@ return new class extends Migration
     {
         Schema::drop('password_resets');
     }
-};
+}