Rolled out new permissions system throughout application

@@ -70,7 +70,20 @@ abstract class Entity extends Ownable
      */
      */
     public function hasRestriction($role_id, $action)
     public function hasRestriction($role_id, $action)
     {
     {
-        return $this->restrictions->where('role_id', $role_id)->where('action', $action)->count() > 0;
+        return $this->restrictions()->where('role_id', '=', $role_id)
+            ->where('action', '=', $action)->count() > 0;
+    }
+
+    /**
+     * Check if this entity has live (active) restrictions in place.
+     * @param $role_id
+     * @param $action
+     * @return bool
+     */
+    public function hasActiveRestriction($role_id, $action)
+    {
+        return $this->restricted && $this->restrictions()
+            ->where('role_id', '=', $role_id)->where('action', '=', $action)->count() > 0;
     }
     }
 
 
     /**
     /**

@@ -71,11 +71,7 @@ class BookController extends Controller
             'name' => 'required|string|max:255',
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
             'description' => 'string|max:1000'
         ]);
         ]);
-        $book = $this->bookRepo->newFromInput($request->all());
-        $book->slug = $this->bookRepo->findSuitableSlug($book->name);
-        $book->created_by = Auth::user()->id;
-        $book->updated_by = Auth::user()->id;
-        $book->save();
+        $book = $this->bookRepo->createFromInput($request->all());
         Activity::add($book, 'book_create', $book->id);
         Activity::add($book, 'book_create', $book->id);
         return redirect($book->getUrl());
         return redirect($book->getUrl());
     }
     }
@@ -122,10 +118,7 @@ class BookController extends Controller
             'name' => 'required|string|max:255',
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
             'description' => 'string|max:1000'
         ]);
         ]);
-        $book->fill($request->all());
-        $book->slug = $this->bookRepo->findSuitableSlug($book->name, $book->id);
-        $book->updated_by = Auth::user()->id;
-        $book->save();
+        $book = $this->bookRepo->updateFromInput($book, $request->all());
         Activity::add($book, 'book_update', $book->id);
         Activity::add($book, 'book_update', $book->id);
         return redirect($book->getUrl());
         return redirect($book->getUrl());
     }
     }
@@ -210,6 +203,7 @@ class BookController extends Controller
         // Add activity for books
         // Add activity for books
         foreach ($sortedBooks as $bookId) {
         foreach ($sortedBooks as $bookId) {
             $updatedBook = $this->bookRepo->getById($bookId);
             $updatedBook = $this->bookRepo->getById($bookId);
+            $this->bookRepo->updateBookPermissions($updatedBook);
             Activity::add($updatedBook, 'book_sort', $updatedBook->id);
             Activity::add($updatedBook, 'book_sort', $updatedBook->id);
         }
         }
 
 
@@ -227,7 +221,7 @@ class BookController extends Controller
         $this->checkOwnablePermission('book-delete', $book);
         $this->checkOwnablePermission('book-delete', $book);
         Activity::addMessage('book_delete', 0, $book->name);
         Activity::addMessage('book_delete', 0, $book->name);
         Activity::removeEntity($book);
         Activity::removeEntity($book);
-        $this->bookRepo->destroyBySlug($bookSlug);
+        $this->bookRepo->destroy($book);
         return redirect('/books');
         return redirect('/books');
     }
     }
 
 

@@ -57,12 +57,9 @@ class ChapterController extends Controller
         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('chapter-create', $book);
         $this->checkOwnablePermission('chapter-create', $book);
 
 
-        $chapter = $this->chapterRepo->newFromInput($request->all());
-        $chapter->slug = $this->chapterRepo->findSuitableSlug($chapter->name, $book->id);
-        $chapter->priority = $this->bookRepo->getNewPriority($book);
-        $chapter->created_by = auth()->user()->id;
-        $chapter->updated_by = auth()->user()->id;
-        $book->chapters()->save($chapter);
+        $input = $request->all();
+        $input['priority'] = $this->bookRepo->getNewPriority($book);
+        $chapter = $this->chapterRepo->createFromInput($request->all(), $book);
         Activity::add($chapter, 'chapter_create', $book->id);
         Activity::add($chapter, 'chapter_create', $book->id);
         return redirect($chapter->getUrl());
         return redirect($chapter->getUrl());
     }
     }

@@ -2,6 +2,7 @@
 
 
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Repos\PermissionsRepo;
 use BookStack\Repos\PermissionsRepo;
+use BookStack\Services\RestrictionService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use BookStack\Http\Requests;
 use BookStack\Http\Requests;
 
 

-<?php
-
-namespace BookStack;
+<?php namespace BookStack;
 
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Model;
 
 
@@ -16,7 +14,7 @@ class Permission extends Model
 
 
     /**
     /**
      * Get the permission object by name.
      * Get the permission object by name.
-     * @param $roleName
+     * @param $name
      * @return mixed
      * @return mixed
      */
      */
     public static function getByName($name)
     public static function getByName($name)

 <?php namespace BookStack\Repos;
 <?php namespace BookStack\Repos;
 
 
+use Alpha\B;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\NotFoundException;
 use Illuminate\Support\Str;
 use Illuminate\Support\Str;
 use BookStack\Book;
 use BookStack\Book;
@@ -123,21 +124,43 @@ class BookRepo extends EntityRepo
 
 
     /**
     /**
      * Get a new book instance from request input.
      * Get a new book instance from request input.
+     * @param array $input
+     * @return Book
+     */
+    public function createFromInput($input)
+    {
+        $book = $this->book->newInstance($input);
+        $book->slug = $this->findSuitableSlug($book->name);
+        $book->created_by = auth()->user()->id;
+        $book->updated_by = auth()->user()->id;
+        $book->save();
+        $this->restrictionService->buildEntityPermissionsForEntity($book);
+        return $book;
+    }
+
+    /**
+     * Update the given book from user input.
+     * @param Book $book
      * @param $input
      * @param $input
      * @return Book
      * @return Book
      */
      */
-    public function newFromInput($input)
+    public function updateFromInput(Book $book, $input)
     {
     {
-        return $this->book->newInstance($input);
+        $book->fill($input);
+        $book->slug = $this->findSuitableSlug($book->name, $book->id);
+        $book->updated_by = auth()->user()->id;
+        $book->save();
+        $this->restrictionService->buildEntityPermissionsForEntity($book);
+        return $book;
     }
     }
 
 
     /**
     /**
-     * Destroy a book identified by the given slug.
-     * @param $bookSlug
+     * Destroy the given book.
+     * @param Book $book
+     * @throws \Exception
      */
      */
-    public function destroyBySlug($bookSlug)
+    public function destroy(Book $book)
     {
     {
-        $book = $this->getBySlug($bookSlug);
         foreach ($book->pages as $page) {
         foreach ($book->pages as $page) {
             $this->pageRepo->destroy($page);
             $this->pageRepo->destroy($page);
         }
         }
@@ -146,10 +169,20 @@ class BookRepo extends EntityRepo
         }
         }
         $book->views()->delete();
         $book->views()->delete();
         $book->restrictions()->delete();
         $book->restrictions()->delete();
+        $this->restrictionService->deleteEntityPermissionsForEntity($book);
         $book->delete();
         $book->delete();
     }
     }
 
 
     /**
     /**
+     * Alias method to update the book permissions in the RestrictionService.
+     * @param Book $book
+     */
+    public function updateBookPermissions(Book $book)
+    {
+        $this->restrictionService->buildEntityPermissionsForEntity($book);
+    }
+
+    /**
      * Get the next child element priority.
      * Get the next child element priority.
      * @param Book $book
      * @param Book $book
      * @return int
      * @return int

@@ -2,6 +2,7 @@
 
 
 
 
 use Activity;
 use Activity;
+use BookStack\Book;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\NotFoundException;
 use Illuminate\Support\Str;
 use Illuminate\Support\Str;
 use BookStack\Chapter;
 use BookStack\Chapter;
@@ -78,11 +79,18 @@ class ChapterRepo extends EntityRepo
     /**
     /**
      * Create a new chapter from request input.
      * Create a new chapter from request input.
      * @param $input
      * @param $input
-     * @return $this
+     * @param Book $book
+     * @return Chapter
      */
      */
-    public function newFromInput($input)
+    public function createFromInput($input, Book $book)
     {
     {
-        return $this->chapter->fill($input);
+        $chapter = $this->chapter->newInstance($input);
+        $chapter->slug = $this->findSuitableSlug($chapter->name, $book->id);
+        $chapter->created_by = auth()->user()->id;
+        $chapter->updated_by = auth()->user()->id;
+        $chapter = $book->chapters()->save($chapter);
+        $this->restrictionService->buildEntityPermissionsForEntity($chapter);
+        return $chapter;
     }
     }
 
 
     /**
     /**
@@ -100,6 +108,7 @@ class ChapterRepo extends EntityRepo
         Activity::removeEntity($chapter);
         Activity::removeEntity($chapter);
         $chapter->views()->delete();
         $chapter->views()->delete();
         $chapter->restrictions()->delete();
         $chapter->restrictions()->delete();
+        $this->restrictionService->deleteEntityPermissionsForEntity($chapter);
         $chapter->delete();
         $chapter->delete();
     }
     }
 
 

@@ -151,6 +151,7 @@ class EntityRepo
             }
             }
         }
         }
         $entity->save();
         $entity->save();
+        $this->restrictionService->buildEntityPermissionsForEntity($entity);
     }
     }
 
 
     /**
     /**

@@ -168,6 +168,7 @@ class PageRepo extends EntityRepo
         if ($chapter) $page->chapter_id = $chapter->id;
         if ($chapter) $page->chapter_id = $chapter->id;
 
 
         $book->pages()->save($page);
         $book->pages()->save($page);
+        $this->restrictionService->buildEntityPermissionsForEntity($page);
         return $page;
         return $page;
     }
     }
 
 
@@ -583,6 +584,7 @@ class PageRepo extends EntityRepo
         $page->views()->delete();
         $page->views()->delete();
         $page->revisions()->delete();
         $page->revisions()->delete();
         $page->restrictions()->delete();
         $page->restrictions()->delete();
+        $this->restrictionService->deleteEntityPermissionsForEntity($page);
         $page->delete();
         $page->delete();
     }
     }
 
 

@@ -4,6 +4,7 @@
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Permission;
 use BookStack\Permission;
 use BookStack\Role;
 use BookStack\Role;
+use BookStack\Services\RestrictionService;
 use Setting;
 use Setting;
 
 
 class PermissionsRepo
 class PermissionsRepo
@@ -11,16 +12,19 @@ class PermissionsRepo
 
 
     protected $permission;
     protected $permission;
     protected $role;
     protected $role;
+    protected $restrictionService;
 
 
     /**
     /**
      * PermissionsRepo constructor.
      * PermissionsRepo constructor.
-     * @param $permission
-     * @param $role
+     * @param Permission $permission
+     * @param Role $role
+     * @param RestrictionService $restrictionService
      */
      */
-    public function __construct(Permission $permission, Role $role)
+    public function __construct(Permission $permission, Role $role, RestrictionService $restrictionService)
     {
     {
         $this->permission = $permission;
         $this->permission = $permission;
         $this->role = $role;
         $this->role = $role;
+        $this->restrictionService = $restrictionService;
     }
     }
 
 
     /**
     /**
@@ -69,6 +73,7 @@ class PermissionsRepo
 
 
         $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
         $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
         $this->assignRolePermissions($role, $permissions);
         $this->assignRolePermissions($role, $permissions);
+        $this->restrictionService->buildEntityPermissionForRole($role);
         return $role;
         return $role;
     }
     }
 
 
@@ -91,6 +96,7 @@ class PermissionsRepo
 
 
         $role->fill($roleData);
         $role->fill($roleData);
         $role->save();
         $role->save();
+        $this->restrictionService->buildEntityPermissionForRole($role);
     }
     }
 
 
     /**
     /**
@@ -136,6 +142,7 @@ class PermissionsRepo
             }
             }
         }
         }
 
 
+        $this->restrictionService->deleteEntityPermissionsForRole($role);
         $role->delete();
         $role->delete();
     }
     }
 
 

@@ -18,6 +18,15 @@ class Role extends Model
     }
     }
 
 
     /**
     /**
+     * Get all related entity permissions.
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function entityPermissions()
+    {
+        return $this->hasMany(EntityPermission::class);
+    }
+
+    /**
      * The permissions that belong to the role.
      * The permissions that belong to the role.
      */
      */
     public function permissions()
     public function permissions()

@@ -105,8 +105,16 @@ class ActivityService
      */
      */
     public function entityActivity($entity, $count = 20, $page = 0)
     public function entityActivity($entity, $count = 20, $page = 0)
     {
     {
-        $activity = $entity->hasMany('BookStack\Activity')->orderBy('created_at', 'desc')
-            ->skip($count * $page)->take($count)->get();
+        if ($entity->isA('book')) {
+            $query = $this->activity->where('book_id', '=', $entity->id);
+        } else {
+            $query = $this->activity->where('entity_type', '=', get_class($entity))
+                ->where('entity_id', '=', $entity->id);
+        }
+        
+        $activity = $this->restrictionService
+            ->filterRestrictedEntityRelations($query, 'activities', 'entity_id', 'entity_type')
+            ->orderBy('created_at', 'desc')->skip($count * $page)->take($count)->get();
 
 
         return $this->filterSimilar($activity);
         return $this->filterSimilar($activity);
     }
     }

@@ -45,20 +45,8 @@ function userCan($permission, \BookStack\Ownable $ownable = null)
     }
     }
 
 
     // Check permission on ownable item
     // Check permission on ownable item
-    $permissionBaseName = strtolower($permission) . '-';
-    $hasPermission = false;
-    if (auth()->user()->can($permissionBaseName . 'all')) $hasPermission = true;
-    if (auth()->user()->can($permissionBaseName . 'own') && $ownable->createdBy && $ownable->createdBy->id === auth()->user()->id) $hasPermission = true;
-
-    if (!$ownable instanceof \BookStack\Entity) return $hasPermission;
-
-    // Check restrictions on the entity
     $restrictionService = app('BookStack\Services\RestrictionService');
     $restrictionService = app('BookStack\Services\RestrictionService');
-    $explodedPermission = explode('-', $permission);
-    $action = end($explodedPermission);
-    $hasAccess = $restrictionService->checkIfEntityRestricted($ownable, $action);
-    $restrictionsSet = $restrictionService->checkIfRestrictionsSet($ownable, $action);
-    return ($hasAccess && $restrictionsSet) || (!$restrictionsSet && $hasPermission);
+    return $restrictionService->checkEntityUserAccess($ownable, $permission);
 }
 }
 
 
 /**
 /**

@@ -23,6 +23,7 @@ class AddViewPermissionsToRoles extends Migration
                 $newPermission->name = strtolower($entity) . '-' . strtolower(str_replace(' ', '-', $op));
                 $newPermission->name = strtolower($entity) . '-' . strtolower(str_replace(' ', '-', $op));
                 $newPermission->display_name = $op . ' ' . $entity . 's';
                 $newPermission->display_name = $op . ' ' . $entity . 's';
                 $newPermission->save();
                 $newPermission->save();
+                // Assign view permissions to all current roles
                 foreach ($currentRoles as $role) {
                 foreach ($currentRoles as $role) {
                     $role->attachPermission($newPermission);
                     $role->attachPermission($newPermission);
                 }
                 }

@@ -4,12 +4,14 @@ class RestrictionsTest extends TestCase
 {
 {
     protected $user;
     protected $user;
     protected $viewer;
     protected $viewer;
+    protected $restrictionService;
 
 
     public function setUp()
     public function setUp()
     {
     {
         parent::setUp();
         parent::setUp();
         $this->user = $this->getNewUser();
         $this->user = $this->getNewUser();
         $this->viewer = $this->getViewer();
         $this->viewer = $this->getViewer();
+        $this->restrictionService = $this->app[\BookStack\Services\RestrictionService::class];
     }
     }
 
 
     protected function getViewer()
     protected function getViewer()
@@ -43,6 +45,8 @@ class RestrictionsTest extends TestCase
         }
         }
         $entity->save();
         $entity->save();
         $entity->load('restrictions');
         $entity->load('restrictions');
+        $this->restrictionService->buildEntityPermissionsForEntity($entity);
+        $entity->load('permissions');
     }
     }
 
 
     public function test_book_view_restriction()
     public function test_book_view_restriction()

@@ -7,7 +7,15 @@ class RolesTest extends TestCase
     public function setUp()
     public function setUp()
     {
     {
         parent::setUp();
         parent::setUp();
-        $this->user = $this->getNewBlankUser();
+        $this->user = $this->getViewer();
+    }
+
+    protected function getViewer()
+    {
+        $role = \BookStack\Role::getRole('viewer');
+        $viewer = $this->getNewBlankUser();
+        $viewer->attachRole($role);;
+        return $viewer;
     }
     }
 
 
     /**
     /**
@@ -141,7 +149,7 @@ class RolesTest extends TestCase
 
 
     public function test_restrictions_manage_own_permission()
     public function test_restrictions_manage_own_permission()
     {
     {
-        $otherUsersPage = \BookStack\Page::take(1)->get()->first();
+        $otherUsersPage = \BookStack\Page::first();
         $content = $this->createEntityChainBelongingToUser($this->user);
         $content = $this->createEntityChainBelongingToUser($this->user);
         // Check can't restrict other's content
         // Check can't restrict other's content
         $this->actingAs($this->user)->visit($otherUsersPage->getUrl())
         $this->actingAs($this->user)->visit($otherUsersPage->getUrl())

@@ -65,6 +65,8 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
         $page = factory(BookStack\Page::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id, 'book_id' => $book->id]);
         $page = factory(BookStack\Page::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id, 'book_id' => $book->id]);
         $book->chapters()->saveMany([$chapter]);
         $book->chapters()->saveMany([$chapter]);
         $chapter->pages()->saveMany([$page]);
         $chapter->pages()->saveMany([$page]);
+        $restrictionService = $this->app[\BookStack\Services\RestrictionService::class];
+        $restrictionService->buildEntityPermissionsForEntity($book);
         return [
         return [
             'book' => $book,
             'book' => $book,
             'chapter' => $chapter,
             'chapter' => $chapter,