Fixes typo causing the message not to be displayed

[bookstack] / app / Services / PermissionService.php

diff --git a/app/Services/PermissionService.php b/app/Services/PermissionService.php
index 341a69edb624a4967b86c432c66b044a0ae896aa..467bf95da69f7f6dbe35361a2a595669cb977bc0 100644 (file)
--- a/app/Services/PermissionService.php
+++ b/app/Services/PermissionService.php
@@ -8,8 +8,9 @@ use BookStack\Ownable;
 use BookStack\Page;
 use BookStack\Role;
 use BookStack\User;
 use BookStack\Page;
 use BookStack\Role;
 use BookStack\User;

+use Illuminate\Database\Connection;
+use Illuminate\Database\Eloquent\Builder;

 use Illuminate\Support\Collection;
 use Illuminate\Support\Collection;

-use Illuminate\Support\Facades\Log;

 
 class PermissionService
 {
 
 class PermissionService
 {


@@ -23,6 +24,8 @@ class PermissionService
     public $chapter;
     public $page;
 
     public $chapter;
     public $page;
 

+    protected $db;
+

     protected $jointPermission;
     protected $role;
 
     protected $jointPermission;
     protected $role;
 


@@ -31,18 +34,21 @@ class PermissionService
     /**
      * PermissionService constructor.
      * @param JointPermission $jointPermission
     /**
      * PermissionService constructor.
      * @param JointPermission $jointPermission

+     * @param Connection $db

      * @param Book $book
      * @param Chapter $chapter
      * @param Page $page
      * @param Role $role
      */
      * @param Book $book
      * @param Chapter $chapter
      * @param Page $page
      * @param Role $role
      */

-    public function __construct(JointPermission $jointPermission, Book $book, Chapter $chapter, Page $page, Role $role)
+    public function __construct(JointPermission $jointPermission, Connection $db, Book $book, Chapter $chapter, Page $page, Role $role)

     {
     {

+        $this->db = $db;

         $this->jointPermission = $jointPermission;
         $this->role = $role;
         $this->book = $book;
         $this->chapter = $chapter;
         $this->page = $page;
         $this->jointPermission = $jointPermission;
         $this->role = $role;
         $this->book = $book;
         $this->chapter = $chapter;
         $this->page = $page;

+        // TODO - Update so admin still goes through filters

     }
 
     /**
     }
 
     /**


@@ -302,6 +308,10 @@ class PermissionService
         $explodedAction = explode('-', $action);
         $restrictionAction = end($explodedAction);
 
         $explodedAction = explode('-', $action);
         $restrictionAction = end($explodedAction);
 

+        if ($role->system_name === 'admin') {
+            return $this->createJointPermissionDataArray($entity, $role, $action, true, true);
+        }
+

         if ($entity->isA('book')) {
 
             if (!$entity->restricted) {
         if ($entity->isA('book')) {
 
             if (!$entity->restricted) {


@@ -461,61 +471,77 @@ class PermissionService
         return $q;
     }
 
         return $q;
     }
 

-    /**
-     * Add restrictions for a page query
-     * @param $query
-     * @param string $action
-     * @return mixed
-     */
-    public function enforcePageRestrictions($query, $action = 'view')
-    {
-        // Prevent drafts being visible to others.
-        $query = $query->where(function ($query) {
-            $query->where('draft', '=', false);
-            if ($this->currentUser()) {
-                $query->orWhere(function ($query) {
-                    $query->where('draft', '=', true)->where('created_by', '=', $this->currentUser()->id);
-                });
-            }
-        });
+    public function bookChildrenQuery($book_id, $filterDrafts = false) {

 
 

-        return $this->enforceEntityRestrictions($query, $action);
-    }
-
-    /**
-     * Add on permission restrictions to a chapter query.
-     * @param $query
-     * @param string $action
-     * @return mixed
-     */
-    public function enforceChapterRestrictions($query, $action = 'view')
-    {
-        return $this->enforceEntityRestrictions($query, $action);
-    }
+        // Draft setup
+        $params = [
+            'userId' => $this->currentUser()->id,
+            'bookIdPage' => $book_id,
+            'bookIdChapter' => $book_id
+        ];
+        if (!$filterDrafts) {
+            $params['userIdDrafts'] = $this->currentUser()->id;
+        }
+        // Role setup
+        $userRoles = $this->getRoles();
+        $roleBindings = [];
+        $roleValues = [];
+        foreach ($userRoles as $index => $roleId) {
+            $roleBindings[':role'.$index] = $roleId;
+            $roleValues['role'.$index] = $roleId;
+        }
+        // TODO - Clean this up, Maybe extract into a nice class for doing these kind of manual things
+        // Something which will handle the above role crap in a nice clean way
+        $roleBindingString = implode(',', array_keys($roleBindings));
+        $query = "SELECT * from (
+(SELECT 'Bookstack\\\Page' as entity_type, id, slug, name, text, '' as description, book_id, priority, chapter_id, draft FROM {$this->page->getTable()}
+    where book_id = :bookIdPage AND ". ($filterDrafts ? '(draft = 0)' : '(draft = 0 OR (draft = 1 AND created_by = :userIdDrafts))') .")
+UNION
+(SELECT 'Bookstack\\\Chapter' as entity_type, id, slug, name, '' as text, description, book_id, priority, 0 as chapter_id, 0 as draft FROM {$this->chapter->getTable()} WHERE book_id = :bookIdChapter)
+) as U  WHERE (
+       SELECT COUNT(*) FROM {$this->jointPermission->getTable()} jp
+    WHERE
+               jp.entity_id=U.id AND
+        jp.entity_type=U.entity_type AND
+               jp.action = 'view' AND
+        jp.role_id IN ({$roleBindingString}) AND
+        (
+                       jp.has_permission = 1 OR
+            (jp.has_permission_own = 1 AND jp.created_by = :userId)
+        )
+) > 0
+ORDER BY draft desc, priority asc";

 
 

-    /**
-     * Add restrictions to a book query.
-     * @param $query
-     * @param string $action
-     * @return mixed
-     */
-    public function enforceBookRestrictions($query, $action = 'view')
-    {
-        return $this->enforceEntityRestrictions($query, $action);
+        $this->clean();
+        return $this->db->select($query, array_replace($roleValues, $params));

     }
 
     /**
      * Add restrictions for a generic entity
     }
 
     /**
      * Add restrictions for a generic entity

-     * @param $query
+     * @param string $entityType
+     * @param Builder|Entity $query

      * @param string $action
      * @return mixed
      */
      * @param string $action
      * @return mixed
      */

-    public function enforceEntityRestrictions($query, $action = 'view')
+    public function enforceEntityRestrictions($entityType, $query, $action = 'view')

     {
     {

+        if (strtolower($entityType) === 'page') {
+            // Prevent drafts being visible to others.
+            $query = $query->where(function ($query) {
+                $query->where('draft', '=', false);
+                if ($this->currentUser()) {
+                    $query->orWhere(function ($query) {
+                        $query->where('draft', '=', true)->where('created_by', '=', $this->currentUser()->id);
+                    });
+                }
+            });
+        }
+

         if ($this->isAdmin()) {
             $this->clean();
             return $query;
         }
         if ($this->isAdmin()) {
             $this->clean();
             return $query;
         }

+

         $this->currentAction = $action;
         return $this->entityRestrictionQuery($query);
     }
         $this->currentAction = $action;
         return $this->entityRestrictionQuery($query);
     }


@@ -601,7 +627,7 @@ class PermissionService
     private function isAdmin()
     {
         if ($this->isAdminUser === null) {
     private function isAdmin()
     {
         if ($this->isAdminUser === null) {

-            $this->isAdminUser = ($this->currentUser()->id !== null) ? $this->currentUser()->hasRole('admin') : false;
+            $this->isAdminUser = ($this->currentUser()->id !== null) ? $this->currentUser()->hasSystemRole('admin') : false;

         }
 
         return $this->isAdminUser;
         }
 
         return $this->isAdminUser;


@@ -614,7 +640,7 @@ class PermissionService
     private function currentUser()
     {
         if ($this->currentUserModel === false) {
     private function currentUser()
     {
         if ($this->currentUserModel === false) {

-            $this->currentUserModel = auth()->user() ? auth()->user() : new User();
+            $this->currentUserModel = user();

         }
 
         return $this->currentUserModel;
         }
 
         return $this->currentUserModel;