Updated version and assets for release v22.07.2

Revert "Update german translation"

.env.example.complete

@@ -263,11 +263,7 @@ OIDC_ISSUER_DISCOVER=false
 OIDC_PUBLIC_KEY=null
 OIDC_AUTH_ENDPOINT=null
 OIDC_TOKEN_ENDPOINT=null
-OIDC_ADDITIONAL_SCOPES=null
 OIDC_DUMP_USER_DETAILS=false
-OIDC_USER_TO_GROUPS=false
-OIDC_GROUPS_CLAIM=groups
-OIDC_REMOVE_FROM_GROUPS=false
 
 # Disable default third-party services such as Gravatar and Draw.IO
 # Service-specific options will override this option
@@ -299,7 +295,7 @@ APP_DEFAULT_DARK_MODE=false
 # Page revision limit
 # Number of page revisions to keep in the system before deleting old revisions.
 # If set to 'false' a limit will not be enforced.
-REVISION_LIMIT=100
+REVISION_LIMIT=50
 
 # Recycle Bin Lifetime
 # The number of days that content will remain in the recycle bin before

.github/translators.txt

@@ -56,7 +56,6 @@ Name :: Languages
 @arcoai :: Spanish
 @Jokuna :: Korean
 @smartshogu :: German; German Informal
-@samadha56 :: Persian
 cipi1965 :: Italian
 Mykola Ronik (Mantikor) :: Ukrainian
 furkanoyk :: Turkish
@@ -138,7 +137,7 @@ Xiphoseer :: German
 MerlinSVK (merlinsvk) :: Slovak
 Kauê Sena (kaue.sena.ks) :: Portuguese, Brazilian
 MatthieuParis :: French
-Douradinho :: Portuguese, Brazilian; Portuguese
+Douradinho :: Portuguese, Brazilian
 Gaku Yaguchi (tama11) :: Japanese
 johnroyer :: Chinese Traditional
 jackaaa :: Chinese Traditional
@@ -176,7 +175,7 @@ Alexander Predl (Harveyhase68) :: German
 Rem (Rem9000) :: Dutch
 Michał Stelmach (stelmach-web) :: Polish
 arniom :: French
-REMOVED_USER :: ; Dutch; Turkish
+REMOVED_USER :: Dutch; Turkish
 林祖年 (contagion) :: Chinese Traditional
 Siamak Guodarzi (siamakgoudarzi88) :: Persian
 Lis Maestrelo (lismtrl) :: Portuguese, Brazilian
@@ -269,32 +268,3 @@ mcgong (GongMingCai) :: Chinese Simplified; Chinese Traditional
 Nanang Setia Budi (sefidananang) :: Indonesian
 Андрей Павлов (andrei.pavlov) :: Russian
 Alex Navarro (alex.n.navarro) :: Portuguese, Brazilian
-Ji-Hyeon Gim (PotatoGim) :: Korean
-Mihai Ochian (soulstorm19) :: Romanian
-HeartCore :: German Informal; German
-simon.pct :: French
-okaeiz :: Persian
-Naoto Ishikawa (na3shkw) :: Japanese
-sdhadi :: Persian
-DerLinkman (derlinkman) :: German; German Informal
-TurnArabic :: Arabic
-Martin Sebek (sebekmartin) :: Czech
-Kuchinashi Hoshikawa (kuchinashi) :: Chinese Simplified
-digilady :: Greek
-Linus (LinusOP) :: Swedish
-Felipe Cardoso (felipecardosoruff) :: Portuguese, Brazilian
-RandomUser0815 :: German
-Ismael Mesquita (mesquitoliveira) :: Portuguese, Brazilian
-구인회 (laskdjlaskdj12) :: Korean
-LiZerui (CNLiZerui) :: Chinese Traditional
-Fabrice Boyer (FabriceBoyer) :: French
-mikael (bitcanon) :: Swedish
-Matthias Mai (schnapsidee) :: German
-Ufuk Ayyıldız (ufukayyildiz) :: Turkish
-Jan Mitrof (jan.kachlik) :: Czech
-edwardsmirnov :: Russian
-Mr_OSS117 :: French
-shotu :: French
-Cesar_Lopez_Aguillon :: Spanish
-bdewoop :: German
-dina davoudi (dina.davoudi) :: Persian

.github/workflows/lint-php.yml

@@ -1,19 +0,0 @@
-name: lint-php
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-22.04
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: 8.1
-        tools: phpcs
-
-    - name: Run formatting check
-      run: composer lint

.github/workflows/phpstan.yml

@@ -1,34 +1,36 @@
-name: analyse-php
+name: phpstan
 
 on: [push, pull_request]
 
 jobs:
   build:
     if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        php: ['7.4']
     steps:
     - uses: actions/checkout@v1
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 8.1
+        php-version: ${{ matrix.php }}
         extensions: gd, mbstring, json, curl, xml, mysql, ldap
 
     - name: Get Composer Cache Directory
       id: composer-cache
       run: |
-        echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+        echo "::set-output name=dir::$(composer config cache-files-dir)"
 
     - name: Cache composer packages
-      uses: actions/cache@v3
+      uses: actions/cache@v1
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
-        key: ${{ runner.os }}-composer-8.1
-        restore-keys: ${{ runner.os }}-composer-
+        key: ${{ runner.os }}-composer-${{ matrix.php }}
 
     - name: Install composer dependencies
       run: composer install --prefer-dist --no-interaction --ansi
 
-    - name: Run static analysis check
-      run: composer check-static
+    - name: Run PHPStan
+      run: php${{ matrix.php }} ./vendor/bin/phpstan analyse --memory-limit=2G

.github/workflows/phpunit.yml

@@ -1,14 +1,14 @@
-name: test-php
+name: phpunit
 
 on: [push, pull_request]
 
 jobs:
   build:
     if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php: ['7.4', '8.0', '8.1', '8.2']
+        php: ['7.4', '8.0', '8.1']
     steps:
     - uses: actions/checkout@v1
 
@@ -21,14 +21,13 @@ jobs:
     - name: Get Composer Cache Directory
       id: composer-cache
       run: |
-        echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+        echo "::set-output name=dir::$(composer config cache-files-dir)"
 
     - name: Cache composer packages
-      uses: actions/cache@v3
+      uses: actions/cache@v1
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ matrix.php }}
-        restore-keys: ${{ runner.os }}-composer-
 
     - name: Start Database
       run: |
@@ -49,5 +48,5 @@ jobs:
         php${{ matrix.php }} artisan migrate --force -n --database=mysql_testing
         php${{ matrix.php }} artisan db:seed --force -n --class=DummyContentSeeder --database=mysql_testing
 
-    - name: Run PHP tests
+    - name: phpunit
       run: php${{ matrix.php }} ./vendor/bin/phpunit

.github/workflows/test-migrations.yml

@@ -5,10 +5,10 @@ on: [push, pull_request]
 jobs:
   build:
     if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php: ['7.4', '8.0', '8.1', '8.2']
+        php: ['7.4', '8.0', '8.1']
     steps:
       - uses: actions/checkout@v1
 
@@ -21,14 +21,13 @@ jobs:
       - name: Get Composer Cache Directory
         id: composer-cache
         run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer packages
-        uses: actions/cache@v3
+        uses: actions/cache@v1
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ matrix.php }}
-          restore-keys: ${{ runner.os }}-composer-
 
       - name: Start MySQL
         run: |

.gitignore

@@ -5,10 +5,10 @@ Homestead.yaml
 .idea
 npm-debug.log
 yarn-error.log
-/public/dist
+/public/dist/*.map
 /public/plugins
-/public/css
-/public/js
+/public/css/*.map
+/public/js/*.map
 /public/bower
 /public/build/
 /storage/images

LICENSE

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2022, Dan Brown and the BookStack Project contributors.
+Copyright (c) 2015-present, Dan Brown and the BookStack Project contributors
+https://github.com/BookStackApp/BookStack/graphs/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/ActivityQueries.php

@@ -15,8 +15,6 @@ 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;
@@ -27,11 +25,9 @@ class ActivityQueries
      */
     public function latest(int $count = 20, int $page = 0): array
     {
-        $query = Activity::query()->select($this->fieldsForLists);
         $activityList = $this->permissions
-            ->restrictEntityRelationQuery($query, 'activities', 'entity_id', 'entity_type')
+            ->restrictEntityRelationQuery(Activity::query(), 'activities', 'entity_id', 'entity_type')
             ->orderBy('created_at', 'desc')
-            ->whereNotNull('activities.entity_id')
             ->with(['user', 'entity'])
             ->skip($count * $page)
             ->take($count)
@@ -82,12 +78,10 @@ class ActivityQueries
      */
     public function userActivity(User $user, int $count = 20, int $page = 0): array
     {
-        $query = Activity::query()->select($this->fieldsForLists);
         $activityList = $this->permissions
-            ->restrictEntityRelationQuery($query, 'activities', 'entity_id', 'entity_type')
+            ->restrictEntityRelationQuery(Activity::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/Queries/WebhooksAllPaginatedAndSorted.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace BookStack\Actions\Queries;
-
-use BookStack\Actions\Webhook;
-use BookStack\Util\SimpleListOptions;
-use Illuminate\Pagination\LengthAwarePaginator;
-
-/**
- * Get all the webhooks in the system in a paginated format.
- */
-class WebhooksAllPaginatedAndSorted
-{
-    public function run(int $count, SimpleListOptions $listOptions): LengthAwarePaginator
-    {
-        $query = Webhook::query()->select(['*'])
-            ->withCount(['trackedEvents'])
-            ->orderBy($listOptions->getSort(), $listOptions->getOrder());
-
-        if ($listOptions->getSearch()) {
-            $term = '%' . $listOptions->getSearch() . '%';
-            $query->where(function ($query) use ($term) {
-                $query->where('name', 'like', $term)
-                    ->orWhere('endpoint', 'like', $term);
-            });
-        }
-
-        return $query->paginate($count);
-    }
-}

app/Actions/TagRepo.php

@@ -4,7 +4,6 @@ namespace BookStack\Actions;
 
 use BookStack\Auth\Permissions\PermissionApplicator;
 use BookStack\Entities\Models\Entity;
-use BookStack\Util\SimpleListOptions;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
@@ -21,26 +20,19 @@ class TagRepo
     /**
      * Start a query against all tags in the system.
      */
-    public function queryWithTotals(SimpleListOptions $listOptions, string $nameFilter): Builder
+    public function queryWithTotals(string $searchTerm, string $nameFilter): Builder
     {
-        $searchTerm = $listOptions->getSearch();
-        $sort = $listOptions->getSort();
-        if ($sort === 'name' && $nameFilter) {
-            $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({$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"),
+                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'),
             ])
-            ->orderBy($sort, $listOptions->getOrder());
+            ->orderBy($nameFilter ? 'value' : 'name');
 
         if ($nameFilter) {
             $query->where('name', '=', $nameFilter);
@@ -65,21 +57,21 @@ class TagRepo
      * Get tag name suggestions from scanning existing tag names.
      * If no search term is given the 50 most popular tag names are provided.
      */
-    public function getNameSuggestions(string $searchTerm): Collection
+    public function getNameSuggestions(?string $searchTerm): Collection
     {
         $query = Tag::query()
             ->select('*', DB::raw('count(*) as count'))
             ->groupBy('name');
 
         if ($searchTerm) {
-            $query = $query->where('name', 'LIKE', $searchTerm . '%')->orderBy('name', 'asc');
+            $query = $query->where('name', 'LIKE', $searchTerm . '%')->orderBy('name', 'desc');
         } else {
             $query = $query->orderBy('count', 'desc')->take(50);
         }
 
         $query = $this->permissions->restrictEntityRelationQuery($query, 'tags', 'entity_id', 'entity_type');
 
-        return $query->pluck('name');
+        return $query->get(['name'])->pluck('name');
     }
 
     /**
@@ -87,7 +79,7 @@ class TagRepo
      * If no search is given the 50 most popular values are provided.
      * Passing a tagName will only find values for a tags with a particular name.
      */
-    public function getValueSuggestions(string $searchTerm, string $tagName): Collection
+    public function getValueSuggestions(?string $searchTerm, ?string $tagName): Collection
     {
         $query = Tag::query()
             ->select('*', DB::raw('count(*) as count'))
@@ -105,7 +97,7 @@ class TagRepo
 
         $query = $this->permissions->restrictEntityRelationQuery($query, 'tags', 'entity_id', 'entity_type');
 
-        return $query->pluck('value');
+        return $query->get(['value'])->pluck('value');
     }
 
     /**

app/Actions/Webhook.php

@@ -22,10 +22,10 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
  */
 class Webhook extends Model implements Loggable
 {
-    use HasFactory;
-
     protected $fillable = ['name', 'endpoint', 'timeout'];
 
+    use HasFactory;
+
     protected $casts = [
         'last_called_at'  => 'datetime',
         'last_errored_at' => 'datetime',

app/Actions/WebhookTrackedEvent.php

@@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Model;
  */
 class WebhookTrackedEvent extends Model
 {
-    use HasFactory;
-
     protected $fillable = ['event'];
+
+    use HasFactory;
 }

app/Api/ApiEntityListFormatter.php

@@ -1,107 +0,0 @@
-<?php
-
-namespace BookStack\Api;
-
-use BookStack\Entities\Models\Entity;
-
-class ApiEntityListFormatter
-{
-    /**
-     * The list to be formatted.
-     * @var Entity[]
-     */
-    protected $list = [];
-
-    /**
-     * The fields to show in the formatted data.
-     * Can be a plain string array item for a direct model field (If existing on model).
-     * If the key is a string, with a callable value, the return value of the callable
-     * will be used for the resultant value. A null return value will omit the property.
-     * @var array<string|int, string|callable>
-     */
-    protected $fields = [
-        'id', 'name', 'slug', 'book_id', 'chapter_id',
-        'draft', 'template', 'created_at', 'updated_at',
-    ];
-
-    public function __construct(array $list)
-    {
-        $this->list = $list;
-
-        // Default dynamic fields
-        $this->withField('url', fn(Entity $entity) => $entity->getUrl());
-    }
-
-    /**
-     * Add a field to be used in the formatter, with the property using the given
-     * name and value being the return type of the given callback.
-     */
-    public function withField(string $property, callable $callback): self
-    {
-        $this->fields[$property] = $callback;
-        return $this;
-    }
-
-    /**
-     * Show the 'type' property in the response reflecting the entity type.
-     * EG: page, chapter, bookshelf, book
-     * To be included in results with non-pre-determined types.
-     */
-    public function withType(): self
-    {
-        $this->withField('type', fn(Entity $entity) => $entity->getType());
-        return $this;
-    }
-
-    /**
-     * Include tags in the formatted data.
-     */
-    public function withTags(): self
-    {
-        $this->withField('tags', fn(Entity $entity) => $entity->tags);
-        return $this;
-    }
-
-    /**
-     * Format the data and return an array of formatted content.
-     * @return array[]
-     */
-    public function format(): array
-    {
-        $results = [];
-
-        foreach ($this->list as $item) {
-            $results[] = $this->formatSingle($item);
-        }
-
-        return $results;
-    }
-
-    /**
-     * Format a single entity item to a plain array.
-     */
-    protected function formatSingle(Entity $entity): array
-    {
-        $result = [];
-        $values = (clone $entity)->toArray();
-
-        foreach ($this->fields as $field => $callback) {
-            if (is_string($callback)) {
-                $field = $callback;
-                if (!isset($values[$field])) {
-                    continue;
-                }
-                $value = $values[$field];
-            } else {
-                $value = $callback($entity);
-                if (is_null($value)) {
-                    continue;
-                }
-            }
-
-            $result[$field] = $value;
-        }
-
-        return $result;
-    }
-}

app/Api/ListingResponseBuilder.php

@@ -2,31 +2,24 @@
 
 namespace BookStack\Api;
 
+use BookStack\Model;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 class ListingResponseBuilder
 {
-    protected Builder $query;
-    protected Request $request;
-
-    /**
-     * @var string[]
-     */
-    protected array $fields;
+    protected $query;
+    protected $request;
+    protected $fields;
 
     /**
      * @var array<callable>
      */
-    protected array $resultModifiers = [];
+    protected $resultModifiers = [];
 
-    /**
-     * @var array<string, string>
-     */
-    protected array $filterOperators = [
+    protected $filterOperators = [
         'eq'   => '=',
         'ne'   => '!=',
         'gt'   => '>',
@@ -70,9 +63,9 @@ class ListingResponseBuilder
     /**
      * Add a callback to modify each element of the results.
      *
-     * @param (callable(Model): void) $modifier
+     * @param (callable(Model)) $modifier
      */
-    public function modifyResults(callable $modifier): void
+    public function modifyResults($modifier): void
     {
         $this->resultModifiers[] = $modifier;
     }

app/Auth/Access/LdapService.php

@@ -105,7 +105,7 @@ class LdapService
             'name'  => $this->getUserResponseProperty($user, $displayNameAttr, $userCn),
             'dn'    => $user['dn'],
             'email' => $this->getUserResponseProperty($user, $emailAttr, null),
-            'avatar' => $thumbnailAttr ? $this->getUserResponseProperty($user, $thumbnailAttr, null) : null,
+            'avatar'=> $thumbnailAttr ? $this->getUserResponseProperty($user, $thumbnailAttr, null) : null,
         ];
 
         if ($this->config['dump_user_details']) {

app/Auth/Access/LoginService.php

@@ -5,7 +5,6 @@ namespace BookStack\Auth\Access;
 use BookStack\Actions\ActivityType;
 use BookStack\Auth\Access\Mfa\MfaSession;
 use BookStack\Auth\User;
-use BookStack\Exceptions\LoginAttemptException;
 use BookStack\Exceptions\StoppedAuthenticationException;
 use BookStack\Facades\Activity;
 use BookStack\Facades\Theme;
@@ -150,7 +149,6 @@ class LoginService
      * May interrupt the flow if extra authentication requirements are imposed.
      *
      * @throws StoppedAuthenticationException
-     * @throws LoginAttemptException
      */
     public function attempt(array $credentials, string $method, bool $remember = false): bool
     {

app/Auth/Access/Oidc/OidcJwtSigningKey.php

@@ -67,10 +67,11 @@ class OidcJwtSigningKey
             throw new OidcInvalidKeyException("Only RS256 keys are currently supported. Found key using {$alg}");
         }
 
-        // 'use' is optional for a JWK but we assume 'sig' where no value exists since that's what
-        // the OIDC discovery spec infers since 'sig' MUST be set if encryption keys come into play.
-        $use = $jwk['use'] ?? 'sig';
-        if ($use !== 'sig') {
+        if (empty($jwk['use'])) {
+            throw new OidcInvalidKeyException('A "use" parameter on the provided key is expected');
+        }
+
+        if ($jwk['use'] !== 'sig') {
             throw new OidcInvalidKeyException("Only signature keys are currently supported. Found key for use {$jwk['use']}");
         }
 

app/Auth/Access/Oidc/OidcOAuthProvider.php

@@ -30,11 +30,6 @@ class OidcOAuthProvider extends AbstractProvider
      */
     protected $tokenEndpoint;
 
-    /**
-     * Scopes to use for the OIDC authorization call.
-     */
-    protected array $scopes = ['openid', 'profile', 'email'];
-
     /**
      * Returns the base URL for authorizing a client.
      */
@@ -59,15 +54,6 @@ class OidcOAuthProvider extends AbstractProvider
         return '';
     }
 
-    /**
-     * Add an additional scope to this provider upon the default.
-     */
-    public function addScope(string $scope): void
-    {
-        $this->scopes[] = $scope;
-        $this->scopes = array_unique($this->scopes);
-    }
-
     /**
      * Returns the default scopes used by this provider.
      *
@@ -76,7 +62,7 @@ class OidcOAuthProvider extends AbstractProvider
      */
     protected function getDefaultScopes(): array
     {
-        return $this->scopes;
+        return ['openid', 'profile', 'email'];
     }
 
     /**

app/Auth/Access/Oidc/OidcProviderSettings.php

@@ -15,17 +15,40 @@ use Psr\Http\Client\ClientInterface;
  */
 class OidcProviderSettings
 {
-    public string $issuer;
-    public string $clientId;
-    public string $clientSecret;
-    public ?string $redirectUri;
-    public ?string $authorizationEndpoint;
-    public ?string $tokenEndpoint;
+    /**
+     * @var string
+     */
+    public $issuer;
+
+    /**
+     * @var string
+     */
+    public $clientId;
+
+    /**
+     * @var string
+     */
+    public $clientSecret;
+
+    /**
+     * @var string
+     */
+    public $redirectUri;
+
+    /**
+     * @var string
+     */
+    public $authorizationEndpoint;
+
+    /**
+     * @var string
+     */
+    public $tokenEndpoint;
 
     /**
      * @var string[]|array[]
      */
-    public ?array $keys = [];
+    public $keys = [];
 
     public function __construct(array $settings)
     {
@@ -141,10 +164,9 @@ class OidcProviderSettings
     protected function filterKeys(array $keys): array
     {
         return array_filter($keys, function (array $key) {
-            $alg = $key['alg'] ?? 'RS256';
-            $use = $key['use'] ?? 'sig';
+            $alg = $key['alg'] ?? null;
 
-            return $key['kty'] === 'RSA' && $use === 'sig' && $alg === 'RS256';
+            return $key['kty'] === 'RSA' && $key['use'] === 'sig' && (is_null($alg) || $alg === 'RS256');
         });
     }
 

app/Auth/Access/Oidc/OidcService.php

@@ -2,18 +2,20 @@
 
 namespace BookStack\Auth\Access\Oidc;
 
-use BookStack\Auth\Access\GroupSyncService;
+use function auth;
 use BookStack\Auth\Access\LoginService;
 use BookStack\Auth\Access\RegistrationService;
 use BookStack\Auth\User;
 use BookStack\Exceptions\JsonDebugException;
 use BookStack\Exceptions\StoppedAuthenticationException;
 use BookStack\Exceptions\UserRegistrationException;
-use Illuminate\Support\Arr;
+use function config;
 use Illuminate\Support\Facades\Cache;
 use League\OAuth2\Client\OptionProvider\HttpBasicAuthOptionProvider;
 use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use Psr\Http\Client\ClientInterface as HttpClient;
+use function trans;
+use function url;
 
 /**
  * Class OpenIdConnectService
@@ -24,21 +26,15 @@ class OidcService
     protected RegistrationService $registrationService;
     protected LoginService $loginService;
     protected HttpClient $httpClient;
-    protected GroupSyncService $groupService;
 
     /**
      * OpenIdService constructor.
      */
-    public function __construct(
-        RegistrationService $registrationService,
-        LoginService $loginService,
-        HttpClient $httpClient,
-        GroupSyncService $groupService
-    ) {
+    public function __construct(RegistrationService $registrationService, LoginService $loginService, HttpClient $httpClient)
+    {
         $this->registrationService = $registrationService;
         $this->loginService = $loginService;
         $this->httpClient = $httpClient;
-        $this->groupService = $groupService;
     }
 
     /**
@@ -52,6 +48,7 @@ class OidcService
     {
         $settings = $this->getProviderSettings();
         $provider = $this->getProvider($settings);
+
         return [
             'url'   => $provider->getAuthorizationUrl(),
             'state' => $provider->getState(),
@@ -120,31 +117,10 @@ class OidcService
      */
     protected function getProvider(OidcProviderSettings $settings): OidcOAuthProvider
     {
-        $provider = new OidcOAuthProvider($settings->arrayForProvider(), [
+        return new OidcOAuthProvider($settings->arrayForProvider(), [
             'httpClient'     => $this->httpClient,
             'optionProvider' => new HttpBasicAuthOptionProvider(),
         ]);
-
-        foreach ($this->getAdditionalScopes() as $scope) {
-            $provider->addScope($scope);
-        }
-
-        return $provider;
-    }
-
-    /**
-     * Get any user-defined addition/custom scopes to apply to the authentication request.
-     *
-     * @return string[]
-     */
-    protected function getAdditionalScopes(): array
-    {
-        $scopeConfig = $this->config()['additional_scopes'] ?: '';
-
-        $scopeArr = explode(',', $scopeConfig);
-        $scopeArr = array_map(fn (string $scope) => trim($scope), $scopeArr);
-
-        return array_filter($scopeArr);
     }
 
     /**
@@ -169,32 +145,10 @@ class OidcService
         return implode(' ', $displayName);
     }
 
-    /**
-     * Extract the assigned groups from the id token.
-     *
-     * @return string[]
-     */
-    protected function getUserGroups(OidcIdToken $token): array
-    {
-        $groupsAttr = $this->config()['groups_claim'];
-        if (empty($groupsAttr)) {
-            return [];
-        }
-
-        $groupsList = Arr::get($token->getAllClaims(), $groupsAttr);
-        if (!is_array($groupsList)) {
-            return [];
-        }
-
-        return array_values(array_filter($groupsList, function ($val) {
-            return is_string($val);
-        }));
-    }
-
     /**
      * Extract the details of a user from an ID token.
      *
-     * @return array{name: string, email: string, external_id: string, groups: string[]}
+     * @return array{name: string, email: string, external_id: string}
      */
     protected function getUserDetails(OidcIdToken $token): array
     {
@@ -204,7 +158,6 @@ class OidcService
             'external_id' => $id,
             'email'       => $token->getClaim('email'),
             'name'        => $this->getUserDisplayName($token, $id),
-            'groups'      => $this->getUserGroups($token),
         ];
     }
 
@@ -256,12 +209,6 @@ class OidcService
             throw new OidcException($exception->getMessage());
         }
 
-        if ($this->shouldSyncGroups()) {
-            $groups = $userDetails['groups'];
-            $detachExisting = $this->config()['remove_from_groups'];
-            $this->groupService->syncUserWithFoundGroups($user, $groups, $detachExisting);
-        }
-
         $this->loginService->login($user, 'oidc');
 
         return $user;
@@ -274,12 +221,4 @@ class OidcService
     {
         return config('oidc');
     }
-
-    /**
-     * Check if groups should be synced.
-     */
-    protected function shouldSyncGroups(): bool
-    {
-        return $this->config()['user_to_groups'] !== false;
-    }
 }

app/Auth/Access/Saml2Service.php

@@ -20,11 +20,14 @@ use OneLogin\Saml2\ValidationError;
  */
 class Saml2Service
 {
-    protected array $config;
-    protected RegistrationService $registrationService;
-    protected LoginService $loginService;
-    protected GroupSyncService $groupSyncService;
+    protected $config;
+    protected $registrationService;
+    protected $loginService;
+    protected $groupSyncService;
 
+    /**
+     * Saml2Service constructor.
+     */
     public function __construct(
         RegistrationService $registrationService,
         LoginService $loginService,
@@ -106,10 +109,9 @@ class Saml2Service
         $errors = $toolkit->getErrors();
 
         if (!empty($errors)) {
-            $reason = $toolkit->getLastErrorReason();
-            $message = 'Invalid ACS Response; Errors: ' . implode(', ', $errors);
-            $message .= $reason ? "; Reason: {$reason}" : '';
-            throw new Error($message);
+            throw new Error(
+                'Invalid ACS Response: ' . implode(', ', $errors)
+            );
         }
 
         if (!$toolkit->isAuthenticated()) {
@@ -166,7 +168,7 @@ class Saml2Service
      */
     public function metadata(): string
     {
-        $toolKit = $this->getToolkit(true);
+        $toolKit = $this->getToolkit();
         $settings = $toolKit->getSettings();
         $metadata = $settings->getSPMetadata();
         $errors = $settings->validateMetadata($metadata);
@@ -187,7 +189,7 @@ class Saml2Service
      * @throws Error
      * @throws Exception
      */
-    protected function getToolkit(bool $spOnly = false): Auth
+    protected function getToolkit(): Auth
     {
         $settings = $this->config['onelogin'];
         $overrides = $this->config['onelogin_overrides'] ?? [];
@@ -197,14 +199,14 @@ class Saml2Service
         }
 
         $metaDataSettings = [];
-        if (!$spOnly && $this->config['autoload_from_metadata']) {
+        if ($this->config['autoload_from_metadata']) {
             $metaDataSettings = IdPMetadataParser::parseRemoteXML($settings['idp']['entityId']);
         }
 
         $spSettings = $this->loadOneloginServiceProviderDetails();
         $settings = array_replace_recursive($settings, $spSettings, $metaDataSettings, $overrides);
 
-        return new Auth($settings, $spOnly);
+        return new Auth($settings);
     }
 
     /**

app/Auth/Permissions/CollapsedPermission.php

@@ -1,18 +0,0 @@
-<?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

@@ -1,278 +0,0 @@
-<?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

@@ -2,68 +2,20 @@
 
 namespace BookStack\Auth\Permissions;
 
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
 use BookStack\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-/**
- * @property int $id
- * @property int $role_id
- * @property int $user_id
- * @property int $entity_id
- * @property string $entity_type
- * @property boolean $view
- * @property boolean $create
- * @property boolean $update
- * @property boolean $delete
- */
 class EntityPermission extends Model
 {
-    public const PERMISSIONS = ['view', 'create', 'update', 'delete'];
-
-    protected $fillable = ['role_id', 'user_id', 'view', 'create', 'update', 'delete'];
+    protected $fillable = ['role_id', 'action'];
     public $timestamps = false;
 
     /**
-     * Get the role assigned to this entity permission.
+     * Get all this restriction's attached entity.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
      */
-    public function role(): BelongsTo
+    public function restrictable()
     {
-        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;
+        return $this->morphTo('restrictable');
     }
 }

app/Auth/Permissions/EntityPermissionMap.php

@@ -1,37 +0,0 @@
-<?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

@@ -0,0 +1,31 @@
+<?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

@@ -0,0 +1,405 @@
+<?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
+{
+    /**
+     * @var array<string, array<int, SimpleEntityData>>
+     */
+    protected $entityCache;
+
+    /**
+     * 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', 'restricted', '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', 'restricted', 'owned_by'])
+            ->chunk(50, function ($shelves) use ($roles) {
+                $this->createManyJointPermissions($shelves->all(), $roles);
+            });
+    }
+
+    /**
+     * Prepare the local entity cache and ensure it's empty.
+     *
+     * @param SimpleEntityData[] $entities
+     */
+    protected function readyEntityCache(array $entities)
+    {
+        $this->entityCache = [];
+
+        foreach ($entities as $entity) {
+            if (!isset($this->entityCache[$entity->type])) {
+                $this->entityCache[$entity->type] = [];
+            }
+
+            $this->entityCache[$entity->type][$entity->id] = $entity;
+        }
+    }
+
+    /**
+     * Get a book via ID, Checks local cache.
+     */
+    protected function getBook(int $bookId): SimpleEntityData
+    {
+        return $this->entityCache['book'][$bookId];
+    }
+
+    /**
+     * Get a chapter via ID, Checks local cache.
+     */
+    protected function getChapter(int $chapterId): SimpleEntityData
+    {
+        return $this->entityCache['chapter'][$chapterId];
+    }
+
+    /**
+     * Get a query for fetching a book with its children.
+     */
+    protected function bookFetchQuery(): Builder
+    {
+        return Book::query()->withTrashed()
+            ->select(['id', 'restricted', 'owned_by'])->with([
+                'chapters' => function ($query) {
+                    $query->withTrashed()->select(['id', 'restricted', 'owned_by', 'book_id']);
+                },
+                'pages' => function ($query) {
+                    $query->withTrashed()->select(['id', 'restricted', '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) {
+            $attrs = $entity->getAttributes();
+            $simple = new SimpleEntityData();
+            $simple->id = $attrs['id'];
+            $simple->type = $entity->getMorphClass();
+            $simple->restricted = boolval($attrs['restricted'] ?? 0);
+            $simple->owned_by = $attrs['owned_by'] ?? 0;
+            $simple->book_id = $attrs['book_id'] ?? null;
+            $simple->chapter_id = $attrs['chapter_id'] ?? null;
+            $simpleEntities[] = $simple;
+        }
+
+        return $simpleEntities;
+    }
+
+    /**
+     * Create & Save entity jointPermissions for many entities and roles.
+     *
+     * @param Entity[] $entities
+     * @param Role[]   $roles
+     */
+    protected function createManyJointPermissions(array $originalEntities, array $roles)
+    {
+        $entities = $this->entitiesToSimpleEntities($originalEntities);
+        $this->readyEntityCache($entities);
+        $jointPermissions = [];
+
+        // Create a mapping of entity restricted statuses
+        $entityRestrictedMap = [];
+        foreach ($entities as $entity) {
+            $entityRestrictedMap[$entity->type . ':' . $entity->id] = $entity->restricted;
+        }
+
+        // Fetch related entity permissions
+        $permissions = $this->getEntityPermissionsForEntities($entities);
+
+        // Create a mapping of explicit entity permissions
+        $permissionMap = [];
+        foreach ($permissions as $permission) {
+            $key = $permission->restrictable_type . ':' . $permission->restrictable_id . ':' . $permission->role_id;
+            $isRestricted = $entityRestrictedMap[$permission->restrictable_type . ':' . $permission->restrictable_id];
+            $permissionMap[$key] = $isRestricted;
+        }
+
+        // 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) {
+                $jointPermissions[] = $this->createJointPermissionData(
+                    $entity,
+                    $role->getRawAttribute('id'),
+                    $permissionMap,
+                    $rolePermissionMap,
+                    $role->system_name === 'admin'
+                );
+            }
+        }
+
+        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;
+    }
+
+    /**
+     * 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('action', '=', 'view')
+            ->where(function (Builder $query) use ($idsByType) {
+                foreach ($idsByType as $type => $ids) {
+                    $query->orWhere(function (Builder $query) use ($type, $ids) {
+                        $query->where('restrictable_type', '=', $type)->whereIn('restrictable_id', $ids);
+                    });
+                }
+            });
+
+        return $permissionFetch->get()->all();
+    }
+
+    /**
+     * Create entity permission data for an entity and role
+     * for a particular action.
+     */
+    protected function createJointPermissionData(SimpleEntityData $entity, int $roleId, array $permissionMap, array $rolePermissionMap, bool $isAdminRole): array
+    {
+        $permissionPrefix = $entity->type . '-view';
+        $roleHasPermission = isset($rolePermissionMap[$roleId . ':' . $permissionPrefix . '-all']);
+        $roleHasPermissionOwn = isset($rolePermissionMap[$roleId . ':' . $permissionPrefix . '-own']);
+
+        if ($isAdminRole) {
+            return $this->createJointPermissionDataArray($entity, $roleId, true, true);
+        }
+
+        if ($entity->restricted) {
+            $hasAccess = $this->mapHasActiveRestriction($permissionMap, $entity, $roleId);
+
+            return $this->createJointPermissionDataArray($entity, $roleId, $hasAccess, $hasAccess);
+        }
+
+        if ($entity->type === 'book' || $entity->type === 'bookshelf') {
+            return $this->createJointPermissionDataArray($entity, $roleId, $roleHasPermission, $roleHasPermissionOwn);
+        }
+
+        // For chapters and pages, Check if explicit permissions are set on the Book.
+        $book = $this->getBook($entity->book_id);
+        $hasExplicitAccessToParents = $this->mapHasActiveRestriction($permissionMap, $book, $roleId);
+        $hasPermissiveAccessToParents = !$book->restricted;
+
+        // For pages with a chapter, Check if explicit permissions are set on the Chapter
+        if ($entity->type === 'page' && $entity->chapter_id !== 0) {
+            $chapter = $this->getChapter($entity->chapter_id);
+            $hasPermissiveAccessToParents = $hasPermissiveAccessToParents && !$chapter->restricted;
+            if ($chapter->restricted) {
+                $hasExplicitAccessToParents = $this->mapHasActiveRestriction($permissionMap, $chapter, $roleId);
+            }
+        }
+
+        return $this->createJointPermissionDataArray(
+            $entity,
+            $roleId,
+            ($hasExplicitAccessToParents || ($roleHasPermission && $hasPermissiveAccessToParents)),
+            ($hasExplicitAccessToParents || ($roleHasPermissionOwn && $hasPermissiveAccessToParents))
+        );
+    }
+
+    /**
+     * Check for an active restriction in an entity map.
+     */
+    protected function mapHasActiveRestriction(array $entityMap, SimpleEntityData $entity, int $roleId): bool
+    {
+        $key = $entity->type . ':' . $entity->id . ':' . $roleId;
+
+        return $entityMap[$key] ?? false;
+    }
+
+    /**
+     * 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, bool $permissionAll, bool $permissionOwn): array
+    {
+        return [
+            'entity_id'          => $entity->id,
+            'entity_type'        => $entity->type,
+            'has_permission'     => $permissionAll,
+            'has_permission_own' => $permissionOwn,
+            'owned_by'           => $entity->owned_by,
+            'role_id'            => $roleId,
+        ];
+    }
+}

app/Auth/Permissions/PermissionApplicator.php

@@ -12,8 +12,6 @@ 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
@@ -36,13 +34,7 @@ class PermissionApplicator
         $ownRolePermission = $user->can($fullPermission . '-own');
         $nonJointPermissions = ['restrictions', 'image', 'attachment', 'comment'];
         $ownerField = ($ownable instanceof Entity) ? 'owned_by' : 'created_by';
-        $ownableFieldVal = $ownable->getAttribute($ownerField);
-
-        if (is_null($ownableFieldVal)) {
-            throw new InvalidArgumentException("{$ownerField} field used but has not been loaded");
-        }
-
-        $isOwner = $user->id === $ownableFieldVal;
+        $isOwner = $user->id === $ownable->getAttribute($ownerField);
         $hasRolePermission = $allRolePermission || ($isOwner && $ownRolePermission);
 
         // Handle non entity specific jointPermissions
@@ -50,7 +42,7 @@ class PermissionApplicator
             return $hasRolePermission;
         }
 
-        $hasApplicableEntityPermissions = $this->hasEntityPermission($ownable, $userRoleIds, $user->id, $action);
+        $hasApplicableEntityPermissions = $this->hasEntityPermission($ownable, $userRoleIds, $action);
 
         return is_null($hasApplicableEntityPermissions) ? $hasRolePermission : $hasApplicableEntityPermissions;
     }
@@ -59,74 +51,31 @@ 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, int $userId, string $action): ?bool
+    protected function hasEntityPermission(Entity $entity, array $userRoleIds, string $action): ?bool
     {
-        $this->ensureValidEntityAction($action);
-
         $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];
+        $chain = [$entity];
         if ($entity instanceof Page && $entity->chapter_id) {
-            $typeIdList[] = 'chapter:' . $entity->chapter_id;
+            $chain[] = $entity->chapter;
         }
 
         if ($entity instanceof Page || $entity instanceof Chapter) {
-            $typeIdList[] = 'book:' . $entity->book_id;
+            $chain[] = $entity->book;
         }
 
-        $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;
-                }
+        foreach ($chain as $currentEntity) {
+            if ($currentEntity->restricted) {
+                return $currentEntity->permissions()
+                    ->whereIn('role_id', $userRoleIds)
+                    ->where('action', '=', $action)
+                    ->count() > 0;
             }
         }
 
-        // 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;
     }
 
@@ -136,19 +85,18 @@ class PermissionApplicator
      */
     public function checkUserHasEntityPermissionOnAny(string $action, string $entityClass = ''): bool
     {
-        $this->ensureValidEntityAction($action);
+        if (strpos($action, '-') !== false) {
+            throw new InvalidArgumentException('Action should be a simple entity permission action, not a role permission');
+        }
 
         $permissionQuery = EntityPermission::query()
-            ->where($action, '=', true)
-            ->where(function (Builder $query) {
-                $query->whereIn('role_id', $this->getCurrentUserRoleIds())
-                ->orWhere('user_id', '=', $this->currentUser()->id);
-            });
+            ->where('action', '=', $action)
+            ->whereIn('role_id', $this->getCurrentUserRoleIds());
 
         if (!empty($entityClass)) {
             /** @var Entity $entityInstance */
             $entityInstance = app()->make($entityClass);
-            $permissionQuery = $permissionQuery->where('entity_type', '=', $entityInstance->getMorphClass());
+            $permissionQuery = $permissionQuery->where('restrictable_type', '=', $entityInstance->getMorphClass());
         }
 
         $hasPermission = $permissionQuery->count() > 0;
@@ -160,140 +108,18 @@ 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, string $morphClass): Builder
+    public function restrictEntityQuery(Builder $query): Builder
     {
-        $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']));
-                    }
-                });
-            }
+        return $query->where(function (Builder $parentQuery) {
+            $parentQuery->whereHas('jointPermissions', function (Builder $permissionQuery) {
+                $permissionQuery->whereIn('role_id', $this->getCurrentUserRoleIds())
+                    ->where(function (Builder $query) {
+                        $this->addJointHasPermissionCheck($query, $this->currentUser()->id);
+                    });
+            });
         });
     }
 
-    /**
-     * @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.
@@ -318,23 +144,30 @@ class PermissionApplicator
      */
     public function restrictEntityRelationQuery($query, string $tableName, string $entityIdColumn, string $entityTypeColumn)
     {
-        $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);
+        $tableDetails = ['tableName' => $tableName, 'entityIdColumn' => $entityIdColumn, 'entityTypeColumn' => $entityTypeColumn];
+        $pageMorphClass = (new Page())->getMorphClass();
+
+        $q = $query->whereExists(function ($permissionQuery) use (&$tableDetails) {
+            /** @var Builder $permissionQuery */
+            $permissionQuery->select(['role_id'])->from('joint_permissions')
+                ->whereColumn('joint_permissions.entity_id', '=', $tableDetails['tableName'] . '.' . $tableDetails['entityIdColumn'])
+                ->whereColumn('joint_permissions.entity_type', '=', $tableDetails['tableName'] . '.' . $tableDetails['entityTypeColumn'])
+                ->whereIn('joint_permissions.role_id', $this->getCurrentUserRoleIds())
+                ->where(function (QueryBuilder $query) {
+                    $this->addJointHasPermissionCheck($query, $this->currentUser()->id);
+                });
+        })->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);
                 });
-            }
-        }, '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;
+        return $q;
     }
 
     /**
@@ -345,12 +178,50 @@ class PermissionApplicator
      */
     public function restrictPageRelationQuery(Builder $query, string $tableName, string $pageIdColumn): Builder
     {
+        $fullPageIdColumn = $tableName . '.' . $pageIdColumn;
         $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;
+        $existsQuery = function ($permissionQuery) use ($fullPageIdColumn, $morphClass) {
+            /** @var Builder $permissionQuery */
+            $permissionQuery->select('joint_permissions.role_id')->from('joint_permissions')
+                ->whereColumn('joint_permissions.entity_id', '=', $fullPageIdColumn)
+                ->where('joint_permissions.entity_type', '=', $morphClass)
+                ->whereIn('joint_permissions.role_id', $this->getCurrentUserRoleIds())
+                ->where(function (QueryBuilder $query) {
+                    $this->addJointHasPermissionCheck($query, $this->currentUser()->id);
+                });
+        };
+
+        $q = $query->where(function ($query) use ($existsQuery, $fullPageIdColumn) {
+            $query->whereExists($existsQuery)
+                ->orWhere($fullPageIdColumn, '=', 0);
+        });
+
+        // Prevent visibility of non-owned draft pages
+        $q->whereExists(function (QueryBuilder $query) use ($fullPageIdColumn) {
+            $query->select('id')->from('pages')
+                ->whereColumn('pages.id', '=', $fullPageIdColumn)
+                ->where(function (QueryBuilder $query) {
+                    $query->where('pages.draft', '=', false)
+                        ->orWhere('pages.owned_by', '=', $this->currentUser()->id);
+                });
+        });
+
+        return $q;
+    }
+
+    /**
+     * Add the query for checking the given user id has permission
+     * within the join_permissions table.
+     *
+     * @param QueryBuilder|Builder $query
+     */
+    protected function addJointHasPermissionCheck($query, int $userIdToCheck)
+    {
+        $query->where('joint_permissions.has_permission', '=', true)->orWhere(function ($query) use ($userIdToCheck) {
+            $query->where('joint_permissions.has_permission_own', '=', true)
+                ->where('joint_permissions.owned_by', '=', $userIdToCheck);
+        });
     }
 
     /**
@@ -374,16 +245,4 @@ class PermissionApplicator
 
         return $this->currentUser()->roles->pluck('id')->values()->all();
     }
-
-    /**
-     * Ensure the given action is a valid and expected entity action.
-     * Throws an exception if invalid otherwise does nothing.
-     * @throws InvalidArgumentException
-     */
-    protected function ensureValidEntityAction(string $action): void
-    {
-        if (!in_array($action, EntityPermission::PERMISSIONS)) {
-            throw new InvalidArgumentException('Action should be a simple entity permission action, not a role permission');
-        }
-    }
 }

app/Auth/Permissions/PermissionFormData.php

@@ -1,80 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Permissions;
-
-use BookStack\Auth\Role;
-use BookStack\Entities\Models\Entity;
-
-class PermissionFormData
-{
-    protected Entity $entity;
-
-    public function __construct(Entity $entity)
-    {
-        $this->entity = $entity;
-    }
-
-    /**
-     * Get the permissions with assigned roles.
-     */
-    public function permissionsWithRoles(): array
-    {
-        return $this->entity->permissions()
-            ->with('role')
-            ->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()->whereNotNull('role_id')->pluck('role_id');
-        return Role::query()
-            ->where('system_name', '!=', 'admin')
-            ->whereNotIn('id', $assigned)
-            ->orderBy('display_name', 'asc')
-            ->get()
-            ->all();
-    }
-
-    /**
-     * Get the entity permission for the "Everyone Else" option.
-     */
-    public function everyoneElseEntityPermission(): EntityPermission
-    {
-        /** @var ?EntityPermission $permission */
-        $permission = $this->entity->permissions()
-            ->whereNull(['role_id', 'user_id'])
-            ->first();
-        return $permission ?? (new EntityPermission());
-    }
-
-    /**
-     * 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 everyoneElseInheriting(): bool
-    {
-        return !$this->entity->permissions()
-            ->whereNull(['role_id', 'user_id'])
-            ->exists();
-    }
-}

app/Auth/Permissions/PermissionsRepo.php

@@ -11,13 +11,13 @@ use Illuminate\Database\Eloquent\Collection;
 
 class PermissionsRepo
 {
-    protected CollapsedPermissionBuilder $permissionBuilder;
-    protected array $systemRoles = ['admin', 'public'];
+    protected JointPermissionBuilder $permissionBuilder;
+    protected $systemRoles = ['admin', 'public'];
 
     /**
      * PermissionsRepo constructor.
      */
-    public function __construct(CollapsedPermissionBuilder $permissionBuilder)
+    public function __construct(JointPermissionBuilder $permissionBuilder)
     {
         $this->permissionBuilder = $permissionBuilder;
     }
@@ -57,6 +57,7 @@ class PermissionsRepo
 
         $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
         $this->assignRolePermissions($role, $permissions);
+        $this->permissionBuilder->rebuildForRole($role);
 
         Activity::add(ActivityType::ROLE_CREATE, $role);
 
@@ -87,6 +88,7 @@ class PermissionsRepo
         $role->fill($roleData);
         $role->mfa_enforced = ($roleData['mfa_enforced'] ?? 'false') === 'true';
         $role->save();
+        $this->permissionBuilder->rebuildForRole($role);
 
         Activity::add(ActivityType::ROLE_UPDATE, $role);
     }
@@ -137,8 +139,7 @@ class PermissionsRepo
             }
         }
 
-        $role->entityPermissions()->delete();
-        $role->collapsedPermissions()->delete();
+        $role->jointPermissions()->delete();
         Activity::add(ActivityType::ROLE_DELETE, $role);
         $role->delete();
     }

app/Auth/Permissions/SimpleEntityData.php

@@ -6,6 +6,8 @@ class SimpleEntityData
 {
     public int $id;
     public string $type;
+    public bool $restricted;
+    public int $owned_by;
     public ?int $book_id;
     public ?int $chapter_id;
 }

app/Auth/Queries/AllUsersPaginatedAndSorted.php

@@ -3,7 +3,6 @@
 namespace BookStack\Auth\Queries;
 
 use BookStack\Auth\User;
-use BookStack\Util\SimpleListOptions;
 use Illuminate\Pagination\LengthAwarePaginator;
 
 /**
@@ -12,23 +11,23 @@ use Illuminate\Pagination\LengthAwarePaginator;
  * user is assumed to be trusted. (Admin users).
  * Email search can be abused to extract email addresses.
  */
-class UsersAllPaginatedAndSorted
+class AllUsersPaginatedAndSorted
 {
-    public function run(int $count, SimpleListOptions $listOptions): LengthAwarePaginator
+    /**
+     * @param array{sort: string, order: string, search: string} $sortData
+     */
+    public function run(int $count, array $sortData): LengthAwarePaginator
     {
-        $sort = $listOptions->getSort();
-        if ($sort === 'created_at') {
-            $sort = 'users.created_at';
-        }
+        $sort = $sortData['sort'];
 
         $query = User::query()->select(['*'])
             ->scopes(['withLastActivityAt'])
             ->with(['roles', 'avatar'])
             ->withCount('mfaValues')
-            ->orderBy($sort, $listOptions->getOrder());
+            ->orderBy($sort, $sortData['order']);
 
-        if ($listOptions->getSearch()) {
-            $term = '%' . $listOptions->getSearch() . '%';
+        if ($sortData['search']) {
+            $term = '%' . $sortData['search'] . '%';
             $query->where(function ($query) use ($term) {
                 $query->where('name', 'like', $term)
                     ->orWhere('email', 'like', $term);

app/Auth/Queries/RolesAllPaginatedAndSorted.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Queries;
-
-use BookStack\Auth\Role;
-use BookStack\Util\SimpleListOptions;
-use Illuminate\Pagination\LengthAwarePaginator;
-
-/**
- * Get all the roles in the system in a paginated format.
- */
-class RolesAllPaginatedAndSorted
-{
-    public function run(int $count, SimpleListOptions $listOptions): LengthAwarePaginator
-    {
-        $sort = $listOptions->getSort();
-        if ($sort === 'created_at') {
-            $sort = 'users.created_at';
-        }
-
-        $query = Role::query()->select(['*'])
-            ->withCount(['users', 'permissions'])
-            ->orderBy($sort, $listOptions->getOrder());
-
-        if ($listOptions->getSearch()) {
-            $term = '%' . $listOptions->getSearch() . '%';
-            $query->where(function ($query) use ($term) {
-                $query->where('display_name', 'like', $term)
-                    ->orWhere('description', 'like', $term);
-            });
-        }
-
-        return $query->paginate($count);
-    }
-}

app/Auth/Role.php

@@ -2,8 +2,7 @@
 
 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;
@@ -39,6 +38,14 @@ 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.
      */
@@ -47,22 +54,6 @@ class Role extends Model implements Loggable
         return $this->belongsToMany(RolePermission::class, 'permission_role', 'role_id', 'permission_id');
     }
 
-    /**
-     * Get the entity permissions assigned to this role.
-     */
-    public function entityPermissions(): HasMany
-    {
-        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.
      */
@@ -110,6 +101,25 @@ class Role extends Model implements Loggable
         return static::query()->where('system_name', '=', $systemName)->first();
     }
 
+    /**
+     * Get all visible roles.
+     */
+    public static function visible(): Collection
+    {
+        return static::query()->where('hidden', '=', false)->orderBy('name')->get();
+    }
+
+    /**
+     * Get the roles that can be restricted.
+     */
+    public static function restrictable(): Collection
+    {
+        return static::query()
+            ->where('system_name', '!=', 'admin')
+            ->orderBy('display_name', 'asc')
+            ->get();
+    }
+
     /**
      * {@inheritdoc}
      */

app/Auth/User.php

@@ -5,8 +5,6 @@ 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;
@@ -82,11 +80,6 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     protected ?Collection $permissions;
 
-    /**
-     * This holds the user's avatar URL when loaded to prevent re-calculating within the same request.
-     */
-    protected string $avatarUrl = '';
-
     /**
      * This holds the default user when loaded.
      *
@@ -240,18 +233,12 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
             return $default;
         }
 
-        if (!empty($this->avatarUrl)) {
-            return $this->avatarUrl;
-        }
-
         try {
             $avatar = $this->avatar ? url($this->avatar->getThumb($size, $size, false)) : $default;
         } catch (Exception $err) {
             $avatar = $default;
         }
 
-        $this->avatarUrl = $avatar;
-
         return $avatar;
     }
 
@@ -300,22 +287,6 @@ 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

@@ -10,7 +10,6 @@ use BookStack\Exceptions\UserUpdateException;
 use BookStack\Facades\Activity;
 use BookStack\Uploads\UserAvatars;
 use Exception;
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 
@@ -62,7 +61,7 @@ class UserRepo
         $user = new User();
         $user->name = $data['name'];
         $user->email = $data['email'];
-        $user->password = Hash::make(empty($data['password']) ? Str::random(32) : $data['password']);
+        $user->password = bcrypt(empty($data['password']) ? Str::random(32) : $data['password']);
         $user->email_confirmed = $emailConfirmed;
         $user->external_auth_id = $data['external_auth_id'] ?? '';
 
@@ -127,7 +126,7 @@ class UserRepo
         }
 
         if (!empty($data['password'])) {
-            $user->password = Hash::make($data['password']);
+            $user->password = bcrypt($data['password']);
         }
 
         if (!empty($data['language'])) {
@@ -153,16 +152,11 @@ class UserRepo
         $user->apiTokens()->delete();
         $user->favourites()->delete();
         $user->mfaValues()->delete();
-        $user->collapsedPermissions()->delete();
-        $user->entityPermissions()->delete();
         $user->delete();
 
         // Delete user profile images
         $this->userAvatar->destroyAllForUser($user);
 
-        // Delete related activities
-        setting()->deleteUserSettings($user->id);
-
         if (!empty($newOwnerId)) {
             $newOwner = User::query()->find($newOwnerId);
             if (!is_null($newOwner)) {

app/Config/app.php

@@ -22,7 +22,7 @@ return [
     // The number of revisions to keep in the database.
     // Once this limit is reached older revisions will be deleted.
     // If set to false then a limit will not be enforced.
-    'revision_limit' => env('REVISION_LIMIT', 100),
+    'revision_limit' => env('REVISION_LIMIT', 50),
 
     // The number of days that content will remain in the recycle bin before
     // being considered for auto-removal. It is not a guarantee that content will
@@ -75,7 +75,7 @@ return [
     'locale' => env('APP_LANG', 'en'),
 
     // Locales available
-    'locales' => ['en', 'ar', 'bg', 'bs', 'ca', 'cs', 'cy', 'da', 'de', 'de_informal', 'el', 'es', 'es_AR', 'et', 'eu', 'fa', 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ka', 'ko', 'lt', 'lv', 'nl', 'nb', 'pt', 'pt_BR', 'sk', 'sl', 'sv', 'pl',  'ro', 'ru', 'tr', 'uk', 'uz', 'vi', 'zh_CN', 'zh_TW'],
+    'locales' => ['en', 'ar', 'bg', 'bs', 'ca', 'cs', 'cy', 'da', 'de', 'de_informal', 'es', 'es_AR', 'et', 'eu', 'fa', 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'lt', 'lv', 'nl', 'nb', 'pt', 'pt_BR', 'sk', 'sl', 'sv', 'pl',  'ru', 'th', 'tr', 'uk', 'uz', 'vi', 'zh_CN', 'zh_TW'],
 
     //  Application Fallback Locale
     'fallback_locale' => 'en',
@@ -114,8 +114,6 @@ return [
         Illuminate\Foundation\Providers\FoundationServiceProvider::class,
         Illuminate\Hashing\HashServiceProvider::class,
         Illuminate\Mail\MailServiceProvider::class,
-        Illuminate\Notifications\NotificationServiceProvider::class,
-        Illuminate\Pagination\PaginationServiceProvider::class,
         Illuminate\Pipeline\PipelineServiceProvider::class,
         Illuminate\Queue\QueueServiceProvider::class,
         Illuminate\Redis\RedisServiceProvider::class,
@@ -123,22 +121,27 @@ return [
         Illuminate\Session\SessionServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
+        Illuminate\Notifications\NotificationServiceProvider::class,
+        SocialiteProviders\Manager\ServiceProvider::class,
 
         // Third party service providers
+        Intervention\Image\ImageServiceProvider::class,
         Barryvdh\DomPDF\ServiceProvider::class,
         Barryvdh\Snappy\ServiceProvider::class,
-        Intervention\Image\ImageServiceProvider::class,
-        SocialiteProviders\Manager\ServiceProvider::class,
+
+        // BookStack replacement service providers (Extends Laravel)
+        BookStack\Providers\PaginationServiceProvider::class,
+        BookStack\Providers\TranslationServiceProvider::class,
 
         // BookStack custom service providers
         BookStack\Providers\ThemeServiceProvider::class,
-        BookStack\Providers\AppServiceProvider::class,
         BookStack\Providers\AuthServiceProvider::class,
+        BookStack\Providers\AppServiceProvider::class,
+        BookStack\Providers\BroadcastServiceProvider::class,
         BookStack\Providers\EventServiceProvider::class,
         BookStack\Providers\RouteServiceProvider::class,
-        BookStack\Providers\TranslationServiceProvider::class,
-        BookStack\Providers\ValidationRuleServiceProvider::class,
-        BookStack\Providers\ViewTweaksServiceProvider::class,
+        BookStack\Providers\CustomFacadeProvider::class,
+        BookStack\Providers\CustomValidationServiceProvider::class,
     ],
 
     /*

app/Config/dompdf.php

@@ -7,7 +7,6 @@
  * Configuration should be altered via the `.env` file or environment variables.
  * Do not edit this file unless you're happy to maintain any changes yourself.
  */
-
 $dompdfPaperSizeMap = [
     'a4'     => 'a4',
     'letter' => 'letter',

app/Config/oidc.php

@@ -32,16 +32,4 @@ return [
     // OAuth2 endpoints.
     'authorization_endpoint' => env('OIDC_AUTH_ENDPOINT', null),
     'token_endpoint'         => env('OIDC_TOKEN_ENDPOINT', null),
-
-    // Add extra scopes, upon those required, to the OIDC authentication request
-    // Multiple values can be provided comma seperated.
-    'additional_scopes' => env('OIDC_ADDITIONAL_SCOPES', null),
-
-    // Group sync options
-    // Enable syncing, upon login, of OIDC groups to BookStack roles
-    'user_to_groups' => env('OIDC_USER_TO_GROUPS', false),
-    // Attribute, within a OIDC ID token, to find group names within
-    'groups_claim' => env('OIDC_GROUPS_CLAIM', 'groups'),
-    // When syncing groups, remove any groups that no longer match. Otherwise sync only adds new groups.
-    'remove_from_groups' => env('OIDC_REMOVE_FROM_GROUPS', false),
 ];

app/Config/setting-defaults.php

@@ -26,8 +26,6 @@ return [
 
     // User-level default settings
     'user' => [
-        'ui-shortcuts'          => '{}',
-        'ui-shortcuts-enabled'  => false,
         'dark-mode-enabled'     => env('APP_DEFAULT_DARK_MODE', false),
         'bookshelves_view_type' => env('APP_VIEWS_BOOKSHELVES', 'grid'),
         'bookshelf_view_type'   => env('APP_VIEWS_BOOKSHELF', 'grid'),

app/Config/snappy.php

@@ -7,7 +7,6 @@
  * Configuration should be altered via the `.env` file or environment variables.
  * Do not edit this file unless you're happy to maintain any changes yourself.
  */
-
 $snappyPaperSizeMap = [
     'a4'     => 'A4',
     'letter' => 'Letter',

app/Console/Commands/CopyShelfPermissions.php

@@ -3,7 +3,7 @@
 namespace BookStack\Console\Commands;
 
 use BookStack\Entities\Models\Bookshelf;
-use BookStack\Entities\Tools\PermissionsUpdater;
+use BookStack\Entities\Repos\BookshelfRepo;
 use Illuminate\Console\Command;
 
 class CopyShelfPermissions extends Command
@@ -25,16 +25,19 @@ class CopyShelfPermissions extends Command
      */
     protected $description = 'Copy shelf permissions to all child books';
 
-    protected PermissionsUpdater $permissionsUpdater;
+    /**
+     * @var BookshelfRepo
+     */
+    protected $bookshelfRepo;
 
     /**
      * Create a new command instance.
      *
      * @return void
      */
-    public function __construct(PermissionsUpdater $permissionsUpdater)
+    public function __construct(BookshelfRepo $repo)
     {
-        $this->permissionsUpdater = $permissionsUpdater;
+        $this->bookshelfRepo = $repo;
         parent::__construct();
     }
 
@@ -66,18 +69,18 @@ class CopyShelfPermissions extends Command
                 return;
             }
 
-            $shelves = Bookshelf::query()->get(['id']);
+            $shelves = Bookshelf::query()->get(['id', 'restricted']);
         }
 
         if ($shelfSlug) {
-            $shelves = Bookshelf::query()->where('slug', '=', $shelfSlug)->get(['id']);
+            $shelves = Bookshelf::query()->where('slug', '=', $shelfSlug)->get(['id', 'restricted']);
             if ($shelves->count() === 0) {
                 $this->info('No shelves found with the given slug.');
             }
         }
 
         foreach ($shelves as $shelf) {
-            $this->permissionsUpdater->updateBookPermissionsFromShelf($shelf, false);
+            $this->bookshelfRepo->copyDownPermissions($shelf, false);
             $this->info('Copied permissions for shelf [' . $shelf->id . ']');
         }
 

app/Console/Commands/RegenerateCommentContent.php

@@ -5,7 +5,6 @@ namespace BookStack\Console\Commands;
 use BookStack\Actions\Comment;
 use BookStack\Actions\CommentRepo;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
 
 class RegenerateCommentContent extends Command
 {
@@ -44,9 +43,9 @@ class RegenerateCommentContent extends Command
      */
     public function handle()
     {
-        $connection = DB::getDefaultConnection();
+        $connection = \DB::getDefaultConnection();
         if ($this->option('database') !== null) {
-            DB::setDefaultConnection($this->option('database'));
+            \DB::setDefaultConnection($this->option('database'));
         }
 
         Comment::query()->chunk(100, function ($comments) {
@@ -56,9 +55,7 @@ class RegenerateCommentContent extends Command
             }
         });
 
-        DB::setDefaultConnection($connection);
+        \DB::setDefaultConnection($connection);
         $this->comment('Comment HTML content has been regenerated');
-
-        return 0;
     }
 }

app/Console/Commands/RegeneratePermissions.php

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

app/Console/Commands/RegenerateReferences.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace BookStack\Console\Commands;
-
-use BookStack\References\ReferenceStore;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
-
-class RegenerateReferences extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'bookstack:regenerate-references {--database= : The database connection to use.}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Regenerate all the cross-item model reference index';
-
-    protected ReferenceStore $references;
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct(ReferenceStore $references)
-    {
-        $this->references = $references;
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-        $connection = DB::getDefaultConnection();
-
-        if ($this->option('database')) {
-            DB::setDefaultConnection($this->option('database'));
-        }
-
-        $this->references->updateForAllPages();
-
-        DB::setDefaultConnection($connection);
-
-        $this->comment('References have been regenerated');
-
-        return 0;
-    }
-}

app/Console/Commands/RegenerateSearch.php

@@ -3,7 +3,7 @@
 namespace BookStack\Console\Commands;
 
 use BookStack\Entities\Models\Entity;
-use BookStack\Search\SearchIndex;
+use BookStack\Entities\Tools\SearchIndex;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 

app/Entities/Models/Book.php

@@ -19,7 +19,6 @@ use Illuminate\Support\Collection;
  * @property \Illuminate\Database\Eloquent\Collection $chapters
  * @property \Illuminate\Database\Eloquent\Collection $pages
  * @property \Illuminate\Database\Eloquent\Collection $directPages
- * @property \Illuminate\Database\Eloquent\Collection $shelves
  */
 class Book extends Entity implements HasCoverImage
 {
@@ -28,7 +27,7 @@ class Book extends Entity implements HasCoverImage
     public $searchFactor = 1.2;
 
     protected $fillable = ['name', 'description'];
-    protected $hidden = ['pivot', 'image_id', 'deleted_at'];
+    protected $hidden = ['restricted', 'pivot', 'image_id', 'deleted_at'];
 
     /**
      * Get the url for this book.
@@ -120,13 +119,4 @@ class Book extends Entity implements HasCoverImage
 
         return $pages->concat($chapters)->sortBy('priority')->sortByDesc('draft');
     }
-
-    /**
-     * Get a visible book by its slug.
-     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
-     */
-    public static function getBySlug(string $slug): self
-    {
-        return static::visible()->where('slug', '=', $slug)->firstOrFail();
-    }
 }

app/Entities/Models/BookChild.php

@@ -2,7 +2,6 @@
 
 namespace BookStack\Entities\Models;
 
-use BookStack\References\ReferenceUpdater;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
@@ -58,16 +57,11 @@ abstract class BookChild extends Entity
      */
     public function changeBook(int $newBookId): Entity
     {
-        $oldUrl = $this->getUrl();
         $this->book_id = $newBookId;
         $this->refreshSlug();
         $this->save();
         $this->refresh();
 
-        if ($oldUrl !== $this->getUrl()) {
-            app()->make(ReferenceUpdater::class)->updateEntityPageReferences($this, $oldUrl);
-        }
-
         // Update all child pages if a chapter
         if ($this instanceof Chapter) {
             foreach ($this->pages()->withTrashed()->get() as $page) {

app/Entities/Models/Bookshelf.php

@@ -17,7 +17,7 @@ class Bookshelf extends Entity implements HasCoverImage
 
     protected $fillable = ['name', 'description', 'image_id'];
 
-    protected $hidden = ['image_id', 'deleted_at'];
+    protected $hidden = ['restricted', 'image_id', 'deleted_at'];
 
     /**
      * Get the books in this shelf.
@@ -86,7 +86,7 @@ class Bookshelf extends Entity implements HasCoverImage
      */
     public function coverImageTypeKey(): string
     {
-        return 'cover_bookshelf';
+        return 'cover_shelf';
     }
 
     /**
@@ -109,13 +109,4 @@ class Bookshelf extends Entity implements HasCoverImage
         $maxOrder = $this->books()->max('order');
         $this->books()->attach($book->id, ['order' => $maxOrder + 1]);
     }
-
-    /**
-     * Get a visible shelf by its slug.
-     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
-     */
-    public static function getBySlug(string $slug): self
-    {
-        return static::visible()->where('slug', '=', $slug)->firstOrFail();
-    }
 }

app/Entities/Models/Chapter.php

@@ -19,7 +19,7 @@ class Chapter extends BookChild
     public $searchFactor = 1.2;
 
     protected $fillable = ['name', 'description', 'priority'];
-    protected $hidden = ['pivot', 'deleted_at'];
+    protected $hidden = ['restricted', 'pivot', 'deleted_at'];
 
     /**
      * Get the pages that this chapter contains.
@@ -58,13 +58,4 @@ class Chapter extends BookChild
         ->orderBy('priority', 'asc')
         ->get();
     }
-
-    /**
-     * Get a visible chapter by its book and page slugs.
-     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
-     */
-    public static function getBySlugs(string $bookSlug, string $chapterSlug): self
-    {
-        return static::visible()->whereSlugs($bookSlug, $chapterSlug)->firstOrFail();
-    }
 }

app/Entities/Models/Entity.php

@@ -7,10 +7,11 @@ 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\CollapsedPermissionBuilder;
+use BookStack\Auth\Permissions\JointPermission;
+use BookStack\Auth\Permissions\JointPermissionBuilder;
 use BookStack\Auth\Permissions\PermissionApplicator;
+use BookStack\Entities\Tools\SearchIndex;
 use BookStack\Entities\Tools\SlugGenerator;
 use BookStack\Interfaces\Deletable;
 use BookStack\Interfaces\Favouritable;
@@ -18,9 +19,6 @@ use BookStack\Interfaces\Loggable;
 use BookStack\Interfaces\Sluggable;
 use BookStack\Interfaces\Viewable;
 use BookStack\Model;
-use BookStack\References\Reference;
-use BookStack\Search\SearchIndex;
-use BookStack\Search\SearchTerm;
 use BookStack\Traits\HasCreatorAndUpdater;
 use BookStack\Traits\HasOwner;
 use Carbon\Carbon;
@@ -42,6 +40,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property Carbon     $deleted_at
  * @property int        $created_by
  * @property int        $updated_by
+ * @property bool       $restricted
  * @property Collection $tags
  *
  * @method static Entity|Builder visible()
@@ -69,7 +68,7 @@ abstract class Entity extends Model implements Sluggable, Favouritable, Viewable
      */
     public function scopeVisible(Builder $query): Builder
     {
-        return app()->make(PermissionApplicator::class)->restrictEntityQuery($query, $this->getMorphClass());
+        return app()->make(PermissionApplicator::class)->restrictEntityQuery($query);
     }
 
     /**
@@ -175,23 +174,24 @@ abstract class Entity extends Model implements Sluggable, Favouritable, Viewable
      */
     public function permissions(): MorphMany
     {
-        return $this->morphMany(EntityPermission::class, 'entity');
+        return $this->morphMany(EntityPermission::class, 'restrictable');
     }
 
     /**
      * Check if this entity has a specific restriction set against it.
      */
-    public function hasPermissions(): bool
+    public function hasRestriction(int $role_id, string $action): bool
     {
-        return $this->permissions()->count() > 0;
+        return $this->permissions()->where('role_id', '=', $role_id)
+            ->where('action', '=', $action)->count() > 0;
     }
 
     /**
-     * Get the entity collapsed permissions this is connected to.
+     * Get the entity jointPermissions this is connected to.
      */
-    public function collapsedPermissions(): MorphMany
+    public function jointPermissions(): MorphMany
     {
-        return $this->morphMany(CollapsedPermission::class, 'entity');
+        return $this->morphMany(JointPermission::class, 'entity');
     }
 
     /**
@@ -202,22 +202,6 @@ abstract class Entity extends Model implements Sluggable, Favouritable, Viewable
         return $this->morphMany(Deletion::class, 'deletable');
     }
 
-    /**
-     * Get the references pointing from this entity to other items.
-     */
-    public function referencesFrom(): MorphMany
-    {
-        return $this->morphMany(Reference::class, 'from');
-    }
-
-    /**
-     * Get the references pointing to this entity from other items.
-     */
-    public function referencesTo(): MorphMany
-    {
-        return $this->morphMany(Reference::class, 'to');
-    }
-
     /**
      * Check if this instance or class is a certain type of entity.
      * Examples of $type are 'page', 'book', 'chapter'.
@@ -292,7 +276,7 @@ abstract class Entity extends Model implements Sluggable, Favouritable, Viewable
      */
     public function rebuildPermissions()
     {
-        app()->make(CollapsedPermissionBuilder::class)->rebuildForEntity(clone $this);
+        app()->make(JointPermissionBuilder::class)->rebuildForEntity(clone $this);
     }
 
     /**

app/Entities/Models/Page.php

@@ -39,7 +39,7 @@ class Page extends BookChild
 
     public $textField = 'text';
 
-    protected $hidden = ['html', 'markdown', 'text', 'pivot', 'deleted_at'];
+    protected $hidden = ['html', 'markdown', 'text', 'restricted', 'pivot', 'deleted_at'];
 
     protected $casts = [
         'draft'    => 'boolean',
@@ -88,6 +88,8 @@ class Page extends BookChild
 
     /**
      * Get the current revision for the page if existing.
+     *
+     * @return PageRevision|null
      */
     public function currentRevision(): HasOne
     {
@@ -143,13 +145,4 @@ class Page extends BookChild
 
         return $refreshed;
     }
-
-    /**
-     * Get a visible page by its book and page slugs.
-     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
-     */
-    public static function getBySlugs(string $bookSlug, string $pageSlug): self
-    {
-        return static::visible()->whereSlugs($bookSlug, $pageSlug)->firstOrFail();
-    }
 }

app/Entities/Models/PageRevision.php

@@ -31,7 +31,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 class PageRevision extends Model implements Loggable
 {
     protected $fillable = ['name', 'text', 'summary'];
-    protected $hidden = ['html', 'markdown', 'text'];
+    protected $hidden = ['html', 'markdown', 'restricted', 'text'];
 
     /**
      * Get the user that created the page revision.

app/Entities/Models/SearchTerm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Search;
+namespace BookStack\Entities\Models;
 
 use BookStack\Model;
 

app/Entities/Repos/BaseRepo.php

@@ -6,7 +6,6 @@ use BookStack\Actions\TagRepo;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\HasCoverImage;
 use BookStack\Exceptions\ImageUploadException;
-use BookStack\References\ReferenceUpdater;
 use BookStack\Uploads\ImageRepo;
 use Illuminate\Http\UploadedFile;
 
@@ -14,13 +13,11 @@ class BaseRepo
 {
     protected TagRepo $tagRepo;
     protected ImageRepo $imageRepo;
-    protected ReferenceUpdater $referenceUpdater;
 
-    public function __construct(TagRepo $tagRepo, ImageRepo $imageRepo, ReferenceUpdater $referenceUpdater)
+    public function __construct(TagRepo $tagRepo, ImageRepo $imageRepo)
     {
         $this->tagRepo = $tagRepo;
         $this->imageRepo = $imageRepo;
-        $this->referenceUpdater = $referenceUpdater;
     }
 
     /**
@@ -41,7 +38,6 @@ class BaseRepo
             $this->tagRepo->saveTagsToEntity($entity, $input['tags']);
         }
 
-        $entity->refresh();
         $entity->rebuildPermissions();
         $entity->indexForSearch();
     }
@@ -51,12 +47,10 @@ class BaseRepo
      */
     public function update(Entity $entity, array $input)
     {
-        $oldUrl = $entity->getUrl();
-
         $entity->fill($input);
         $entity->updated_by = user()->id;
 
-        if ($entity->isDirty('name') || empty($entity->slug)) {
+        if ($entity->isDirty('name')) {
             $entity->refreshSlug();
         }
 
@@ -69,10 +63,6 @@ class BaseRepo
 
         $entity->rebuildPermissions();
         $entity->indexForSearch();
-
-        if ($oldUrl !== $entity->getUrl()) {
-            $this->referenceUpdater->updateEntityPageReferences($entity, $oldUrl);
-        }
     }
 
     /**
@@ -86,15 +76,14 @@ class BaseRepo
     public function updateCoverImage($entity, ?UploadedFile $coverImage, bool $removeImage = false)
     {
         if ($coverImage) {
-            $imageType = $entity->coverImageTypeKey();
-            $this->imageRepo->destroyImage($entity->cover()->first());
-            $image = $this->imageRepo->saveNew($coverImage, $imageType, $entity->id, 512, 512, true);
+            $this->imageRepo->destroyImage($entity->cover);
+            $image = $this->imageRepo->saveNew($coverImage, 'cover_book', $entity->id, 512, 512, true);
             $entity->cover()->associate($image);
             $entity->save();
         }
 
         if ($removeImage) {
-            $this->imageRepo->destroyImage($entity->cover()->first());
+            $this->imageRepo->destroyImage($entity->cover);
             $entity->image_id = 0;
             $entity->save();
         }

app/Entities/Repos/BookshelfRepo.php

@@ -134,6 +134,31 @@ class BookshelfRepo
         $shelf->books()->sync($syncData);
     }
 
+    /**
+     * Copy down the permissions of the given shelf to all child books.
+     */
+    public function copyDownPermissions(Bookshelf $shelf, $checkUserPermissions = true): int
+    {
+        $shelfPermissions = $shelf->permissions()->get(['role_id', 'action'])->toArray();
+        $shelfBooks = $shelf->books()->get(['id', 'restricted']);
+        $updatedBookCount = 0;
+
+        /** @var Book $book */
+        foreach ($shelfBooks as $book) {
+            if ($checkUserPermissions && !userCan('restrictions-manage', $book)) {
+                continue;
+            }
+            $book->permissions()->delete();
+            $book->restricted = $shelf->restricted;
+            $book->permissions()->createMany($shelfPermissions);
+            $book->save();
+            $book->rebuildPermissions();
+            $updatedBookCount++;
+        }
+
+        return $updatedBookCount;
+    }
+
     /**
      * Remove a bookshelf from the system.
      *

app/Entities/Repos/PageRepo.php

@@ -16,31 +16,20 @@ use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Facades\Activity;
-use BookStack\References\ReferenceStore;
-use BookStack\References\ReferenceUpdater;
 use Exception;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;
 
 class PageRepo
 {
-    protected BaseRepo $baseRepo;
-    protected RevisionRepo $revisionRepo;
-    protected ReferenceStore $referenceStore;
-    protected ReferenceUpdater $referenceUpdater;
+    protected $baseRepo;
 
     /**
      * PageRepo constructor.
      */
-    public function __construct(
-        BaseRepo $baseRepo,
-        RevisionRepo $revisionRepo,
-        ReferenceStore $referenceStore,
-        ReferenceUpdater $referenceUpdater
-    ) {
+    public function __construct(BaseRepo $baseRepo)
+    {
         $this->baseRepo = $baseRepo;
-        $this->revisionRepo = $revisionRepo;
-        $this->referenceStore = $referenceStore;
-        $this->referenceUpdater = $referenceUpdater;
     }
 
     /**
@@ -50,7 +39,6 @@ class PageRepo
      */
     public function getById(int $id, array $relations = ['book']): Page
     {
-        /** @var Page $page */
         $page = Page::visible()->with($relations)->find($id);
 
         if (!$page) {
@@ -82,7 +70,17 @@ class PageRepo
      */
     public function getByOldSlug(string $bookSlug, string $pageSlug): ?Page
     {
-        $revision = $this->revisionRepo->getBySlugs($bookSlug, $pageSlug);
+        /** @var ?PageRevision $revision */
+        $revision = PageRevision::query()
+            ->whereHas('page', function (Builder $query) {
+                $query->scopes('visible');
+            })
+            ->where('slug', '=', $pageSlug)
+            ->where('type', '=', 'version')
+            ->where('book_slug', '=', $bookSlug)
+            ->orderBy('created_at', 'desc')
+            ->with('page')
+            ->first();
 
         return $revision->page ?? null;
     }
@@ -114,7 +112,7 @@ class PageRepo
     public function getParentFromSlugs(string $bookSlug, string $chapterSlug = null): Entity
     {
         if ($chapterSlug !== null) {
-            return Chapter::visible()->whereSlugs($bookSlug, $chapterSlug)->firstOrFail();
+            return $chapter = Chapter::visible()->whereSlugs($bookSlug, $chapterSlug)->firstOrFail();
         }
 
         return Book::visible()->where('slug', '=', $bookSlug)->firstOrFail();
@@ -125,7 +123,9 @@ class PageRepo
      */
     public function getUserDraft(Page $page): ?PageRevision
     {
-        return $this->revisionRepo->getLatestDraftForCurrentUser($page);
+        $revision = $this->getUserDraftQuery($page)->first();
+
+        return $revision;
     }
 
     /**
@@ -165,10 +165,11 @@ class PageRepo
         $draft->draft = false;
         $draft->revision_count = 1;
         $draft->priority = $this->getNewPriority($draft);
+        $draft->refreshSlug();
         $draft->save();
 
-        $this->revisionRepo->storeNewForPage($draft, trans('entities.pages_initial_revision'));
-        $this->referenceStore->updateForPage($draft);
+        $this->savePageRevision($draft, trans('entities.pages_initial_revision'));
+        $draft->indexForSearch();
         $draft->refresh();
 
         Activity::add(ActivityType::PAGE_CREATE, $draft);
@@ -188,14 +189,13 @@ class PageRepo
 
         $this->updateTemplateStatusAndContentFromInput($page, $input);
         $this->baseRepo->update($page, $input);
-        $this->referenceStore->updateForPage($page);
 
         // Update with new details
         $page->revision_count++;
         $page->save();
 
         // Remove all update drafts for this user & page.
-        $this->revisionRepo->deleteDraftsForCurrentUser($page);
+        $this->getUserDraftQuery($page)->delete();
 
         // Save a revision after updating
         $summary = trim($input['summary'] ?? '');
@@ -203,7 +203,7 @@ class PageRepo
         $nameChanged = isset($input['name']) && $input['name'] !== $oldName;
         $markdownChanged = isset($input['markdown']) && $input['markdown'] !== $oldMarkdown;
         if ($htmlChanged || $nameChanged || $markdownChanged || $summary) {
-            $this->revisionRepo->storeNewForPage($page, $summary);
+            $this->savePageRevision($page, $summary);
         }
 
         Activity::add(ActivityType::PAGE_UPDATE, $page);
@@ -239,6 +239,32 @@ class PageRepo
         }
     }
 
+    /**
+     * Saves a page revision into the system.
+     */
+    protected function savePageRevision(Page $page, string $summary = null): PageRevision
+    {
+        $revision = new PageRevision();
+
+        $revision->name = $page->name;
+        $revision->html = $page->html;
+        $revision->markdown = $page->markdown;
+        $revision->text = $page->text;
+        $revision->page_id = $page->id;
+        $revision->slug = $page->slug;
+        $revision->book_slug = $page->book->slug;
+        $revision->created_by = user()->id;
+        $revision->created_at = $page->updated_at;
+        $revision->type = 'version';
+        $revision->summary = $summary;
+        $revision->revision_number = $page->revision_count;
+        $revision->save();
+
+        $this->deleteOldRevisions($page);
+
+        return $revision;
+    }
+
     /**
      * Save a page update draft.
      */
@@ -254,7 +280,7 @@ class PageRepo
         }
 
         // Otherwise, save the data to a revision
-        $draft = $this->revisionRepo->getNewDraftForCurrentUser($page);
+        $draft = $this->getPageRevisionToUpdate($page);
         $draft->fill($input);
 
         if (!empty($input['markdown'])) {
@@ -288,7 +314,6 @@ class PageRepo
      */
     public function restoreRevision(Page $page, int $revisionId): Page
     {
-        $oldUrl = $page->getUrl();
         $page->revision_count++;
 
         /** @var PageRevision $revision */
@@ -307,14 +332,9 @@ class PageRepo
         $page->refreshSlug();
         $page->save();
         $page->indexForSearch();
-        $this->referenceStore->updateForPage($page);
 
         $summary = trans('entities.pages_revision_restored_from', ['id' => strval($revisionId), 'summary' => $revision->summary]);
-        $this->revisionRepo->storeNewForPage($page, $summary);
-
-        if ($oldUrl !== $page->getUrl()) {
-            $this->referenceUpdater->updateEntityPageReferences($page, $oldUrl);
-        }
+        $this->savePageRevision($page, $summary);
 
         Activity::add(ActivityType::PAGE_RESTORE, $page);
         Activity::add(ActivityType::REVISION_RESTORE, $revision);
@@ -373,6 +393,48 @@ class PageRepo
         return $parentClass::visible()->where('id', '=', $entityId)->first();
     }
 
+    /**
+     * Get a page revision to update for the given page.
+     * Checks for an existing revisions before providing a fresh one.
+     */
+    protected function getPageRevisionToUpdate(Page $page): PageRevision
+    {
+        $drafts = $this->getUserDraftQuery($page)->get();
+        if ($drafts->count() > 0) {
+            return $drafts->first();
+        }
+
+        $draft = new PageRevision();
+        $draft->page_id = $page->id;
+        $draft->slug = $page->slug;
+        $draft->book_slug = $page->book->slug;
+        $draft->created_by = user()->id;
+        $draft->type = 'update_draft';
+
+        return $draft;
+    }
+
+    /**
+     * Delete old revisions, for the given page, from the system.
+     */
+    protected function deleteOldRevisions(Page $page)
+    {
+        $revisionLimit = config('app.revision_limit');
+        if ($revisionLimit === false) {
+            return;
+        }
+
+        $revisionsToDelete = PageRevision::query()
+            ->where('page_id', '=', $page->id)
+            ->orderBy('created_at', 'desc')
+            ->skip(intval($revisionLimit))
+            ->take(10)
+            ->get(['id']);
+        if ($revisionsToDelete->count() > 0) {
+            PageRevision::query()->whereIn('id', $revisionsToDelete->pluck('id'))->delete();
+        }
+    }
+
     /**
      * Get a new priority for a page.
      */
@@ -388,4 +450,15 @@ class PageRepo
 
         return (new BookContents($page->book))->getLastPriority() + 1;
     }
+
+    /**
+     * Get the query to find the user's draft copies of the given page.
+     */
+    protected function getUserDraftQuery(Page $page)
+    {
+        return PageRevision::query()->where('created_by', '=', user()->id)
+            ->where('type', 'update_draft')
+            ->where('page_id', '=', $page->id)
+            ->orderBy('created_at', 'desc');
+    }
 }

app/Entities/Repos/RevisionRepo.php

@@ -1,131 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Repos;
-
-use BookStack\Entities\Models\Page;
-use BookStack\Entities\Models\PageRevision;
-use Illuminate\Database\Eloquent\Builder;
-
-class RevisionRepo
-{
-    /**
-     * Get a revision by its stored book and page slug values.
-     */
-    public function getBySlugs(string $bookSlug, string $pageSlug): ?PageRevision
-    {
-        /** @var ?PageRevision $revision */
-        $revision = PageRevision::query()
-            ->whereHas('page', function (Builder $query) {
-                $query->scopes('visible');
-            })
-            ->where('slug', '=', $pageSlug)
-            ->where('type', '=', 'version')
-            ->where('book_slug', '=', $bookSlug)
-            ->orderBy('created_at', 'desc')
-            ->with('page')
-            ->first();
-
-        return $revision;
-    }
-
-    /**
-     * Get the latest draft revision, for the given page, belonging to the current user.
-     */
-    public function getLatestDraftForCurrentUser(Page $page): ?PageRevision
-    {
-        /** @var ?PageRevision $revision */
-        $revision = $this->queryForCurrentUserDraft($page->id)->first();
-
-        return $revision;
-    }
-
-    /**
-     * Delete all drafts revisions, for the given page, belonging to the current user.
-     */
-    public function deleteDraftsForCurrentUser(Page $page): void
-    {
-        $this->queryForCurrentUserDraft($page->id)->delete();
-    }
-
-    /**
-     * Get a user update_draft page revision to update for the given page.
-     * Checks for an existing revisions before providing a fresh one.
-     */
-    public function getNewDraftForCurrentUser(Page $page): PageRevision
-    {
-        $draft = $this->getLatestDraftForCurrentUser($page);
-
-        if ($draft) {
-            return $draft;
-        }
-
-        $draft = new PageRevision();
-        $draft->page_id = $page->id;
-        $draft->slug = $page->slug;
-        $draft->book_slug = $page->book->slug;
-        $draft->created_by = user()->id;
-        $draft->type = 'update_draft';
-
-        return $draft;
-    }
-
-    /**
-     * Store a new revision in the system for the given page.
-     */
-    public function storeNewForPage(Page $page, string $summary = null): PageRevision
-    {
-        $revision = new PageRevision();
-
-        $revision->name = $page->name;
-        $revision->html = $page->html;
-        $revision->markdown = $page->markdown;
-        $revision->text = $page->text;
-        $revision->page_id = $page->id;
-        $revision->slug = $page->slug;
-        $revision->book_slug = $page->book->slug;
-        $revision->created_by = user()->id;
-        $revision->created_at = $page->updated_at;
-        $revision->type = 'version';
-        $revision->summary = $summary;
-        $revision->revision_number = $page->revision_count;
-        $revision->save();
-
-        $this->deleteOldRevisions($page);
-
-        return $revision;
-    }
-
-    /**
-     * Delete old revisions, for the given page, from the system.
-     */
-    protected function deleteOldRevisions(Page $page)
-    {
-        $revisionLimit = config('app.revision_limit');
-        if ($revisionLimit === false) {
-            return;
-        }
-
-        $revisionsToDelete = PageRevision::query()
-            ->where('page_id', '=', $page->id)
-            ->orderBy('created_at', 'desc')
-            ->skip(intval($revisionLimit))
-            ->take(10)
-            ->get(['id']);
-
-        if ($revisionsToDelete->count() > 0) {
-            PageRevision::query()->whereIn('id', $revisionsToDelete->pluck('id'))->delete();
-        }
-    }
-
-    /**
-     * Query update draft revisions for the current user.
-     */
-    protected function queryForCurrentUserDraft(int $pageId): Builder
-    {
-        return PageRevision::query()
-            ->where('created_by', '=', user()->id)
-            ->where('type', 'update_draft')
-            ->where('page_id', '=', $pageId)
-            ->orderBy('created_at', 'desc');
-    }
-}

app/Entities/Tools/BookContents.php

@@ -11,15 +11,22 @@ use Illuminate\Support\Collection;
 
 class BookContents
 {
-    protected Book $book;
+    /**
+     * @var Book
+     */
+    protected $book;
 
+    /**
+     * BookContents constructor.
+     */
     public function __construct(Book $book)
     {
         $this->book = $book;
     }
 
     /**
-     * Get the current priority of the last item at the top-level of the book.
+     * Get the current priority of the last item
+     * at the top-level of the book.
      */
     public function getLastPriority(): int
     {
@@ -181,7 +188,7 @@ class BookContents
             $model->changeBook($newBook->id);
         }
 
-        if ($model instanceof Page && $chapterChanged) {
+        if ($chapterChanged) {
             $model->chapter_id = $newChapter->id ?? 0;
         }
 
@@ -235,7 +242,7 @@ class BookContents
             }
 
             $hasPageEditPermission = userCan('page-update', $model);
-            $newParentInRightLocation = ($newParent instanceof Book || ($newParent instanceof Chapter && $newParent->book_id === $newBook->id));
+            $newParentInRightLocation = ($newParent instanceof Book || $newParent->book_id === $newBook->id);
             $newParentPermission = ($newParent instanceof Chapter) ? 'chapter-update' : 'book-update';
             $hasNewParentPermission = userCan($newParentPermission, $newParent);
 

app/Entities/Tools/Cloner.php

@@ -4,10 +4,8 @@ namespace BookStack\Entities\Tools;
 
 use BookStack\Actions\Tag;
 use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\HasCoverImage;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\ChapterRepo;
@@ -73,10 +71,8 @@ class Cloner
         $bookDetails = $this->entityToInputData($original);
         $bookDetails['name'] = $newName;
 
-        // Clone book
         $copyBook = $this->bookRepo->create($bookDetails);
 
-        // Clone contents
         $directChildren = $original->getDirectChildren();
         foreach ($directChildren as $child) {
             if ($child instanceof Chapter && userCan('chapter-create', $copyBook)) {
@@ -88,14 +84,6 @@ class Cloner
             }
         }
 
-        // Clone bookshelf relationships
-        /** @var Bookshelf $shelf */
-        foreach ($original->shelves as $shelf) {
-            if (userCan('bookshelf-update', $shelf)) {
-                $shelf->appendBook($copyBook);
-            }
-        }
-
         return $copyBook;
     }
 
@@ -110,11 +98,9 @@ class Cloner
         $inputData['tags'] = $this->entityTagsToInputArray($entity);
 
         // Add a cover to the data if existing on the original entity
-        if ($entity instanceof HasCoverImage) {
-            $cover = $entity->cover()->first();
-            if ($cover) {
-                $inputData['image'] = $this->imageToUploadedFile($cover);
-            }
+        if ($entity->cover instanceof Image) {
+            $uploadedFile = $this->imageToUploadedFile($entity->cover);
+            $inputData['image'] = $uploadedFile;
         }
 
         return $inputData;
@@ -125,7 +111,8 @@ class Cloner
      */
     public function copyEntityPermissions(Entity $sourceEntity, Entity $targetEntity): void
     {
-        $permissions = $sourceEntity->permissions()->get(['role_id', 'view', 'create', 'update', 'delete'])->toArray();
+        $targetEntity->restricted = $sourceEntity->restricted;
+        $permissions = $sourceEntity->permissions()->get(['role_id', 'action'])->toArray();
         $targetEntity->permissions()->delete();
         $targetEntity->permissions()->createMany($permissions);
         $targetEntity->rebuildPermissions();

app/Entities/Tools/ExportFormatter.php

@@ -235,7 +235,7 @@ class ExportFormatter
         $linksOutput = [];
         preg_match_all("/\<a.*href\=(\'|\")(.*?)(\'|\").*?\>/i", $htmlContent, $linksOutput);
 
-        // Update relative links to be absolute, with instance url
+        // Replace image src with base64 encoded image strings
         if (isset($linksOutput[0]) && count($linksOutput[0]) > 0) {
             foreach ($linksOutput[0] as $index => $linkMatch) {
                 $oldLinkString = $linkMatch;
@@ -248,6 +248,7 @@ class ExportFormatter
             }
         }
 
+        // Replace any relative links with system domain
         return $htmlContent;
     }
 

app/Entities/Tools/HierarchyTransformer.php

@@ -65,7 +65,7 @@ class HierarchyTransformer
         foreach ($book->chapters as $index => $chapter) {
             $newBook = $this->transformChapterToBook($chapter);
             $shelfBookSyncData[$newBook->id] = ['order' => $index];
-            if (!$newBook->hasPermissions()) {
+            if (!$newBook->restricted) {
                 $this->cloner->copyEntityPermissions($shelf, $newBook);
             }
         }

app/Entities/Tools/PageContent.php

@@ -5,8 +5,6 @@ namespace BookStack\Entities\Tools;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Tools\Markdown\MarkdownToHtml;
 use BookStack\Exceptions\ImageUploadException;
-use BookStack\Facades\Theme;
-use BookStack\Theming\ThemeEvents;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Uploads\ImageService;
 use BookStack\Util\HtmlContentFilter;
@@ -374,30 +372,23 @@ class PageContent
                 continue;
             }
 
-            // Find page to use, and default replacement to empty string for non-matches.
+            // Find page and skip this if page not found
             /** @var ?Page $matchedPage */
             $matchedPage = Page::visible()->find($pageId);
-            $replacement = '';
-
-            if ($matchedPage && count($splitInclude) === 1) {
-                // If we only have page id, just insert all page html and continue.
-                $replacement = $matchedPage->html;
-            } elseif ($matchedPage && count($splitInclude) > 1) {
-                // Otherwise, if our include tag defines a section, load that specific content
-                $innerContent = $this->fetchSectionOfPage($matchedPage, $splitInclude[1]);
-                $replacement = trim($innerContent);
+            if ($matchedPage === null) {
+                $html = str_replace($fullMatch, '', $html);
+                continue;
             }
 
-            $themeReplacement = Theme::dispatch(
-                ThemeEvents::PAGE_INCLUDE_PARSE,
-                $includeId,
-                $replacement,
-                clone $this->page,
-                $matchedPage ? (clone $matchedPage) : null,
-            );
+            // If we only have page id, just insert all page html and continue.
+            if (count($splitInclude) === 1) {
+                $html = str_replace($fullMatch, $matchedPage->html, $html);
+                continue;
+            }
 
-            // Perform the content replacement
-            $html = str_replace($fullMatch, $themeReplacement ?? $replacement, $html);
+            // Create and load HTML into a document
+            $innerContent = $this->fetchSectionOfPage($matchedPage, $splitInclude[1]);
+            $html = str_replace($fullMatch, trim($innerContent), $html);
         }
 
         return $html;

app/Entities/Tools/PageEditActivity.php

@@ -42,7 +42,7 @@ class PageEditActivity
             $userMessage = trans('entities.pages_draft_edit_active.start_b', ['userName' => $firstDraft->createdBy->name ?? '']);
         }
 
-        $timeMessage = trans('entities.pages_draft_edit_active.time_b', ['minCount' => 60]);
+        $timeMessage = trans('entities.pages_draft_edit_active.time_b', ['minCount'=> 60]);
 
         return trans('entities.pages_draft_edit_active.message', ['start' => $userMessage, 'time' => $timeMessage]);
     }

app/Entities/Tools/PermissionsUpdater.php

@@ -3,13 +3,11 @@
 namespace BookStack\Entities\Tools;
 
 use BookStack\Actions\ActivityType;
-use BookStack\Auth\Permissions\EntityPermission;
 use BookStack\Auth\User;
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Entity;
 use BookStack\Facades\Activity;
 use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
 
 class PermissionsUpdater
 {
@@ -18,9 +16,11 @@ class PermissionsUpdater
      */
     public function updateFromPermissionsForm(Entity $entity, Request $request)
     {
-        $permissions = $request->get('permissions', null);
+        $restricted = $request->get('restricted') === 'true';
+        $permissions = $request->get('restrictions', null);
         $ownerId = $request->get('owned_by', null);
 
+        $entity->restricted = $restricted;
         $entity->permissions()->delete();
 
         if (!is_null($permissions)) {
@@ -52,60 +52,18 @@ class PermissionsUpdater
     }
 
     /**
-     * Format permissions provided from a permission form to be EntityPermission data.
+     * Format permissions provided from a permission form to be
+     * EntityPermission data.
      */
-    protected function formatPermissionsFromRequestToEntityPermissions(array $permissions): array
+    protected function formatPermissionsFromRequestToEntityPermissions(array $permissions): Collection
     {
-        $formatted = [];
-        $columnsByType = [
-            'role' => 'role_id',
-            'user' => 'user_id',
-            'fallback' => '',
-        ];
-
-        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;
-            }
-        }
-
-        return $formatted;
-    }
-
-    /**
-     * Copy down the permissions of the given shelf to all child books.
-     */
-    public function updateBookPermissionsFromShelf(Bookshelf $shelf, $checkUserPermissions = true): int
-    {
-        $shelfPermissions = $shelf->permissions()->get(['role_id', 'view', 'create', 'update', 'delete'])->toArray();
-        $shelfBooks = $shelf->books()->get(['id', 'owned_by']);
-        $updatedBookCount = 0;
-
-        /** @var Book $book */
-        foreach ($shelfBooks as $book) {
-            if ($checkUserPermissions && !userCan('restrictions-manage', $book)) {
-                continue;
-            }
-            $book->permissions()->delete();
-            $book->permissions()->createMany($shelfPermissions);
-            $book->rebuildPermissions();
-            $updatedBookCount++;
-        }
-
-        return $updatedBookCount;
+        return collect($permissions)->flatMap(function ($restrictions, $roleId) {
+            return collect($restrictions)->keys()->map(function ($action) use ($roleId) {
+                return [
+                    'role_id' => $roleId,
+                    'action'  => strtolower($action),
+                ];
+            });
+        });
     }
 }

app/Entities/Tools/SearchIndex.php

@@ -1,11 +1,12 @@
 <?php
 
-namespace BookStack\Search;
+namespace BookStack\Entities\Tools;
 
 use BookStack\Actions\Tag;
 use BookStack\Entities\EntityProvider;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Models\SearchTerm;
 use DOMDocument;
 use DOMNode;
 use Illuminate\Database\Eloquent\Builder;

app/Entities/Tools/SearchOptions.php

@@ -1,15 +1,30 @@
 <?php
 
-namespace BookStack\Search;
+namespace BookStack\Entities\Tools;
 
 use Illuminate\Http\Request;
 
 class SearchOptions
 {
-    public array $searches = [];
-    public array $exacts = [];
-    public array $tags = [];
-    public array $filters = [];
+    /**
+     * @var array
+     */
+    public $searches = [];
+
+    /**
+     * @var array
+     */
+    public $exacts = [];
+
+    /**
+     * @var array
+     */
+    public $tags = [];
+
+    /**
+     * @var array
+     */
+    public $filters = [];
 
     /**
      * Create a new instance from a search string.

app/Entities/Tools/SearchResultsFormatter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Search;
+namespace BookStack\Entities\Tools;
 
 use BookStack\Actions\Tag;
 use BookStack\Entities\Models\Entity;

app/Entities/Tools/SearchRunner.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Search;
+namespace BookStack\Entities\Tools;
 
 use BookStack\Auth\Permissions\PermissionApplicator;
 use BookStack\Auth\User;
@@ -8,6 +8,7 @@ use BookStack\Entities\EntityProvider;
 use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Models\SearchTerm;
 use Illuminate\Database\Connection;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
@@ -28,7 +29,7 @@ class SearchRunner
      *
      * @var string[]
      */
-    protected array $queryOperators = ['<=', '>=', '=', '<', '>', 'like', '!='];
+    protected $queryOperators = ['<=', '>=', '=', '<', '>', 'like', '!='];
 
     /**
      * Retain a cache of score adjusted terms for specific search options.
@@ -50,7 +51,7 @@ class SearchRunner
      * The provided count is for each entity to search,
      * Total returned could be larger and not guaranteed.
      *
-     * @return array{total: int, count: int, has_more: bool, results: Collection<Entity>}
+     * @return array{total: int, count: int, has_more: bool, results: Entity[]}
      */
     public function searchEntities(SearchOptions $searchOpts, string $entityType = 'all', int $page = 1, int $count = 20): array
     {
@@ -162,7 +163,7 @@ class SearchRunner
         $entityQuery = $entityModelInstance->newQuery()->scopes('visible');
 
         if ($entityModelInstance instanceof Page) {
-            $entityQuery->select(array_merge($entityModelInstance::$listAttributes, ['owned_by']));
+            $entityQuery->select($entityModelInstance::$listAttributes);
         } else {
             $entityQuery->select(['*']);
         }
@@ -223,7 +224,7 @@ class SearchRunner
         });
         $subQuery->groupBy('entity_type', 'entity_id');
 
-        $entityQuery->joinSub($subQuery, 's', 'id', '=', 's.entity_id');
+        $entityQuery->joinSub($subQuery, 's', 'id', '=', 'entity_id');
         $entityQuery->addSelect('s.score');
         $entityQuery->orderBy('score', 'desc');
     }
@@ -447,7 +448,7 @@ class SearchRunner
 
     protected function filterIsRestricted(EloquentBuilder $query, Entity $model, $input)
     {
-        $query->whereHas('permissions');
+        $query->where('restricted', '=', true);
     }
 
     protected function filterViewedByMe(EloquentBuilder $query, Entity $model, $input)

app/Entities/Tools/TrashCan.php

@@ -372,12 +372,10 @@ class TrashCan
         $entity->permissions()->delete();
         $entity->tags()->delete();
         $entity->comments()->delete();
-        $entity->collapsedPermissions()->delete();
+        $entity->jointPermissions()->delete();
         $entity->searchTerms()->delete();
         $entity->deletions()->delete();
         $entity->favourites()->delete();
-        $entity->referencesTo()->delete();
-        $entity->referencesFrom()->delete();
 
         if ($entity instanceof HasCoverImage && $entity->cover()->exists()) {
             $imageService = app()->make(ImageService::class);

app/Http/Controllers/Api/BookApiController.php

@@ -2,18 +2,14 @@
 
 namespace BookStack\Http\Controllers\Api;
 
-use BookStack\Api\ApiEntityListFormatter;
 use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Repos\BookRepo;
-use BookStack\Entities\Tools\BookContents;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 
 class BookApiController extends ApiController
 {
-    protected BookRepo $bookRepo;
+    protected $bookRepo;
 
     public function __construct(BookRepo $bookRepo)
     {
@@ -51,25 +47,11 @@ class BookApiController extends ApiController
 
     /**
      * View the details of a single book.
-     * The response data will contain 'content' property listing the chapter and pages directly within, in
-     * the same structure as you'd see within the BookStack interface when viewing a book. Top-level
-     * contents will have a 'type' property to distinguish between pages & chapters.
      */
     public function read(string $id)
     {
         $book = Book::visible()->with(['tags', 'cover', 'createdBy', 'updatedBy', 'ownedBy'])->findOrFail($id);
 
-        $contents = (new BookContents($book))->getTree(true, false)->all();
-        $contentsApiData = (new ApiEntityListFormatter($contents))
-            ->withType()
-            ->withField('pages', function (Entity $entity) {
-                if ($entity instanceof Chapter) {
-                    return (new ApiEntityListFormatter($entity->pages->all()))->format();
-                }
-                return null;
-            })->format();
-        $book->setAttribute('contents', $contentsApiData);
-
         return response()->json($book);
     }
 

app/Http/Controllers/Api/BookshelfApiController.php

@@ -13,6 +13,9 @@ class BookshelfApiController extends ApiController
 {
     protected BookshelfRepo $bookshelfRepo;
 
+    /**
+     * BookshelfApiController constructor.
+     */
     public function __construct(BookshelfRepo $bookshelfRepo)
     {
         $this->bookshelfRepo = $bookshelfRepo;

app/Http/Controllers/Api/PageApiController.php

@@ -86,9 +86,6 @@ class PageApiController extends ApiController
      *
      * Pages will always have HTML content. They may have markdown content
      * if the markdown editor was used to last update the page.
-     *
-     * See the "Content Security" section of these docs for security considerations when using
-     * the page content returned from this endpoint.
      */
     public function read(string $id)
     {

app/Http/Controllers/Api/SearchApiController.php

@@ -2,17 +2,16 @@
 
 namespace BookStack\Http\Controllers\Api;
 
-use BookStack\Api\ApiEntityListFormatter;
 use BookStack\Entities\Models\Entity;
-use BookStack\Search\SearchOptions;
-use BookStack\Search\SearchResultsFormatter;
-use BookStack\Search\SearchRunner;
+use BookStack\Entities\Tools\SearchOptions;
+use BookStack\Entities\Tools\SearchResultsFormatter;
+use BookStack\Entities\Tools\SearchRunner;
 use Illuminate\Http\Request;
 
 class SearchApiController extends ApiController
 {
-    protected SearchRunner $searchRunner;
-    protected SearchResultsFormatter $resultsFormatter;
+    protected $searchRunner;
+    protected $resultsFormatter;
 
     protected $rules = [
         'all' => [
@@ -51,17 +50,24 @@ class SearchApiController extends ApiController
         $results = $this->searchRunner->searchEntities($options, 'all', $page, $count);
         $this->resultsFormatter->format($results['results']->all(), $options);
 
-        $data = (new ApiEntityListFormatter($results['results']->all()))
-            ->withType()->withTags()
-            ->withField('preview_html', function (Entity $entity) {
-                return [
-                    'name'    => (string) $entity->getAttribute('preview_name'),
-                    'content' => (string) $entity->getAttribute('preview_content'),
-                ];
-            })->format();
+        /** @var Entity $result */
+        foreach ($results['results'] as $result) {
+            $result->setVisible([
+                'id', 'name', 'slug', 'book_id',
+                'chapter_id', 'draft', 'template',
+                'created_at', 'updated_at',
+                'tags', 'type', 'preview_html', 'url',
+            ]);
+            $result->setAttribute('type', $result->getType());
+            $result->setAttribute('url', $result->getUrl());
+            $result->setAttribute('preview_html', [
+                'name'    => (string) $result->getAttribute('preview_name'),
+                'content' => (string) $result->getAttribute('preview_content'),
+            ]);
+        }
 
         return response()->json([
-            'data'  => $data,
+            'data'  => $results['results'],
             'total' => $results['total'],
         ]);
     }

app/Http/Controllers/AuditLogController.php

@@ -3,8 +3,6 @@
 namespace BookStack\Http\Controllers;
 
 use BookStack\Actions\Activity;
-use BookStack\Actions\ActivityType;
-use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
@@ -15,15 +13,10 @@ class AuditLogController extends Controller
         $this->checkPermission('settings-manage');
         $this->checkPermission('users-manage');
 
-        $sort = $request->get('sort', 'activity_date');
-        $order = $request->get('order', 'desc');
-        $listOptions = (new SimpleListOptions('', $sort, $order))->withSortOptions([
-            'created_at' => trans('settings.audit_table_date'),
-            'type' => trans('settings.audit_table_event'),
-        ]);
-
-        $filters = [
+        $listDetails = [
+            'order'     => $request->get('order', 'desc'),
             'event'     => $request->get('event', ''),
+            'sort'      => $request->get('sort', 'created_at'),
             'date_from' => $request->get('date_from', ''),
             'date_to'   => $request->get('date_to', ''),
             'user'      => $request->get('user', ''),
@@ -32,38 +25,39 @@ class AuditLogController extends Controller
 
         $query = Activity::query()
             ->with([
-                'entity' => fn ($query) => $query->withTrashed(),
+                'entity' => function ($query) {
+                    $query->withTrashed();
+                },
                 'user',
             ])
-            ->orderBy($listOptions->getSort(), $listOptions->getOrder());
+            ->orderBy($listDetails['sort'], $listDetails['order']);
 
-        if ($filters['event']) {
-            $query->where('type', '=', $filters['event']);
+        if ($listDetails['event']) {
+            $query->where('type', '=', $listDetails['event']);
         }
-        if ($filters['user']) {
-            $query->where('user_id', '=', $filters['user']);
+        if ($listDetails['user']) {
+            $query->where('user_id', '=', $listDetails['user']);
         }
 
-        if ($filters['date_from']) {
-            $query->where('created_at', '>=', $filters['date_from']);
+        if ($listDetails['date_from']) {
+            $query->where('created_at', '>=', $listDetails['date_from']);
         }
-        if ($filters['date_to']) {
-            $query->where('created_at', '<=', $filters['date_to']);
+        if ($listDetails['date_to']) {
+            $query->where('created_at', '<=', $listDetails['date_to']);
         }
-        if ($filters['ip']) {
-            $query->where('ip', 'like', $filters['ip'] . '%');
+        if ($listDetails['ip']) {
+            $query->where('ip', 'like', $listDetails['ip'] . '%');
         }
 
         $activities = $query->paginate(100);
-        $activities->appends($request->all());
+        $activities->appends($listDetails);
 
-        $types = ActivityType::all();
+        $types = DB::table('activities')->select('type')->distinct()->pluck('type');
         $this->setPageTitle(trans('settings.audit'));
 
         return view('settings.audit', [
             'activities'    => $activities,
-            'filters'       => $filters,
-            'listOptions'   => $listOptions,
+            'listDetails'   => $listDetails,
             'activityTypes' => $types,
         ]);
     }

app/Http/Controllers/Auth/ConfirmEmailController.php

@@ -14,9 +14,9 @@ use Illuminate\Http\Request;
 
 class ConfirmEmailController extends Controller
 {
-    protected EmailConfirmationService $emailConfirmationService;
-    protected LoginService $loginService;
-    protected UserRepo $userRepo;
+    protected $emailConfirmationService;
+    protected $loginService;
+    protected $userRepo;
 
     /**
      * Create a new controller instance.
@@ -51,28 +51,14 @@ class ConfirmEmailController extends Controller
         return view('auth.user-unconfirmed', ['user' => $user]);
     }
 
-    /**
-     * Show the form for a user to provide their positive confirmation of their email.
-     */
-    public function showAcceptForm(string $token)
-    {
-        return view('auth.register-confirm-accept', ['token' => $token]);
-    }
-
     /**
      * Confirms an email via a token and logs the user into the system.
      *
      * @throws ConfirmationEmailException
      * @throws Exception
      */
-    public function confirm(Request $request)
+    public function confirm(string $token)
     {
-        $validated = $this->validate($request, [
-            'token' => ['required', 'string']
-        ]);
-
-        $token = $validated['token'];
-
         try {
             $userId = $this->emailConfirmationService->checkTokenAndGetUserId($token);
         } catch (UserTokenNotFoundException $exception) {

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -4,11 +4,25 @@ namespace BookStack\Http\Controllers\Auth;
 
 use BookStack\Actions\ActivityType;
 use BookStack\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Password;
 
 class ForgotPasswordController extends Controller
 {
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset emails and
+    | includes a trait which assists in sending these notifications from
+    | your application to your users. Feel free to explore this trait.
+    |
+    */
+
+    use SendsPasswordResetEmails;
+
     /**
      * Create a new controller instance.
      *
@@ -20,14 +34,6 @@ class ForgotPasswordController extends Controller
         $this->middleware('guard:standard');
     }
 
-    /**
-     * Display the form to request a password reset link.
-     */
-    public function showLinkRequestForm()
-    {
-        return view('auth.passwords.email');
-    }
-
     /**
      * Send a reset link to the given user.
      *
@@ -44,7 +50,7 @@ class ForgotPasswordController extends Controller
         // We will send the password reset link to this user. Once we have attempted
         // to send the link, we will examine the response then see the message we
         // need to show to the user. Finally, we'll send out a proper response.
-        $response = Password::broker()->sendResetLink(
+        $response = $this->broker()->sendResetLink(
             $request->only('email')
         );
 

app/Http/Controllers/Auth/LoginController.php

@@ -8,14 +8,30 @@ use BookStack\Exceptions\LoginAttemptEmailNeededException;
 use BookStack\Exceptions\LoginAttemptException;
 use BookStack\Facades\Activity;
 use BookStack\Http\Controllers\Controller;
-use Illuminate\Http\RedirectResponse;
+use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Validation\ValidationException;
 
 class LoginController extends Controller
 {
-    use ThrottlesLogins;
+    /*
+    |--------------------------------------------------------------------------
+    | Login Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller handles authenticating users for the application and
+    | redirecting them to your home screen. The controller uses a trait
+    | to conveniently provide its functionality to your applications.
+    |
+    */
+
+    use AuthenticatesUsers { logout as traitLogout; }
+
+    /**
+     * Redirection paths.
+     */
+    protected $redirectTo = '/';
+    protected $redirectPath = '/';
 
     protected SocialAuthService $socialAuthService;
     protected LoginService $loginService;
@@ -31,6 +47,21 @@ class LoginController extends Controller
 
         $this->socialAuthService = $socialAuthService;
         $this->loginService = $loginService;
+
+        $this->redirectPath = url('/');
+    }
+
+    public function username()
+    {
+        return config('auth.method') === 'standard' ? 'email' : 'username';
+    }
+
+    /**
+     * Get the needed authorization credentials from the request.
+     */
+    protected function credentials(Request $request)
+    {
+        return $request->only('username', 'email', 'password');
     }
 
     /**
@@ -66,15 +97,27 @@ class LoginController extends Controller
 
     /**
      * Handle a login request to the application.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @throws \Illuminate\Validation\ValidationException
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response|\Illuminate\Http\JsonResponse
      */
     public function login(Request $request)
     {
         $this->validateLogin($request);
         $username = $request->get($this->username());
 
-        // Check login throttling attempts to see if they've gone over the limit
-        if ($this->hasTooManyLoginAttempts($request)) {
+        // If the class is using the ThrottlesLogins trait, we can automatically throttle
+        // the login attempts for this application. We'll key this by the username and
+        // the IP address of the client making these requests into this application.
+        if (method_exists($this, 'hasTooManyLoginAttempts') &&
+            $this->hasTooManyLoginAttempts($request)) {
+            $this->fireLockoutEvent($request);
+
             Activity::logFailedLogin($username);
+
             return $this->sendLockoutResponse($request);
         }
 
@@ -88,62 +131,24 @@ class LoginController extends Controller
             return $this->sendLoginAttemptExceptionResponse($exception, $request);
         }
 
-        // On unsuccessful login attempt, Increment login attempts for throttling and log failed login.
+        // If the login attempt was unsuccessful we will increment the number of attempts
+        // to login and redirect the user back to the login form. Of course, when this
+        // user surpasses their maximum number of attempts they will get locked out.
         $this->incrementLoginAttempts($request);
+
         Activity::logFailedLogin($username);
 
-        // Throw validation failure for failed login
-        throw ValidationException::withMessages([
-            $this->username() => [trans('auth.failed')],
-        ])->redirectTo('/login');
-    }
-
-    /**
-     * Logout user and perform subsequent redirect.
-     */
-    public function logout(Request $request)
-    {
-        Auth::guard()->logout();
-        $request->session()->invalidate();
-        $request->session()->regenerateToken();
-
-        $redirectUri = $this->shouldAutoInitiate() ? '/login?prevent_auto_init=true' : '/';
-
-        return redirect($redirectUri);
-    }
-
-    /**
-     * Get the expected username input based upon the current auth method.
-     */
-    protected function username(): string
-    {
-        return config('auth.method') === 'standard' ? 'email' : 'username';
-    }
-
-    /**
-     * Get the needed authorization credentials from the request.
-     */
-    protected function credentials(Request $request): array
-    {
-        return $request->only('username', 'email', 'password');
-    }
-
-    /**
-     * Send the response after the user was authenticated.
-     * @return RedirectResponse
-     */
-    protected function sendLoginResponse(Request $request)
-    {
-        $request->session()->regenerate();
-        $this->clearLoginAttempts($request);
-
-        return redirect()->intended('/');
+        return $this->sendFailedLoginResponse($request);
     }
 
     /**
      * Attempt to log the user into the application.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return bool
      */
-    protected function attemptLogin(Request $request): bool
+    protected function attemptLogin(Request $request)
     {
         return $this->loginService->attempt(
             $this->credentials($request),
@@ -152,12 +157,29 @@ class LoginController extends Controller
         );
     }
 
+    /**
+     * The user has been authenticated.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param mixed                    $user
+     *
+     * @return mixed
+     */
+    protected function authenticated(Request $request, $user)
+    {
+        return redirect()->intended($this->redirectPath());
+    }
 
     /**
      * Validate the user login request.
-     * @throws ValidationException
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @throws \Illuminate\Validation\ValidationException
+     *
+     * @return void
      */
-    protected function validateLogin(Request $request): void
+    protected function validateLogin(Request $request)
     {
         $rules = ['password' => ['required', 'string']];
         $authMethod = config('auth.method');
@@ -191,6 +213,22 @@ class LoginController extends Controller
         return redirect('/login');
     }
 
+    /**
+     * Get the failed login response instance.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @throws \Illuminate\Validation\ValidationException
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    protected function sendFailedLoginResponse(Request $request)
+    {
+        throw ValidationException::withMessages([
+            $this->username() => [trans('auth.failed')],
+        ])->redirectTo('/login');
+    }
+
     /**
      * Update the intended URL location from their previous URL.
      * Ignores if not from the current app instance or if from certain
@@ -230,4 +268,20 @@ class LoginController extends Controller
 
         return $autoRedirect && count($socialDrivers) === 0 && in_array($authMethod, ['oidc', 'saml2']);
     }
+
+    /**
+     * Logout user and perform subsequent redirect.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return mixed
+     */
+    public function logout(Request $request)
+    {
+        $this->traitLogout($request);
+
+        $redirectUri = $this->shouldAutoInitiate() ? '/login?prevent_auto_init=true' : '/';
+
+        return redirect($redirectUri);
+    }
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -5,20 +5,43 @@ namespace BookStack\Http\Controllers\Auth;
 use BookStack\Auth\Access\LoginService;
 use BookStack\Auth\Access\RegistrationService;
 use BookStack\Auth\Access\SocialAuthService;
+use BookStack\Auth\User;
 use BookStack\Exceptions\StoppedAuthenticationException;
 use BookStack\Exceptions\UserRegistrationException;
 use BookStack\Http\Controllers\Controller;
-use Illuminate\Contracts\Validation\Validator as ValidatorContract;
+use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rules\Password;
 
 class RegisterController extends Controller
 {
+    /*
+    |--------------------------------------------------------------------------
+    | Register Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller handles the registration of new users as well as their
+    | validation and creation. By default this controller uses a trait to
+    | provide this functionality without requiring any additional code.
+    |
+    */
+
+    use RegistersUsers;
+
     protected SocialAuthService $socialAuthService;
     protected RegistrationService $registrationService;
     protected LoginService $loginService;
 
+    /**
+     * Where to redirect users after login / registration.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/';
+    protected $redirectPath = '/';
+
     /**
      * Create a new controller instance.
      */
@@ -33,6 +56,23 @@ class RegisterController extends Controller
         $this->socialAuthService = $socialAuthService;
         $this->registrationService = $registrationService;
         $this->loginService = $loginService;
+
+        $this->redirectTo = url('/');
+        $this->redirectPath = url('/');
+    }
+
+    /**
+     * Get a validator for an incoming registration request.
+     *
+     * @return \Illuminate\Contracts\Validation\Validator
+     */
+    protected function validator(array $data)
+    {
+        return Validator::make($data, [
+            'name'     => ['required', 'min:2', 'max:100'],
+            'email'    => ['required', 'email', 'max:255', 'unique:users'],
+            'password' => ['required', Password::default()],
+        ]);
     }
 
     /**
@@ -75,18 +115,22 @@ class RegisterController extends Controller
 
         $this->showSuccessNotification(trans('auth.register_success'));
 
-        return redirect('/');
+        return redirect($this->redirectPath());
     }
 
     /**
-     * Get a validator for an incoming registration request.
+     * Create a new user instance after a valid registration.
+     *
+     * @param array $data
+     *
+     * @return User
      */
-    protected function validator(array $data): ValidatorContract
+    protected function create(array $data)
     {
-        return Validator::make($data, [
-            'name'     => ['required', 'min:2', 'max:100'],
-            'email'    => ['required', 'email', 'max:255', 'unique:users'],
-            'password' => ['required', Password::default()],
+        return User::create([
+            'name'     => $data['name'],
+            'email'    => $data['email'],
+            'password' => Hash::make($data['password']),
         ]);
     }
 }

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -3,87 +3,66 @@
 namespace BookStack\Http\Controllers\Auth;
 
 use BookStack\Actions\ActivityType;
-use BookStack\Auth\Access\LoginService;
-use BookStack\Auth\User;
 use BookStack\Http\Controllers\Controller;
-use Illuminate\Http\RedirectResponse;
+use Illuminate\Foundation\Auth\ResetsPasswords;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Password;
-use Illuminate\Support\Str;
-use Illuminate\Validation\Rules\Password as PasswordRule;
 
 class ResetPasswordController extends Controller
 {
-    protected LoginService $loginService;
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset requests
+    | and uses a simple trait to include this behavior. You're free to
+    | explore this trait and override any methods you wish to tweak.
+    |
+    */
 
-    public function __construct(LoginService $loginService)
+    use ResetsPasswords;
+
+    protected $redirectTo = '/';
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
     {
         $this->middleware('guest');
         $this->middleware('guard:standard');
-
-        $this->loginService = $loginService;
-    }
-
-    /**
-     * Display the password reset view for the given token.
-     * If no token is present, display the link request form.
-     */
-    public function showResetForm(Request $request)
-    {
-        $token = $request->route()->parameter('token');
-
-        return view('auth.passwords.reset')->with(
-            ['token' => $token, 'email' => $request->email]
-        );
-    }
-
-    /**
-     * Reset the given user's password.
-     */
-    public function reset(Request $request)
-    {
-        $request->validate([
-            'token' => 'required',
-            'email' => 'required|email',
-            'password' => ['required', 'confirmed', PasswordRule::defaults()],
-        ]);
-
-        // Here we will attempt to reset the user's password. If it is successful we
-        // will update the password on an actual user model and persist it to the
-        // database. Otherwise we will parse the error and return the response.
-        $credentials = $request->only('email', 'password', 'password_confirmation', 'token');
-        $response = Password::broker()->reset($credentials, function (User $user, string $password) {
-            $user->password = Hash::make($password);
-            $user->setRememberToken(Str::random(60));
-            $user->save();
-
-            $this->loginService->login($user, auth()->getDefaultDriver());
-        });
-
-        // If the password was successfully reset, we will redirect the user back to
-        // the application's home authenticated view. If there is an error we can
-        // redirect them back to where they came from with their error message.
-        return $response === Password::PASSWORD_RESET
-            ? $this->sendResetResponse()
-            : $this->sendResetFailedResponse($request, $response);
     }
 
     /**
      * Get the response for a successful password reset.
+     *
+     * @param Request $request
+     * @param string  $response
+     *
+     * @return \Illuminate\Http\Response
      */
-    protected function sendResetResponse(): RedirectResponse
+    protected function sendResetResponse(Request $request, $response)
     {
-        $this->showSuccessNotification(trans('auth.reset_password_success'));
+        $message = trans('auth.reset_password_success');
+        $this->showSuccessNotification($message);
         $this->logActivity(ActivityType::AUTH_PASSWORD_RESET_UPDATE, user());
 
-        return redirect('/');
+        return redirect($this->redirectPath())
+            ->with('status', trans($response));
     }
 
     /**
      * Get the response for a failed password reset.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param string                   $response
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
      */
-    protected function sendResetFailedResponse(Request $request, string $response): RedirectResponse
+    protected function sendResetFailedResponse(Request $request, $response)
     {
         // We show invalid users as invalid tokens as to not leak what
         // users may exist in the system.

app/Http/Controllers/Auth/Saml2Controller.php

@@ -9,7 +9,7 @@ use Illuminate\Support\Str;
 
 class Saml2Controller extends Controller
 {
-    protected Saml2Service $samlService;
+    protected $samlService;
 
     /**
      * Saml2Controller constructor.

app/Http/Controllers/Auth/SocialController.php

@@ -16,9 +16,9 @@ use Laravel\Socialite\Contracts\User as SocialUser;
 
 class SocialController extends Controller
 {
-    protected SocialAuthService $socialAuthService;
-    protected RegistrationService $registrationService;
-    protected LoginService $loginService;
+    protected $socialAuthService;
+    protected $registrationService;
+    protected $loginService;
 
     /**
      * SocialController constructor.
@@ -28,7 +28,7 @@ class SocialController extends Controller
         RegistrationService $registrationService,
         LoginService $loginService
     ) {
-        $this->middleware('guest')->only(['register']);
+        $this->middleware('guest')->only(['getRegister', 'postRegister']);
         $this->socialAuthService = $socialAuthService;
         $this->registrationService = $registrationService;
         $this->loginService = $loginService;

app/Http/Controllers/Auth/ThrottlesLogins.php

@@ -1,92 +0,0 @@
-<?php
-
-namespace BookStack\Http\Controllers\Auth;
-
-use Illuminate\Cache\RateLimiter;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Illuminate\Support\Str;
-use Illuminate\Validation\ValidationException;
-
-trait ThrottlesLogins
-{
-    /**
-     * Determine if the user has too many failed login attempts.
-     */
-    protected function hasTooManyLoginAttempts(Request $request): bool
-    {
-        return $this->limiter()->tooManyAttempts(
-            $this->throttleKey($request),
-            $this->maxAttempts()
-        );
-    }
-
-    /**
-     * Increment the login attempts for the user.
-     */
-    protected function incrementLoginAttempts(Request $request): void
-    {
-        $this->limiter()->hit(
-            $this->throttleKey($request),
-            $this->decayMinutes() * 60
-        );
-    }
-
-    /**
-     * Redirect the user after determining they are locked out.
-     * @throws ValidationException
-     */
-    protected function sendLockoutResponse(Request $request): \Symfony\Component\HttpFoundation\Response
-    {
-        $seconds = $this->limiter()->availableIn(
-            $this->throttleKey($request)
-        );
-
-        throw ValidationException::withMessages([
-            $this->username() => [trans('auth.throttle', [
-                'seconds' => $seconds,
-                'minutes' => ceil($seconds / 60),
-            ])],
-        ])->status(Response::HTTP_TOO_MANY_REQUESTS);
-    }
-
-    /**
-     * Clear the login locks for the given user credentials.
-     */
-    protected function clearLoginAttempts(Request $request): void
-    {
-        $this->limiter()->clear($this->throttleKey($request));
-    }
-
-    /**
-     * Get the throttle key for the given request.
-     */
-    protected function throttleKey(Request $request): string
-    {
-        return Str::transliterate(Str::lower($request->input($this->username())) . '|' . $request->ip());
-    }
-
-    /**
-     * Get the rate limiter instance.
-     */
-    protected function limiter(): RateLimiter
-    {
-        return app(RateLimiter::class);
-    }
-
-    /**
-     * Get the maximum number of attempts to allow.
-     */
-    public function maxAttempts(): int
-    {
-        return 5;
-    }
-
-    /**
-     * Get the number of minutes to throttle for.
-     */
-    public function decayMinutes(): int
-    {
-        return 1;
-    }
-}

app/Http/Controllers/Auth/UserInviteController.php

@@ -11,13 +11,12 @@ use Exception;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Validation\Rules\Password;
 
 class UserInviteController extends Controller
 {
-    protected UserInviteService $inviteService;
-    protected UserRepo $userRepo;
+    protected $inviteService;
+    protected $userRepo;
 
     /**
      * Create a new controller instance.
@@ -67,7 +66,7 @@ class UserInviteController extends Controller
         }
 
         $user = $this->userRepo->getById($userId);
-        $user->password = Hash::make($request->get('password'));
+        $user->password = bcrypt($request->get('password'));
         $user->email_confirmed = true;
         $user->save();
 

app/Http/Controllers/BookController.php

@@ -10,47 +10,41 @@ use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\Cloner;
 use BookStack\Entities\Tools\HierarchyTransformer;
+use BookStack\Entities\Tools\PermissionsUpdater;
 use BookStack\Entities\Tools\ShelfContext;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Facades\Activity;
-use BookStack\References\ReferenceFetcher;
-use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Throwable;
 
 class BookController extends Controller
 {
-    protected BookRepo $bookRepo;
-    protected ShelfContext $shelfContext;
-    protected ReferenceFetcher $referenceFetcher;
+    protected $bookRepo;
+    protected $entityContextManager;
 
-    public function __construct(ShelfContext $entityContextManager, BookRepo $bookRepo, ReferenceFetcher $referenceFetcher)
+    public function __construct(ShelfContext $entityContextManager, BookRepo $bookRepo)
     {
         $this->bookRepo = $bookRepo;
-        $this->shelfContext = $entityContextManager;
-        $this->referenceFetcher = $referenceFetcher;
+        $this->entityContextManager = $entityContextManager;
     }
 
     /**
      * Display a listing of the book.
      */
-    public function index(Request $request)
+    public function index()
     {
         $view = setting()->getForCurrentUser('books_view_type');
-        $listOptions = SimpleListOptions::fromRequest($request, 'books')->withSortOptions([
-            'name' => trans('common.sort_name'),
-            'created_at' => trans('common.sort_created_at'),
-            'updated_at' => trans('common.sort_updated_at'),
-        ]);
+        $sort = setting()->getForCurrentUser('books_sort', 'name');
+        $order = setting()->getForCurrentUser('books_sort_order', 'asc');
 
-        $books = $this->bookRepo->getAllPaginated(18, $listOptions->getSort(), $listOptions->getOrder());
+        $books = $this->bookRepo->getAllPaginated(18, $sort, $order);
         $recents = $this->isSignedIn() ? $this->bookRepo->getRecentlyViewed(4) : false;
         $popular = $this->bookRepo->getPopular(4);
         $new = $this->bookRepo->getRecentlyCreated(4);
 
-        $this->shelfContext->clearShelfContext();
+        $this->entityContextManager->clearShelfContext();
 
         $this->setPageTitle(trans('entities.books'));
 
@@ -60,7 +54,8 @@ class BookController extends Controller
             'popular' => $popular,
             'new'     => $new,
             'view'    => $view,
-            'listOptions' => $listOptions,
+            'sort'    => $sort,
+            'order'   => $order,
         ]);
     }
 
@@ -127,7 +122,7 @@ class BookController extends Controller
 
         View::incrementFor($book);
         if ($request->has('shelf')) {
-            $this->shelfContext->setShelfContext(intval($request->get('shelf')));
+            $this->entityContextManager->setShelfContext(intval($request->get('shelf')));
         }
 
         $this->setPageTitle($book->getShortName());
@@ -138,7 +133,6 @@ class BookController extends Controller
             'bookChildren'      => $bookChildren,
             'bookParentShelves' => $bookParentShelves,
             'activity'          => $activities->entityActivity($book, 20, 1),
-            'referenceCount'    => $this->referenceFetcher->getPageReferenceCountToEntity($book),
         ]);
     }
 
@@ -149,7 +143,7 @@ class BookController extends Controller
     {
         $book = $this->bookRepo->getBySlug($slug);
         $this->checkOwnablePermission('book-update', $book);
-        $this->setPageTitle(trans('entities.books_edit_named', ['bookName' => $book->getShortName()]));
+        $this->setPageTitle(trans('entities.books_edit_named', ['bookName'=>$book->getShortName()]));
 
         return view('books.edit', ['book' => $book, 'current' => $book]);
     }
@@ -211,6 +205,36 @@ class BookController extends Controller
         return redirect('/books');
     }
 
+    /**
+     * Show the permissions view.
+     */
+    public function showPermissions(string $bookSlug)
+    {
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $this->checkOwnablePermission('restrictions-manage', $book);
+
+        return view('books.permissions', [
+            'book' => $book,
+        ]);
+    }
+
+    /**
+     * Set the restrictions for this book.
+     *
+     * @throws Throwable
+     */
+    public function permissions(Request $request, PermissionsUpdater $permissionsUpdater, string $bookSlug)
+    {
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $this->checkOwnablePermission('restrictions-manage', $book);
+
+        $permissionsUpdater->updateFromPermissionsForm($book, $request);
+
+        $this->showSuccessNotification(trans('entities.books_permissions_updated'));
+
+        return redirect($book->getUrl());
+    }
+
     /**
      * Show the view to copy a book.
      *

app/Http/Controllers/BookSortController.php

@@ -28,7 +28,7 @@ class BookSortController extends Controller
 
         $bookChildren = (new BookContents($book))->getTree(false);
 
-        $this->setPageTitle(trans('entities.books_sort_named', ['bookName' => $book->getShortName()]));
+        $this->setPageTitle(trans('entities.books_sort_named', ['bookName'=>$book->getShortName()]));
 
         return view('books.sort', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);
     }

app/Http/Controllers/BookshelfController.php

@@ -6,11 +6,10 @@ use BookStack\Actions\ActivityQueries;
 use BookStack\Actions\View;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Repos\BookshelfRepo;
+use BookStack\Entities\Tools\PermissionsUpdater;
 use BookStack\Entities\Tools\ShelfContext;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\NotFoundException;
-use BookStack\References\ReferenceFetcher;
-use BookStack\Util\SimpleListOptions;
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
@@ -19,28 +18,28 @@ class BookshelfController extends Controller
 {
     protected BookshelfRepo $shelfRepo;
     protected ShelfContext $shelfContext;
-    protected ReferenceFetcher $referenceFetcher;
 
-    public function __construct(BookshelfRepo $shelfRepo, ShelfContext $shelfContext, ReferenceFetcher $referenceFetcher)
+    public function __construct(BookshelfRepo $shelfRepo, ShelfContext $shelfContext)
     {
         $this->shelfRepo = $shelfRepo;
         $this->shelfContext = $shelfContext;
-        $this->referenceFetcher = $referenceFetcher;
     }
 
     /**
      * Display a listing of the book.
      */
-    public function index(Request $request)
+    public function index()
     {
         $view = setting()->getForCurrentUser('bookshelves_view_type');
-        $listOptions = SimpleListOptions::fromRequest($request, 'bookshelves')->withSortOptions([
+        $sort = setting()->getForCurrentUser('bookshelves_sort', 'name');
+        $order = setting()->getForCurrentUser('bookshelves_sort_order', 'asc');
+        $sortOptions = [
             'name'       => trans('common.sort_name'),
             'created_at' => trans('common.sort_created_at'),
             'updated_at' => trans('common.sort_updated_at'),
-        ]);
+        ];
 
-        $shelves = $this->shelfRepo->getAllPaginated(18, $listOptions->getSort(), $listOptions->getOrder());
+        $shelves = $this->shelfRepo->getAllPaginated(18, $sort, $order);
         $recents = $this->isSignedIn() ? $this->shelfRepo->getRecentlyViewed(4) : false;
         $popular = $this->shelfRepo->getPopular(4);
         $new = $this->shelfRepo->getRecentlyCreated(4);
@@ -54,7 +53,9 @@ class BookshelfController extends Controller
             'popular'     => $popular,
             'new'         => $new,
             'view'        => $view,
-            'listOptions' => $listOptions,
+            'sort'        => $sort,
+            'order'       => $order,
+            'sortOptions' => $sortOptions,
         ]);
     }
 
@@ -97,21 +98,16 @@ class BookshelfController extends Controller
      *
      * @throws NotFoundException
      */
-    public function show(Request $request, ActivityQueries $activities, string $slug)
+    public function show(ActivityQueries $activities, string $slug)
     {
         $shelf = $this->shelfRepo->getBySlug($slug);
         $this->checkOwnablePermission('bookshelf-view', $shelf);
 
-        $listOptions = SimpleListOptions::fromRequest($request, 'shelf_books')->withSortOptions([
-            'default' => trans('common.sort_default'),
-            'name' => trans('common.sort_name'),
-            'created_at' => trans('common.sort_created_at'),
-            'updated_at' => trans('common.sort_updated_at'),
-        ]);
+        $sort = setting()->getForCurrentUser('shelf_books_sort', 'default');
+        $order = setting()->getForCurrentUser('shelf_books_sort_order', 'asc');
 
-        $sort = $listOptions->getSort();
         $sortedVisibleShelfBooks = $shelf->visibleBooks()->get()
-            ->sortBy($sort === 'default' ? 'pivot.order' : $sort, SORT_REGULAR, $listOptions->getOrder() === 'desc')
+            ->sortBy($sort === 'default' ? 'pivot.order' : $sort, SORT_REGULAR, $order === 'desc')
             ->values()
             ->all();
 
@@ -126,8 +122,8 @@ class BookshelfController extends Controller
             'sortedVisibleShelfBooks' => $sortedVisibleShelfBooks,
             'view'                    => $view,
             'activity'                => $activities->entityActivity($shelf, 20, 1),
-            'listOptions'             => $listOptions,
-            'referenceCount'          => $this->referenceFetcher->getPageReferenceCountToEntity($shelf),
+            'order'                   => $order,
+            'sort'                    => $sort,
         ]);
     }
 
@@ -207,4 +203,46 @@ class BookshelfController extends Controller
 
         return redirect('/shelves');
     }
+
+    /**
+     * Show the permissions view.
+     */
+    public function showPermissions(string $slug)
+    {
+        $shelf = $this->shelfRepo->getBySlug($slug);
+        $this->checkOwnablePermission('restrictions-manage', $shelf);
+
+        return view('shelves.permissions', [
+            'shelf' => $shelf,
+        ]);
+    }
+
+    /**
+     * Set the permissions for this bookshelf.
+     */
+    public function permissions(Request $request, PermissionsUpdater $permissionsUpdater, string $slug)
+    {
+        $shelf = $this->shelfRepo->getBySlug($slug);
+        $this->checkOwnablePermission('restrictions-manage', $shelf);
+
+        $permissionsUpdater->updateFromPermissionsForm($shelf, $request);
+
+        $this->showSuccessNotification(trans('entities.shelves_permissions_updated'));
+
+        return redirect($shelf->getUrl());
+    }
+
+    /**
+     * Copy the permissions of a bookshelf to the child books.
+     */
+    public function copyPermissions(string $slug)
+    {
+        $shelf = $this->shelfRepo->getBySlug($slug);
+        $this->checkOwnablePermission('restrictions-manage', $shelf);
+
+        $updateCount = $this->shelfRepo->copyDownPermissions($shelf);
+        $this->showSuccessNotification(trans('entities.shelves_copy_permission_success', ['count' => $updateCount]));
+
+        return redirect($shelf->getUrl());
+    }
 }

app/Http/Controllers/ChapterController.php

@@ -9,23 +9,24 @@ use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\Cloner;
 use BookStack\Entities\Tools\HierarchyTransformer;
 use BookStack\Entities\Tools\NextPreviousContentLocator;
+use BookStack\Entities\Tools\PermissionsUpdater;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\PermissionsException;
-use BookStack\References\ReferenceFetcher;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Throwable;
 
 class ChapterController extends Controller
 {
-    protected ChapterRepo $chapterRepo;
-    protected ReferenceFetcher $referenceFetcher;
+    protected $chapterRepo;
 
-    public function __construct(ChapterRepo $chapterRepo, ReferenceFetcher $referenceFetcher)
+    /**
+     * ChapterController constructor.
+     */
+    public function __construct(ChapterRepo $chapterRepo)
     {
         $this->chapterRepo = $chapterRepo;
-        $this->referenceFetcher = $referenceFetcher;
     }
 
     /**
@@ -76,14 +77,13 @@ class ChapterController extends Controller
         $this->setPageTitle($chapter->getShortName());
 
         return view('chapters.show', [
-            'book'           => $chapter->book,
-            'chapter'        => $chapter,
-            'current'        => $chapter,
-            'sidebarTree'    => $sidebarTree,
-            'pages'          => $pages,
-            'next'           => $nextPreviousLocator->getNext(),
-            'previous'       => $nextPreviousLocator->getPrevious(),
-            'referenceCount' => $this->referenceFetcher->getPageReferenceCountToEntity($chapter),
+            'book'        => $chapter->book,
+            'chapter'     => $chapter,
+            'current'     => $chapter,
+            'sidebarTree' => $sidebarTree,
+            'pages'       => $pages,
+            'next'        => $nextPreviousLocator->getNext(),
+            'previous'    => $nextPreviousLocator->getPrevious(),
         ]);
     }
 
@@ -242,6 +242,38 @@ class ChapterController extends Controller
         return redirect($chapterCopy->getUrl());
     }
 
+    /**
+     * Show the Restrictions view.
+     *
+     * @throws NotFoundException
+     */
+    public function showPermissions(string $bookSlug, string $chapterSlug)
+    {
+        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
+        $this->checkOwnablePermission('restrictions-manage', $chapter);
+
+        return view('chapters.permissions', [
+            'chapter' => $chapter,
+        ]);
+    }
+
+    /**
+     * Set the restrictions for this chapter.
+     *
+     * @throws NotFoundException
+     */
+    public function permissions(Request $request, PermissionsUpdater $permissionsUpdater, string $bookSlug, string $chapterSlug)
+    {
+        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
+        $this->checkOwnablePermission('restrictions-manage', $chapter);
+
+        $permissionsUpdater->updateFromPermissionsForm($chapter, $request);
+
+        $this->showSuccessNotification(trans('entities.chapters_permissions_success'));
+
+        return redirect($chapter->getUrl());
+    }
+
     /**
      * Convert the chapter to a book.
      */

app/Http/Controllers/FavouriteController.php

@@ -87,7 +87,7 @@ class FavouriteController extends Controller
 
         $modelInstance = $model->newQuery()
             ->where('id', '=', $modelInfo['id'])
-            ->first(['id', 'name', 'owned_by']);
+            ->first(['id', 'name']);
 
         $inaccessibleEntity = ($modelInstance instanceof Entity && !userCan('view', $modelInstance));
         if (is_null($modelInstance) || $inaccessibleEntity) {

app/Http/Controllers/HomeController.php

@@ -10,15 +10,13 @@ use BookStack\Entities\Queries\TopFavourites;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\BookshelfRepo;
 use BookStack\Entities\Tools\PageContent;
-use BookStack\Util\SimpleListOptions;
-use Illuminate\Http\Request;
 
 class HomeController extends Controller
 {
     /**
      * Display the homepage.
      */
-    public function index(Request $request, ActivityQueries $activities)
+    public function index(ActivityQueries $activities)
     {
         $activity = $activities->latest(10);
         $draftPages = [];
@@ -63,27 +61,33 @@ class HomeController extends Controller
         if ($homepageOption === 'bookshelves' || $homepageOption === 'books') {
             $key = $homepageOption;
             $view = setting()->getForCurrentUser($key . '_view_type');
-            $listOptions = SimpleListOptions::fromRequest($request, $key)->withSortOptions([
-                'name' => trans('common.sort_name'),
+            $sort = setting()->getForCurrentUser($key . '_sort', 'name');
+            $order = setting()->getForCurrentUser($key . '_sort_order', 'asc');
+
+            $sortOptions = [
+                'name'       => trans('common.sort_name'),
                 'created_at' => trans('common.sort_created_at'),
                 'updated_at' => trans('common.sort_updated_at'),
-            ]);
+            ];
 
             $commonData = array_merge($commonData, [
                 'view'        => $view,
-                'listOptions' => $listOptions,
+                'sort'        => $sort,
+                'order'       => $order,
+                'sortOptions' => $sortOptions,
             ]);
         }
 
         if ($homepageOption === 'bookshelves') {
-            $shelves = app(BookshelfRepo::class)->getAllPaginated(18, $commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder());
+            $shelves = app(BookshelfRepo::class)->getAllPaginated(18, $commonData['sort'], $commonData['order']);
             $data = array_merge($commonData, ['shelves' => $shelves]);
 
             return view('home.shelves', $data);
         }
 
         if ($homepageOption === 'books') {
-            $books = app(BookRepo::class)->getAllPaginated(18, $commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder());
+            $bookRepo = app(BookRepo::class);
+            $books = $bookRepo->getAllPaginated(18, $commonData['sort'], $commonData['order']);
             $data = array_merge($commonData, ['books' => $books]);
 
             return view('home.books', $data);

app/Http/Controllers/Images/ImageController.php

@@ -14,9 +14,12 @@ use Illuminate\Validation\ValidationException;
 
 class ImageController extends Controller
 {
-    protected ImageRepo $imageRepo;
-    protected ImageService $imageService;
+    protected $imageRepo;
+    protected $imageService;
 
+    /**
+     * ImageController constructor.
+     */
     public function __construct(ImageRepo $imageRepo, ImageService $imageService)
     {
         $this->imageRepo = $imageRepo;
@@ -30,7 +33,7 @@ class ImageController extends Controller
      */
     public function showImage(string $path)
     {
-        if (!$this->imageService->pathAccessibleInLocalSecure($path)) {
+        if (!$this->imageService->pathExistsInLocalSecure($path)) {
             throw (new NotFoundException(trans('errors.image_not_found')))
                 ->setSubtitle(trans('errors.image_not_found_subtitle'))
                 ->setDetails(trans('errors.image_not_found_details'));

app/Http/Controllers/MaintenanceController.php

@@ -5,7 +5,6 @@ namespace BookStack\Http\Controllers;
 use BookStack\Actions\ActivityType;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Notifications\TestEmail;
-use BookStack\References\ReferenceStore;
 use BookStack\Uploads\ImageService;
 use Illuminate\Http\Request;
 
@@ -75,24 +74,6 @@ class MaintenanceController extends Controller
             $this->showErrorNotification($errorMessage);
         }
 
-        return redirect('/settings/maintenance#image-cleanup');
-    }
-
-    /**
-     * Action to regenerate the reference index in the system.
-     */
-    public function regenerateReferences(ReferenceStore $referenceStore)
-    {
-        $this->checkPermission('settings-manage');
-        $this->logActivity(ActivityType::MAINTENANCE_ACTION_RUN, 'regenerate-references');
-
-        try {
-            $referenceStore->updateForAllPages();
-            $this->showSuccessNotification(trans('settings.maint_regen_references_success'));
-        } catch (\Exception $exception) {
-            $this->showErrorNotification($exception->getMessage());
-        }
-
-        return redirect('/settings/maintenance#regenerate-references');
+        return redirect('/settings/maintenance#image-cleanup')->withInput();
     }
 }

app/Http/Controllers/PageController.php

@@ -11,9 +11,9 @@ use BookStack\Entities\Tools\NextPreviousContentLocator;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Entities\Tools\PageEditActivity;
 use BookStack\Entities\Tools\PageEditorData;
+use BookStack\Entities\Tools\PermissionsUpdater;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\PermissionsException;
-use BookStack\References\ReferenceFetcher;
 use Exception;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Http\Request;
@@ -23,15 +23,13 @@ use Throwable;
 class PageController extends Controller
 {
     protected PageRepo $pageRepo;
-    protected ReferenceFetcher $referenceFetcher;
 
     /**
      * PageController constructor.
      */
-    public function __construct(PageRepo $pageRepo, ReferenceFetcher $referenceFetcher)
+    public function __construct(PageRepo $pageRepo)
     {
         $this->pageRepo = $pageRepo;
-        $this->referenceFetcher = $referenceFetcher;
     }
 
     /**
@@ -162,7 +160,6 @@ class PageController extends Controller
             'pageNav'         => $pageNav,
             'next'            => $nextPreviousLocator->getNext(),
             'previous'        => $nextPreviousLocator->getPrevious(),
-            'referenceCount'  => $this->referenceFetcher->getPageReferenceCountToEntity($page),
         ]);
     }
 
@@ -451,4 +448,37 @@ class PageController extends Controller
 
         return redirect($pageCopy->getUrl());
     }
+
+    /**
+     * Show the Permissions view.
+     *
+     * @throws NotFoundException
+     */
+    public function showPermissions(string $bookSlug, string $pageSlug)
+    {
+        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $this->checkOwnablePermission('restrictions-manage', $page);
+
+        return view('pages.permissions', [
+            'page' => $page,
+        ]);
+    }
+
+    /**
+     * Set the permissions for this page.
+     *
+     * @throws NotFoundException
+     * @throws Throwable
+     */
+    public function permissions(Request $request, PermissionsUpdater $permissionsUpdater, string $bookSlug, string $pageSlug)
+    {
+        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $this->checkOwnablePermission('restrictions-manage', $page);
+
+        $permissionsUpdater->updateFromPermissionsForm($page, $request);
+
+        $this->showSuccessNotification(trans('entities.pages_permissions_success'));
+
+        return redirect($page->getUrl());
+    }
 }

app/Http/Controllers/PageRevisionController.php

@@ -3,19 +3,19 @@
 namespace BookStack\Http\Controllers;
 
 use BookStack\Actions\ActivityType;
-use BookStack\Entities\Models\PageRevision;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Facades\Activity;
-use BookStack\Util\SimpleListOptions;
-use Illuminate\Http\Request;
 use Ssddanbrown\HtmlDiff\Diff;
 
 class PageRevisionController extends Controller
 {
-    protected PageRepo $pageRepo;
+    protected $pageRepo;
 
+    /**
+     * PageRevisionController constructor.
+     */
     public function __construct(PageRepo $pageRepo)
     {
         $this->pageRepo = $pageRepo;
@@ -26,29 +26,14 @@ class PageRevisionController extends Controller
      *
      * @throws NotFoundException
      */
-    public function index(Request $request, string $bookSlug, string $pageSlug)
+    public function index(string $bookSlug, string $pageSlug)
     {
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
-        $listOptions = SimpleListOptions::fromRequest($request, 'page_revisions', true)->withSortOptions([
-            'id' => trans('entities.pages_revisions_sort_number')
-        ]);
-
-        $revisions = $page->revisions()->select([
-                'id', 'page_id', 'name', 'created_at', 'created_by', 'updated_at',
-                'type', 'revision_number', 'summary',
-            ])
-            ->selectRaw("IF(markdown = '', false, true) as is_markdown")
-            ->with(['page.book', 'createdBy'])
-            ->reorder('id', $listOptions->getOrder())
-            ->reorder('created_at', $listOptions->getOrder())
-            ->paginate(50);
-
-        $this->setPageTitle(trans('entities.pages_revisions_named', ['pageName' => $page->getShortName()]));
+        $this->setPageTitle(trans('entities.pages_revisions_named', ['pageName'=>$page->getShortName()]));
 
         return view('pages.revisions', [
-            'revisions'   => $revisions,
-            'page'        => $page,
-            'listOptions' => $listOptions,
+            'page'    => $page,
+            'current' => $page,
         ]);
     }
 
@@ -60,7 +45,6 @@ class PageRevisionController extends Controller
     public function show(string $bookSlug, string $pageSlug, int $revisionId)
     {
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
-        /** @var ?PageRevision $revision */
         $revision = $page->revisions()->where('id', '=', $revisionId)->first();
         if ($revision === null) {
             throw new NotFoundException();
@@ -89,7 +73,6 @@ class PageRevisionController extends Controller
     public function changes(string $bookSlug, string $pageSlug, int $revisionId)
     {
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
-        /** @var ?PageRevision $revision */
         $revision = $page->revisions()->where('id', '=', $revisionId)->first();
         if ($revision === null) {
             throw new NotFoundException();
@@ -103,7 +86,7 @@ class PageRevisionController extends Controller
         // TODO - Refactor PageContent so we don't need to juggle this
         $page->html = $revision->html;
         $page->html = (new PageContent($page))->render();
-        $this->setPageTitle(trans('entities.pages_revision_named', ['pageName' => $page->getShortName()]));
+        $this->setPageTitle(trans('entities.pages_revision_named', ['pageName'=>$page->getShortName()]));
 
         return view('pages.revision', [
             'page'     => $page,

app/Http/Controllers/PermissionsController.php

@@ -1,200 +0,0 @@
-<?php
-
-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;
-use BookStack\Entities\Models\Page;
-use BookStack\Entities\Tools\PermissionsUpdater;
-use Illuminate\Http\Request;
-
-class PermissionsController extends Controller
-{
-    protected PermissionsUpdater $permissionsUpdater;
-
-    public function __construct(PermissionsUpdater $permissionsUpdater)
-    {
-        $this->permissionsUpdater = $permissionsUpdater;
-    }
-
-    /**
-     * Show the Permissions view for a page.
-     */
-    public function showForPage(string $bookSlug, string $pageSlug)
-    {
-        $page = Page::getBySlugs($bookSlug, $pageSlug);
-        $this->checkOwnablePermission('restrictions-manage', $page);
-
-        $this->setPageTitle(trans('entities.pages_permissions'));
-        return view('pages.permissions', [
-            'page' => $page,
-            'data' => new PermissionFormData($page),
-        ]);
-    }
-
-    /**
-     * Set the permissions for a page.
-     */
-    public function updateForPage(Request $request, string $bookSlug, string $pageSlug)
-    {
-        $page = Page::getBySlugs($bookSlug, $pageSlug);
-        $this->checkOwnablePermission('restrictions-manage', $page);
-
-        $this->permissionsUpdater->updateFromPermissionsForm($page, $request);
-
-        $this->showSuccessNotification(trans('entities.pages_permissions_success'));
-
-        return redirect($page->getUrl());
-    }
-
-    /**
-     * Show the Restrictions view for a chapter.
-     */
-    public function showForChapter(string $bookSlug, string $chapterSlug)
-    {
-        $chapter = Chapter::getBySlugs($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission('restrictions-manage', $chapter);
-
-        $this->setPageTitle(trans('entities.chapters_permissions'));
-        return view('chapters.permissions', [
-            'chapter' => $chapter,
-            'data' => new PermissionFormData($chapter),
-        ]);
-    }
-
-    /**
-     * Set the restrictions for a chapter.
-     */
-    public function updateForChapter(Request $request, string $bookSlug, string $chapterSlug)
-    {
-        $chapter = Chapter::getBySlugs($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission('restrictions-manage', $chapter);
-
-        $this->permissionsUpdater->updateFromPermissionsForm($chapter, $request);
-
-        $this->showSuccessNotification(trans('entities.chapters_permissions_success'));
-
-        return redirect($chapter->getUrl());
-    }
-
-    /**
-     * Show the permissions view for a book.
-     */
-    public function showForBook(string $slug)
-    {
-        $book = Book::getBySlug($slug);
-        $this->checkOwnablePermission('restrictions-manage', $book);
-
-        $this->setPageTitle(trans('entities.books_permissions'));
-        return view('books.permissions', [
-            'book' => $book,
-            'data' => new PermissionFormData($book),
-        ]);
-    }
-
-    /**
-     * Set the restrictions for a book.
-     */
-    public function updateForBook(Request $request, string $slug)
-    {
-        $book = Book::getBySlug($slug);
-        $this->checkOwnablePermission('restrictions-manage', $book);
-
-        $this->permissionsUpdater->updateFromPermissionsForm($book, $request);
-
-        $this->showSuccessNotification(trans('entities.books_permissions_updated'));
-
-        return redirect($book->getUrl());
-    }
-
-    /**
-     * Show the permissions view for a shelf.
-     */
-    public function showForShelf(string $slug)
-    {
-        $shelf = Bookshelf::getBySlug($slug);
-        $this->checkOwnablePermission('restrictions-manage', $shelf);
-
-        $this->setPageTitle(trans('entities.shelves_permissions'));
-        return view('shelves.permissions', [
-            'shelf' => $shelf,
-            'data' => new PermissionFormData($shelf),
-        ]);
-    }
-
-    /**
-     * Set the permissions for a shelf.
-     */
-    public function updateForShelf(Request $request, string $slug)
-    {
-        $shelf = Bookshelf::getBySlug($slug);
-        $this->checkOwnablePermission('restrictions-manage', $shelf);
-
-        $this->permissionsUpdater->updateFromPermissionsForm($shelf, $request);
-
-        $this->showSuccessNotification(trans('entities.shelves_permissions_updated'));
-
-        return redirect($shelf->getUrl());
-    }
-
-    /**
-     * Copy the permissions of a bookshelf to the child books.
-     */
-    public function copyShelfPermissionsToBooks(string $slug)
-    {
-        $shelf = Bookshelf::getBySlug($slug);
-        $this->checkOwnablePermission('restrictions-manage', $shelf);
-
-        $updateCount = $this->permissionsUpdater->updateBookPermissionsFromShelf($shelf);
-        $this->showSuccessNotification(trans('entities.shelves_copy_permission_success', ['count' => $updateCount]));
-
-        return redirect($shelf->getUrl());
-    }
-
-    /**
-     * Get an empty entity permissions form row for the given role.
-     */
-    public function formRowForRole(string $entityType, string $roleId)
-    {
-        $this->checkPermissionOr('restrictions-manage-all', fn() => userCan('restrictions-manage-own'));
-
-        /** @var Role $role */
-        $role = Role::query()->findOrFail($roleId);
-
-        return view('form.entity-permissions-row', [
-            '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/ReferenceController.php

@@ -1,75 +0,0 @@
-<?php
-
-namespace BookStack\Http\Controllers;
-
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Bookshelf;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Page;
-use BookStack\References\ReferenceFetcher;
-
-class ReferenceController extends Controller
-{
-    protected ReferenceFetcher $referenceFetcher;
-
-    public function __construct(ReferenceFetcher $referenceFetcher)
-    {
-        $this->referenceFetcher = $referenceFetcher;
-    }
-
-    /**
-     * Display the references to a given page.
-     */
-    public function page(string $bookSlug, string $pageSlug)
-    {
-        $page = Page::getBySlugs($bookSlug, $pageSlug);
-        $references = $this->referenceFetcher->getPageReferencesToEntity($page);
-
-        return view('pages.references', [
-            'page'       => $page,
-            'references' => $references,
-        ]);
-    }
-
-    /**
-     * Display the references to a given chapter.
-     */
-    public function chapter(string $bookSlug, string $chapterSlug)
-    {
-        $chapter = Chapter::getBySlugs($bookSlug, $chapterSlug);
-        $references = $this->referenceFetcher->getPageReferencesToEntity($chapter);
-
-        return view('chapters.references', [
-            'chapter'    => $chapter,
-            'references' => $references,
-        ]);
-    }
-
-    /**
-     * Display the references to a given book.
-     */
-    public function book(string $slug)
-    {
-        $book = Book::getBySlug($slug);
-        $references = $this->referenceFetcher->getPageReferencesToEntity($book);
-
-        return view('books.references', [
-            'book'       => $book,
-            'references' => $references,
-        ]);
-    }
-
-    /**
-     * Display the references to a given shelf.
-     */
-    public function shelf(string $slug)
-    {
-        $shelf = Bookshelf::getBySlug($slug);
-        $references = $this->referenceFetcher->getPageReferencesToEntity($shelf);
-
-        return view('shelves.references', [
-            'shelf'      => $shelf,
-            'references' => $references,
-        ]);
-    }
-}

app/Http/Controllers/RoleController.php

@@ -3,18 +3,19 @@
 namespace BookStack\Http\Controllers;
 
 use BookStack\Auth\Permissions\PermissionsRepo;
-use BookStack\Auth\Queries\RolesAllPaginatedAndSorted;
 use BookStack\Auth\Role;
 use BookStack\Exceptions\PermissionsException;
-use BookStack\Util\SimpleListOptions;
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 
 class RoleController extends Controller
 {
-    protected PermissionsRepo $permissionsRepo;
+    protected $permissionsRepo;
 
+    /**
+     * PermissionController constructor.
+     */
     public function __construct(PermissionsRepo $permissionsRepo)
     {
         $this->permissionsRepo = $permissionsRepo;
@@ -23,27 +24,14 @@ class RoleController extends Controller
     /**
      * Show a listing of the roles in the system.
      */
-    public function index(Request $request)
+    public function index()
     {
         $this->checkPermission('user-roles-manage');
-
-        $listOptions = SimpleListOptions::fromRequest($request, 'roles')->withSortOptions([
-            'display_name' => trans('common.sort_name'),
-            'users_count' => trans('settings.roles_assigned_users'),
-            'permissions_count' => trans('settings.roles_permissions_provided'),
-            'created_at' => trans('common.sort_created_at'),
-            'updated_at' => trans('common.sort_updated_at'),
-        ]);
-
-        $roles = (new RolesAllPaginatedAndSorted())->run(20, $listOptions);
-        $roles->appends($listOptions->getPaginationAppends());
+        $roles = $this->permissionsRepo->getAllRoles();
 
         $this->setPageTitle(trans('settings.roles'));
 
-        return view('settings.roles.index', [
-            'roles'       => $roles,
-            'listOptions' => $listOptions,
-        ]);
+        return view('settings.roles.index', ['roles' => $roles]);
     }
 
     /**
@@ -87,11 +75,16 @@ class RoleController extends Controller
 
     /**
      * Show the form for editing a user role.
+     *
+     * @throws PermissionsException
      */
     public function edit(string $id)
     {
         $this->checkPermission('user-roles-manage');
         $role = $this->permissionsRepo->getRoleById($id);
+        if ($role->hidden) {
+            throw new PermissionsException(trans('errors.role_cannot_be_edited'));
+        }
 
         $this->setPageTitle(trans('settings.role_edit'));
 

app/Http/Controllers/SearchController.php

@@ -3,15 +3,15 @@
 namespace BookStack\Http\Controllers;
 
 use BookStack\Entities\Queries\Popular;
+use BookStack\Entities\Tools\SearchOptions;
+use BookStack\Entities\Tools\SearchResultsFormatter;
+use BookStack\Entities\Tools\SearchRunner;
 use BookStack\Entities\Tools\SiblingFetcher;
-use BookStack\Search\SearchOptions;
-use BookStack\Search\SearchResultsFormatter;
-use BookStack\Search\SearchRunner;
 use Illuminate\Http\Request;
 
 class SearchController extends Controller
 {
-    protected SearchRunner $searchRunner;
+    protected $searchRunner;
 
     public function __construct(SearchRunner $searchRunner)
     {
@@ -69,7 +69,7 @@ class SearchController extends Controller
      * Search for a list of entities and return a partial HTML response of matching entities.
      * Returns the most popular entities if no search is provided.
      */
-    public function searchForSelector(Request $request)
+    public function searchEntitiesAjax(Request $request)
     {
         $entityTypes = $request->filled('types') ? explode(',', $request->get('types')) : ['page', 'chapter', 'book'];
         $searchTerm = $request->get('term', false);
@@ -83,25 +83,7 @@ class SearchController extends Controller
             $entities = (new Popular())->run(20, 0, $entityTypes);
         }
 
-        return view('search.parts.entity-selector-list', ['entities' => $entities, 'permission' => $permission]);
-    }
-
-    /**
-     * Search for a list of entities and return a partial HTML response of matching entities
-     * to be used as a result preview suggestion list for global system searches.
-     */
-    public function searchSuggestions(Request $request)
-    {
-        $searchTerm = $request->get('term', '');
-        $entities = $this->searchRunner->searchEntities(SearchOptions::fromString($searchTerm), 'all', 1, 5)['results'];
-
-        foreach ($entities as $entity) {
-            $entity->setAttribute('preview_content', '');
-        }
-
-        return view('search.parts.entity-suggestion-list', [
-            'entities' => $entities->slice(0, 5)
-        ]);
+        return view('search.parts.entity-ajax-list', ['entities' => $entities, 'permission' => $permission]);
     }
 
     /**

app/Http/Controllers/TagController.php

@@ -3,13 +3,15 @@
 namespace BookStack\Http\Controllers;
 
 use BookStack\Actions\TagRepo;
-use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
 
 class TagController extends Controller
 {
-    protected TagRepo $tagRepo;
+    protected $tagRepo;
 
+    /**
+     * TagController constructor.
+     */
     public function __construct(TagRepo $tagRepo)
     {
         $this->tagRepo = $tagRepo;
@@ -20,25 +22,22 @@ class TagController extends Controller
      */
     public function index(Request $request)
     {
-        $listOptions = SimpleListOptions::fromRequest($request, 'tags')->withSortOptions([
-            'name' => trans('common.sort_name'),
-            'usages' => trans('entities.tags_usages'),
-        ]);
-
+        $search = $request->get('search', '');
         $nameFilter = $request->get('name', '');
         $tags = $this->tagRepo
-            ->queryWithTotals($listOptions, $nameFilter)
+            ->queryWithTotals($search, $nameFilter)
             ->paginate(50)
-            ->appends(array_filter(array_merge($listOptions->getPaginationAppends(), [
+            ->appends(array_filter([
+                'search' => $search,
                 'name'   => $nameFilter,
-            ])));
+            ]));
 
         $this->setPageTitle(trans('entities.tags'));
 
         return view('tags.index', [
-            'tags'        => $tags,
-            'nameFilter'  => $nameFilter,
-            'listOptions' => $listOptions,
+            'tags'       => $tags,
+            'search'     => $search,
+            'nameFilter' => $nameFilter,
         ]);
     }
 
@@ -47,7 +46,7 @@ class TagController extends Controller
      */
     public function getNameSuggestions(Request $request)
     {
-        $searchTerm = $request->get('search', '');
+        $searchTerm = $request->get('search', null);
         $suggestions = $this->tagRepo->getNameSuggestions($searchTerm);
 
         return response()->json($suggestions);
@@ -58,8 +57,8 @@ class TagController extends Controller
      */
     public function getValueSuggestions(Request $request)
     {
-        $searchTerm = $request->get('search', '');
-        $tagName = $request->get('name', '');
+        $searchTerm = $request->get('search', null);
+        $tagName = $request->get('name', null);
         $suggestions = $this->tagRepo->getValueSuggestions($searchTerm, $tagName);
 
         return response()->json($suggestions);