MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

chg: [acl] Move org index access to ACLComponent

pull/8697/head
Jakub Onderka 2022-10-24 09:59:19 +02:00
parent 2f63e89257
commit ecd3943e34
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Controller/Component/ACLComponent.php
View File

@ -468,7 +468,7 @@ class ACLComponent extends Component
'fetchOrgsForSG' => array('perm_sharing_group'),
'fetchSGOrgRow' => array('*'),
'getUUIDs' => array('perm_sync'),
'index' => array('*'),
'index' => ['organisation_index'],
'view' => array('*'),
),
'pages' => array(
@ -854,6 +854,13 @@ class ACLComponent extends Component
$this->dynamicChecks['not_read_only_authkey'] = function (array $user) {
return !isset($user['authkey_read_only']) || !$user['authkey_read_only'];
};
// If `Security.hide_organisation_index_from_users` is enabled, only user with sharing group permission can see org index
$this->dynamicChecks['organisation_index'] = function (array $user) {
if (Configure::read('Security.hide_organisation_index_from_users')) {
return $user['Role']['perm_sharing_group'];
}
return true;
};
}
/**

3
app/Controller/OrganisationsController.php
View File

@ -27,9 +27,6 @@ class OrganisationsController extends AppController
public function index()
{
if (!$this->Auth->user('Role')['perm_sharing_group'] && Configure::read('Security.hide_organisation_index_from_users')) {
throw new MethodNotAllowedException(__('This feature is disabled on this instance for normal users.'));
}
$conditions = array();
// We can either index all of the organisations existing on this instance (default)
// or we can pass the 'external' keyword in the URL to look at the added external organisations

2
app/View/Elements/genericElements/SideMenu/side_menu.ctp
View File

@ -654,7 +654,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'url' => $baseurl . '/dashboards',
'text' => __('Dashboard')
));
if ($isAclSharingGroup || empty(Configure::read('Security.hide_organisation_index_from_users'))) {
if ($this->Acl->canAccess('organisations', 'index')) {
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'element_id' => 'indexOrg',
'url' => $baseurl . '/organisations/index',

2
app/View/Elements/global_menu.ctp
View File

@ -186,7 +186,7 @@
array(
'text' => __('Organisations'),
'url' => $baseurl . '/organisations/index',
'requirement' => $isAclSharingGroup || empty(Configure::read('Security.hide_organisation_index_from_users'))
'requirement' => $this->Acl->canAccess('organisations', 'index'),
),
array(
'text' => __('Role Permissions'),