Security: Rename system/config/roles to config/application/roles

Module config permission and application config permission have to be separeted. Application config related permissions will be added beneath config/application and module related config permissions will be added beneath config/modules. refs #8720
Icinga · Mar 12, 2015 · f6e9551 · f6e9551
1 parent 08abbda
commit f6e9551
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
@@ -61,7 +61,7 @@ public function init()
             ));
             $allowedActions[] = 'resource';
         }
-        if ($auth->hasPermission('system/config/roles')) {
+        if ($auth->hasPermission('config/application/roles')) {
             $tabs->add('roles', array(
                 'title' => $this->translate(
                     'Configure roles to permit or restrict users and groups accessing Icinga Web 2'

diff --git a/application/controllers/RolesController.php b/application/controllers/RolesController.php
@@ -20,7 +20,7 @@ class RolesController extends ActionController
      */
     public function init()
     {
-        $this->assertPermission('system/config/roles');
+        $this->assertPermission('config/application/roles');
         $tabs = $this->getTabs();
         $auth = $this->Auth();
         if ($auth->hasPermission('config/application/general')) {

diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
@@ -27,7 +27,7 @@ class RoleForm extends ConfigForm
         'config/application/authentication' => 'config/application/authentication',
         'system/config/modules'             => 'system/config/modules',
         'config/application/resources'      => 'config/application/resources',
-        'system/config/roles'               => 'system/config/roles'
+        'config/application/roles'          => 'config/application/roles'
     );
 
     /**