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

new: [acl] Checks for publishing or modifying galaxy clusters

pull/8702/head
Jakub Onderka 2022-10-25 10:00:28 +02:00
parent 51653d257f
commit 014035b475
3 changed files with 68 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1010,6 +1010,45 @@ class ACLComponent extends Component
return false;
}
/**
* Checks if user can modify given galaxy cluster
*
* @param array $user
* @param array $cluster
* @return bool
*/
public function canModifyGalaxyCluster(array $user, array $cluster)
{
if (!isset($cluster['GalaxyCluster'])) {
throw new InvalidArgumentException('Passed object does not contain an GalaxyCluster.');
}
if ($cluster['GalaxyCluster']['default']) {
return false; // it is not possible to edit default clusters
}
if ($user['Role']['perm_site_admin']) {
return true;
}
if (!$user['Role']['perm_galaxy_editor']) {
return false;
}
return $cluster['GalaxyCluster']['orgc_id'] == $user['org_id'];
}
/**
* Checks if user can publish given galaxy cluster
*
* @param array $user
* @param array $cluster
* @return bool
*/
public function canPublishGalaxyCluster(array $user, array $cluster)
{
if (!$this->canModifyGalaxyCluster($user, $cluster)) {
return false;
}
return (bool)$user['Role']['perm_publish'];
}
private function __checkLoggedActions($user, $controller, $action)
{
$loggedActions = array(

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

@ -1380,7 +1380,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'url' => $baseurl . '/galaxies/index',
'text' => __('List Galaxies')
));
if ($isSiteAdmin) {
if ($this->Acl->canAccess('galaxy_cluster_blocklists', 'index')) {
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'element_id' => 'index_blocklist',
'url' => $baseurl . '/galaxy_cluster_blocklists/index',
@ -1413,7 +1413,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'message' => __('Are you sure you want to drop all default galaxy clusters?')
));
}
if ($isSiteAdmin || $me['Role']['perm_galaxy_editor']) {
if ($this->Acl->canAccess('galaxies', 'import')) {
echo $divider;
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'url' => $baseurl . '/galaxies/import',
@ -1441,7 +1441,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'text' => __('View Cluster')
));
}
if ($menuItem !== 'add_cluster' && !$defaultCluster && ($isSiteAdmin || ($me['Role']['perm_galaxy_editor'] && $cluster['GalaxyCluster']['orgc_id'] == $me['org_id']))) {
if ($menuItem !== 'add_cluster' && $this->Acl->canModifyCluster($cluster)) {
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'element_id' => 'edit_cluster',
'url' => $baseurl . '/galaxy_clusters/edit/' . h($id),
@ -1455,17 +1455,12 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'text' => __('Add Cluster')
));
}
if ($menuItem !== 'add_cluster' && ($isSiteAdmin || $me['Role']['perm_galaxy_editor'])) {
if ($menuItem !== 'add_cluster' && $this->Acl->canAccess('galaxyClusters', 'add')) {
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'url' => $baseurl . '/galaxy_clusters/add/' . h($galaxy_id) . '/forkUuid:' . h($cluster['GalaxyCluster']['uuid']),
'text' => __('Fork Cluster')
));
if (
!$cluster['GalaxyCluster']['default'] &&
(
$isSiteAdmin || (isset($cluster['GalaxyCluster']['orgc_id']) && $cluster['GalaxyCluster']['orgc_id'] == $me['org_id'])
)
) {
if ($this->Acl->canPublishGalaxyCluster($cluster)) {
echo $divider;
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'onClick' => array(
@ -1530,9 +1525,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
echo $divider;
if (
isset($cluster['GalaxyCluster']['published']) && !$cluster['GalaxyCluster']['published'] &&
isset($cluster['GalaxyCluster']['orgc_id']) && $cluster['GalaxyCluster']['orgc_id'] == $me['org_id'] &&
!$cluster['GalaxyCluster']['default'] &&
($isSiteAdmin || $me['Role']['perm_galaxy_editor'])
$this->Acl->canPublishGalaxyCluster($cluster)
) {
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'onClick' => array(
@ -1552,7 +1545,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'url' => $baseurl . '/galaxies/index',
'text' => __('List Galaxies')
));
if ($isSiteAdmin) {
if ($this->Acl->canAccess('galaxy_cluster_blocklists', 'index')) {
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'element_id' => 'index_blocklist',
'url' => $baseurl . '/galaxy_cluster_blocklists/index',
@ -1564,7 +1557,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'url' => $baseurl . '/galaxy_cluster_relations/index',
'text' => __('List Relationships')
));
if ($isSiteAdmin || $me['Role']['perm_galaxy_editor']) {
if ($this->Acl->canAccess('galaxy_cluster_relations', 'add')) {
echo $divider;
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'element_id' => 'add',
@ -1579,7 +1572,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'url' => $baseurl . '/objectTemplates/index',
'text' => __('List Object Templates')
));
if ($isSiteAdmin) {
if ($this->Acl->canAccess('objectTemplates', 'update')) {
echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
'url' => $baseurl . '/objectTemplates/update',
'text' => __('Update Objects')

20
app/View/Helper/AclHelper.php
View File

@ -93,4 +93,24 @@ class AclHelper extends Helper
$me = $this->_View->viewVars['me'];
return $this->ACL->canEditReport($me, $eventReport);
}
/**
* @param array $cluster
* @return bool
*/
public function canModifyGalaxyCluster(array $cluster)
{
$me = $this->_View->viewVars['me'];
return $this->ACL->canModifyGalaxyCluster($me, $cluster);
}
/**
* @param array $cluster
* @return bool
*/
public function canPublishGalaxyCluster(array $cluster)
{
$me = $this->_View->viewVars['me'];
return $this->ACL->canModifyGalaxyCluster($me, $cluster);
}
}