tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 00:34:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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:40:37 +01:00
parent 0c30356d52
commit 956bc3c07a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/ConfigController.php
View File

@ -37,7 +37,7 @@ class ConfigController extends ActionController
$tabs = $this->getTabs(); $tabs = $this->getTabs();
$auth = $this->Auth(); $auth = $this->Auth();
$allowedActions = array(); $allowedActions = array();
if ($auth->hasPermission('system/config/application')) { if ($auth->hasPermission('config/application/general')) {
$tabs->add('application', array( $tabs->add('application', array(
'title' => $this->translate('Adjust the general configuration of Icinga Web 2'), 'title' => $this->translate('Adjust the general configuration of Icinga Web 2'),
'label' => $this->translate('Application'), 'label' => $this->translate('Application'),
@ -103,7 +103,7 @@ class ConfigController extends ActionController
*/ */
public function applicationAction() public function applicationAction()
{ {
$this->assertPermission('system/config/application'); $this->assertPermission('config/application/general');
$form = new GeneralConfigForm(); $form = new GeneralConfigForm();
$form->setIniConfig(Config::app()); $form->setIniConfig(Config::app());
$form->handleRequest(); $form->handleRequest();

2
application/controllers/RolesController.php
View File

@ -23,7 +23,7 @@ class RolesController extends ActionController
$this->assertPermission('system/config/roles'); $this->assertPermission('system/config/roles');
$tabs = $this->getTabs(); $tabs = $this->getTabs();
$auth = $this->Auth(); $auth = $this->Auth();
if ($auth->hasPermission('system/config/application')) { if ($auth->hasPermission('config/application/general')) {
$tabs->add('application', array( $tabs->add('application', array(
'title' => $this->translate('Adjust the general configuration of Icinga Web 2'), 'title' => $this->translate('Adjust the general configuration of Icinga Web 2'),
'label' => $this->translate('Application'), 'label' => $this->translate('Application'),

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

@ -23,7 +23,7 @@ class RoleForm extends ConfigForm
protected $providedPermissions = array( protected $providedPermissions = array(
'*' => '*', '*' => '*',
'system/config/*' => 'system/config/*', 'system/config/*' => 'system/config/*',
'system/config/application' => 'system/config/application', 'config/application/general' => 'config/application/general',
'system/config/authentication' => 'system/config/authentication', 'system/config/authentication' => 'system/config/authentication',
'system/config/modules' => 'system/config/modules', 'system/config/modules' => 'system/config/modules',
'system/config/resources' => 'system/config/resources', 'system/config/resources' => 'system/config/resources',