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/authentication to config/application/authentication 

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:44:45 +01:00
parent 956bc3c07a
commit a4e81c320a
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/controllers/ConfigController.php
View File

@ -45,7 +45,7 @@ class ConfigController extends ActionController
)); ));
$allowedActions[] = 'application'; $allowedActions[] = 'application';
} }
if ($auth->hasPermission('system/config/authentication')) { if ($auth->hasPermission('config/application/authentication')) {
$tabs->add('authentication', array( $tabs->add('authentication', array(
'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'), 'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'),
'label' => $this->translate('Authentication'), 'label' => $this->translate('Authentication'),
@ -199,7 +199,7 @@ class ConfigController extends ActionController
*/ */
public function authenticationAction() public function authenticationAction()
{ {
$this->assertPermission('system/config/authentication'); $this->assertPermission('config/application/authentication');
$form = new AuthenticationBackendReorderForm(); $form = new AuthenticationBackendReorderForm();
$form->setIniConfig(Config::app('authentication')); $form->setIniConfig(Config::app('authentication'));
$form->handleRequest(); $form->handleRequest();
@ -214,7 +214,7 @@ class ConfigController extends ActionController
*/ */
public function createauthenticationbackendAction() public function createauthenticationbackendAction()
{ {
$this->assertPermission('system/config/authentication'); $this->assertPermission('config/application/authentication');
$form = new AuthenticationBackendConfigForm(); $form = new AuthenticationBackendConfigForm();
$form->setTitle($this->translate('Create New Authentication Backend')); $form->setTitle($this->translate('Create New Authentication Backend'));
$form->addDescription($this->translate( $form->addDescription($this->translate(
@ -236,7 +236,7 @@ class ConfigController extends ActionController
*/ */
public function editauthenticationbackendAction() public function editauthenticationbackendAction()
{ {
$this->assertPermission('system/config/authentication'); $this->assertPermission('config/application/authentication');
$form = new AuthenticationBackendConfigForm(); $form = new AuthenticationBackendConfigForm();
$form->setTitle($this->translate('Edit Backend')); $form->setTitle($this->translate('Edit Backend'));
$form->setIniConfig(Config::app('authentication')); $form->setIniConfig(Config::app('authentication'));
@ -254,7 +254,7 @@ class ConfigController extends ActionController
*/ */
public function removeauthenticationbackendAction() public function removeauthenticationbackendAction()
{ {
$this->assertPermission('system/config/authentication'); $this->assertPermission('config/application/authentication');
$form = new ConfirmRemovalForm(array( $form = new ConfirmRemovalForm(array(
'onSuccess' => function ($form) { 'onSuccess' => function ($form) {
$configForm = new AuthenticationBackendConfigForm(); $configForm = new AuthenticationBackendConfigForm();

2
application/controllers/RolesController.php
View File

@ -30,7 +30,7 @@ class RolesController extends ActionController
'url' => 'config' 'url' => 'config'
)); ));
} }
if ($auth->hasPermission('system/config/authentication')) { if ($auth->hasPermission('config/application/authentication')) {
$tabs->add('authentication', array( $tabs->add('authentication', array(
'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'), 'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'),
'label' => $this->translate('Authentication'), 'label' => $this->translate('Authentication'),

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

@ -24,7 +24,7 @@ class RoleForm extends ConfigForm
'*' => '*', '*' => '*',
'system/config/*' => 'system/config/*', 'system/config/*' => 'system/config/*',
'config/application/general' => 'config/application/general', 'config/application/general' => 'config/application/general',
'system/config/authentication' => 'system/config/authentication', 'config/application/authentication' => 'config/application/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',
'system/config/roles' => 'system/config/roles' 'system/config/roles' => 'system/config/roles'