tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Eric Lippmann 2015-03-12 14:48:45 +01:00
parent 08abbda152
commit f6e9551235
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/ConfigController.php
View File

@ -61,7 +61,7 @@ class ConfigController extends ActionController
)); ));
$allowedActions[] = 'resource'; $allowedActions[] = 'resource';
} }
if ($auth->hasPermission('system/config/roles')) { if ($auth->hasPermission('config/application/roles')) {
$tabs->add('roles', array( $tabs->add('roles', array(
'title' => $this->translate( 'title' => $this->translate(
'Configure roles to permit or restrict users and groups accessing Icinga Web 2' 'Configure roles to permit or restrict users and groups accessing Icinga Web 2'

2
application/controllers/RolesController.php
View File

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

2
application/forms/Security/RoleForm.php
View File

@ -27,7 +27,7 @@ class RoleForm extends ConfigForm
'config/application/authentication' => 'config/application/authentication', 'config/application/authentication' => 'config/application/authentication',
'system/config/modules' => 'system/config/modules', 'system/config/modules' => 'system/config/modules',
'config/application/resources' => 'config/application/resources', 'config/application/resources' => 'config/application/resources',
'system/config/roles' => 'system/config/roles' 'config/application/roles' => 'config/application/roles'
); );
/** /**