Added ability to secure images behind auth

[bookstack] / app / Http / Controllers / PermissionController.php

diff --git a/app/Http/Controllers/PermissionController.php b/app/Http/Controllers/PermissionController.php
index 8cc14fc7aa32624fdc8a4d8c6e2413c0aac23822..cd064e7e80675e47188d0b02644926f94cfb8769 100644 (file)
--- a/app/Http/Controllers/PermissionController.php
+++ b/app/Http/Controllers/PermissionController.php
@@ -1,28 +1,21 @@
-<?php
+<?php namespace BookStack\Http\Controllers;

 
 

-namespace BookStack\Http\Controllers;
-
-use BookStack\Permission;
-use BookStack\Role;
+use BookStack\Exceptions\PermissionsException;
+use BookStack\Repos\PermissionsRepo;

 use Illuminate\Http\Request;
 use Illuminate\Http\Request;

-use BookStack\Http\Requests;

 
 class PermissionController extends Controller
 {
 
 
 class PermissionController extends Controller
 {
 

-    protected $role;
-    protected $permission;
+    protected $permissionsRepo;

 
     /**
      * PermissionController constructor.
 
     /**
      * PermissionController constructor.

-     * @param Role $role
-     * @param Permission $permission
-     * @internal param $user
+     * @param PermissionsRepo $permissionsRepo

      */
      */

-    public function __construct(Role $role, Permission $permission)
+    public function __construct(PermissionsRepo $permissionsRepo)

     {
     {

-        $this->role = $role;
-        $this->permission = $permission;
+        $this->permissionsRepo = $permissionsRepo;

         parent::__construct();
     }
 
         parent::__construct();
     }
 


@@ -32,7 +25,7 @@ class PermissionController extends Controller
     public function listRoles()
     {
         $this->checkPermission('user-roles-manage');
     public function listRoles()
     {
         $this->checkPermission('user-roles-manage');

-        $roles = $this->role->all();
+        $roles = $this->permissionsRepo->getAllRoles();

         return view('settings/roles/index', ['roles' => $roles]);
     }
 
         return view('settings/roles/index', ['roles' => $roles]);
     }
 


@@ -59,23 +52,8 @@ class PermissionController extends Controller
             'description' => 'max:250'
         ]);
 
             'description' => 'max:250'
         ]);
 

-        $role = $this->role->newInstance($request->all());
-        $role->name = str_replace(' ', '-', strtolower($request->get('display_name')));
-        // Prevent duplicate names
-        while ($this->role->where('name', '=', $role->name)->count() > 0) {
-            $role->name .= strtolower(str_random(2));
-        }
-        $role->save();
-
-        if ($request->has('permissions')) {
-            $permissionsNames = array_keys($request->get('permissions'));
-            $permissions = $this->permission->whereIn('name', $permissionsNames)->pluck('id')->toArray();
-            $role->permissions()->sync($permissions);
-        } else {
-            $role->permissions()->sync([]);
-        }
-
-        session()->flash('success', 'Role successfully created');
+        $this->permissionsRepo->saveNewRole($request->all());
+        session()->flash('success', trans('settings.role_create_success'));

         return redirect('/settings/roles');
     }
 
         return redirect('/settings/roles');
     }
 


@@ -83,11 +61,13 @@ class PermissionController extends Controller
      * Show the form for editing a user role.
      * @param $id
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      * Show the form for editing a user role.
      * @param $id
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View

+     * @throws PermissionsException

      */
     public function editRole($id)
     {
         $this->checkPermission('user-roles-manage');
      */
     public function editRole($id)
     {
         $this->checkPermission('user-roles-manage');

-        $role = $this->role->findOrFail($id);
+        $role = $this->permissionsRepo->getRoleById($id);
+        if ($role->hidden) throw new PermissionsException(trans('errors.role_cannot_be_edited'));

         return view('settings/roles/edit', ['role' => $role]);
     }
 
         return view('settings/roles/edit', ['role' => $role]);
     }
 


@@ -105,25 +85,8 @@ class PermissionController extends Controller
             'description' => 'max:250'
         ]);
 
             'description' => 'max:250'
         ]);
 

-        $role = $this->role->findOrFail($id);
-        if ($request->has('permissions')) {
-            $permissionsNames = array_keys($request->get('permissions'));
-            $permissions = $this->permission->whereIn('name', $permissionsNames)->pluck('id')->toArray();
-            $role->permissions()->sync($permissions);
-        } else {
-            $role->permissions()->sync([]);
-        }
-
-        // Ensure admin account always has all permissions
-        if ($role->name === 'admin') {
-            $permissions = $this->permission->all()->pluck('id')->toArray();
-            $role->permissions()->sync($permissions);
-        }
-
-        $role->fill($request->all());
-        $role->save();
-
-        session()->flash('success', 'Role successfully updated');
+        $this->permissionsRepo->updateRole($id, $request->all());
+        session()->flash('success', trans('settings.role_update_success'));

         return redirect('/settings/roles');
     }
 
         return redirect('/settings/roles');
     }
 


@@ -136,9 +99,9 @@ class PermissionController extends Controller
     public function showDeleteRole($id)
     {
         $this->checkPermission('user-roles-manage');
     public function showDeleteRole($id)
     {
         $this->checkPermission('user-roles-manage');

-        $role = $this->role->findOrFail($id);
-        $roles = $this->role->where('id', '!=', $id)->get();
-        $blankRole = $this->role->newInstance(['display_name' => 'Don\'t migrate users']);
+        $role = $this->permissionsRepo->getRoleById($id);
+        $roles = $this->permissionsRepo->getAllRolesExcept($role);
+        $blankRole = $role->newInstance(['display_name' => trans('settings.role_delete_no_migration')]);

         $roles->prepend($blankRole);
         return view('settings/roles/delete', ['role' => $role, 'roles' => $roles]);
     }
         $roles->prepend($blankRole);
         return view('settings/roles/delete', ['role' => $role, 'roles' => $roles]);
     }


@@ -153,30 +116,15 @@ class PermissionController extends Controller
     public function deleteRole($id, Request $request)
     {
         $this->checkPermission('user-roles-manage');
     public function deleteRole($id, Request $request)
     {
         $this->checkPermission('user-roles-manage');

-        $role = $this->role->findOrFail($id);
-
-        // Prevent deleting admin role
-        if ($role->name === 'admin') {
-            session()->flash('error', 'The admin role cannot be deleted');
-            return redirect()->back();
-        }

 
 

-        if ($role->id == \Setting::get('registration-role')) {
-            session()->flash('error', 'This role cannot be deleted while set as the default registration role.');
+        try {
+            $this->permissionsRepo->deleteRole($id, $request->get('migrate_role_id'));
+        } catch (PermissionsException $e) {
+            session()->flash('error', $e->getMessage());

             return redirect()->back();
         }
 
             return redirect()->back();
         }
 

-        if ($request->has('migration_role_id')) {
-            $newRole = $this->role->find($request->get('migration_role_id'));
-            if ($newRole) {
-                $users = $role->users->pluck('id')->toArray();
-                $newRole->users()->sync($users);
-            }
-        }
-
-        $role->delete();
-
-        session()->flash('success', 'Role successfully deleted');
+        session()->flash('success', trans('settings.role_delete_success'));

         return redirect('/settings/roles');
     }
 }
         return redirect('/settings/roles');
     }
 }