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

new: [acl] User AlcHelper more often

pull/8702/head
Jakub Onderka 2022-10-24 15:00:29 +02:00
parent 81ca3e3930
commit ed2bfa236d
3 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Controller/AppController.php
View File

@ -290,23 +290,14 @@ class AppController extends Controller
$this->set('isSiteAdmin', $role['perm_site_admin']);
$this->set('hostOrgUser', $user['org_id'] == Configure::read('MISP.host_org_id'));
$this->set('isAclAdd', $role['perm_add']);
$this->set('isAclModify', $role['perm_modify']);
$this->set('isAclModifyOrg', $role['perm_modify_org']);
$this->set('isAclPublish', $role['perm_publish']);
$this->set('isAclDelegate', $role['perm_delegate']);
$this->set('isAclSync', $role['perm_sync']);
$this->set('isAclAdmin', $role['perm_admin']);
$this->set('isAclAudit', $role['perm_audit']);
$this->set('isAclAuth', $role['perm_auth']);
$this->set('isAclRegexp', $role['perm_regexp_access']);
$this->set('isAclTagger', $role['perm_tagger']);
$this->set('isAclTagEditor', $role['perm_tag_editor']);
$this->set('isAclTemplate', $role['perm_template']);
$this->set('isAclGalaxyEditor', !empty($role['perm_galaxy_editor']));
$this->set('isAclSharingGroup', $role['perm_sharing_group']);
$this->set('isAclSighting', $role['perm_sighting'] ?? false);
$this->set('isAclZmq', $role['perm_publish_zmq'] ?? false);
$this->set('isAclKafka', $role['perm_publish_kafka'] ?? false);
$this->set('isAclDecaying', $role['perm_decaying'] ?? false);
$this->set('aclComponent', $this->ACL);
$this->userRole = $role;

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

@ -232,14 +232,14 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
echo $divider;
}
}
if ($isAclZmq && Configure::read('Plugin.ZeroMQ_enable')) {
if ($this->Acl->canAccess('events', 'pushEventToZMQ') && Configure::read('Plugin.ZeroMQ_enable')) {
echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
'url' => $baseurl . '/events/pushEventToZMQ/' . $eventId,
'text' => __('Publish event to ZMQ'),
'message' => __('Are you sure you wish to republish the current event to the ZMQ channel?')
));
}
if ($isAclKafka &&
if ($this->Acl->canAccess('events', 'pushEventToKafka') &&
Configure::read('Plugin.Kafka_enable') &&
Configure::read('Plugin.Kafka_event_notifications_enable') &&
Configure::read('Plugin.Kafka_event_notifications_topic')
@ -289,7 +289,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'url' => $baseurl . '/tag_collections/index',
'text' => __('List Tag Collections')
));
if ($isAclTagEditor) {
if ($this->Acl->canAccess('tag_collections', 'add')) {
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'url' => $baseurl . '/tag_collections/add',
'text' => __('Add Tag Collection')
@ -419,7 +419,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'url' => '/eventReports/index',
'text' => __('List Event Reports')
));
if ($isAclAdd) {
if ($this->Acl->canAccess('eventReports', 'add')) {
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'element_id' => 'add',
'text' => __('Add Event Report'),
@ -1154,7 +1154,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'url' => $baseurl . '/tags/index',
'text' => __('List Tags')
));
if ($isAclTagEditor) {
if ($this->Acl->canAccess('tags', 'add')) {
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'url' => $baseurl . '/tags/add',
'text' => __('Add Tag')
@ -1165,8 +1165,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'element_id' => 'edit',
'text' => __('Edit Tag')
));
}
if ($menuItem === 'viewGraph') {
} elseif ($menuItem === 'viewGraph') {
if (!empty($taxonomy)) {
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'element_id' => 'taxonomyview',
@ -1217,13 +1216,13 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'url' => $baseurl . '/templates/index',
'text' => __('List Templates')
));
if ($isSiteAdmin || $isAclTemplate) {
if ($this->Acl->canAccess('templates', 'add')) {
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'url' => $baseurl . '/templates/add',
'text' => __('Add Template')
));
}
if (($menuItem === 'view' || $menuItem === 'edit')) {
if ($menuItem === 'view' || $menuItem === 'edit') {
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'element_id' => 'view',
'url' => $baseurl . '/templates/view/' . h($id),

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

@ -55,7 +55,7 @@
array(
'text' => __('Add Tag'),
'url' => $baseurl . '/tags/add',
'requirement' => $isAclTagEditor
'requirement' => $this->Acl->canAccess('tags', 'add'),
),
array(
'text' => __('List Tag Collections'),