From 34c3b0042606c0180775064c7d10dc3354abf0e5 Mon Sep 17 00:00:00 2001 From: Calvo Date: Fri, 13 Aug 2021 15:57:01 +0200 Subject: [PATCH] WIP: Revision ACL part 3 --- pandora_console/include/ajax/events.php | 8 ++++++++ pandora_console/include/functions_menu.php | 11 ++++++++--- pandora_console/operation/events/events.php | 12 ++++++++++++ 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index d08defb37b..1b89581955 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -1295,6 +1295,14 @@ if ($get_extended_event) { && isset($config['event_replication']) && $config['event_replication'] == 1 && $config['show_events_in_local'] == 1 + || enterprise_hook( + 'enterprise_acl', + [ + $config['id_user'], + 'eventos', + 'execute_event_responses', + ] + ) === false ) { $readonly = true; } diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index 7a748c08c1..9410e2e8b0 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -494,9 +494,10 @@ function menu_add_extras(&$menu) $menu_extra['gservers']['sub']['godmode/servers/manage_recontask_form']['text'] = __('Manage recontask'); + $menu_extra['gagente']['sub']['godmode/category/edit_category']['text'] = __('Manage module categories'); + $menu_extra['gmodules']['sub']['godmode/modules/manage_network_templates_form']['text'] = __('Module templates management'); $menu_extra['gmodules']['sub']['enterprise/godmode/modules/manage_inventory_modules_form']['text'] = __('Inventory modules management'); - $menu_extra['gmodules']['sub']['godmode/tag/edit_tag']['text'] = __('Tags management'); $menu_extra['gagente']['sub']['godmode/agentes/configurar_agente']['text'] = __('Agents management'); @@ -509,6 +510,7 @@ function menu_add_extras(&$menu) $menu_extra['network']['sub']['godmode/reporting/visual_console_builder']['text'] = __('Builder visual console'); $menu_extra['eventos']['sub']['godmode/events/events']['text'] = __('Administration events'); + $menu_extra['eventos']['sub']['execute_event_responses']['text'] = __('Execute event responses'); $menu_extra['reporting']['sub']['operation/reporting/reporting_viewer']['text'] = __('View reporting'); $menu_extra['reporting']['sub']['operation/reporting/graph_viewer']['text'] = __('Graph viewer'); @@ -520,7 +522,8 @@ function menu_add_extras(&$menu) $menu_extra['reporting']['sub']['enterprise/godmode/reporting/graph_template_editor']['text'] = __('Manage graph templates'); $menu_extra['reporting']['sub']['enterprise/godmode/reporting/graph_template_item_editor']['text'] = __('Graph template items'); $menu_extra['reporting']['sub']['enterprise/godmode/reporting/graph_template_wizard']['text'] = __('Graph template wizard'); - + $menu_extra['reporting']['sub']['godmode/reporting/reporting_builder&tab=wizard&action=wizard']['text'] = __('Templates wizard'); + $menu_extra['reporting']['sub']['godmode/reporting/reporting_builder&tab=template&action=list_template']['text'] = __('Templates'); if ($config['activate_gis']) { $menu_extra['godgismaps']['sub']['godmode/gis_maps/configure_gis_map']['text'] = __('Manage GIS Maps'); } @@ -528,7 +531,6 @@ function menu_add_extras(&$menu) $menu_extra['workspace']['sub']['operation/incidents/incident_statistics']['text'] = __('Incidents statistics'); $menu_extra['workspace']['sub']['operation/messages/message_edit']['text'] = __('Manage messages'); - $menu_extra['gagente']['sub']['godmode/groups/configure_group']['text'] = __('Manage groups'); $menu_extra['gagente']['sub']['godmode/groups/configure_modu_group']['text'] = __('Manage module groups'); $menu_extra['gagente']['sub']['godmode/agentes/configure_field']['text'] = __('Manage custom field'); @@ -547,6 +549,9 @@ function menu_add_extras(&$menu) $menu_extra['workspace']['sub']['operation/incidents/incident_detail']['text'] = __('Manage incident'); + $menu_extra['gusuarios']['sub']['godmode/groups/configure_group']['text'] = __('Manage groups'); + $menu_extra['gusuarios']['sub']['godmode/tag/edit_tag']['text'] = __('Tags management'); + // Duplicate extensions as sec=extension to check it from url. foreach ($menu as $k => $m) { if (!isset($m['sub'])) { diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index 332a2fd35c..48071659f0 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -998,6 +998,18 @@ if (is_metaconsole() !== true) { } } +if (enterprise_hook( + 'enterprise_acl', + [ + $config['id_user'], + 'eventos', + 'execute_event_responses', + ] +) === false +) { + $readonly = true; +} + /* * Load filter form. */