From a2be858a7d19e33f00b1991c74d8d58861a99ecb Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Tue, 10 May 2022 16:25:05 +0200 Subject: [PATCH 001/114] #8836 remove base64 decode --- pandora_console/include/functions_events.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 934d7c27bc..ea820f8f05 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -4190,7 +4190,7 @@ function events_get_response_target( // Parse the event custom data. if (empty($event['custom_data']) === false) { - $custom_data = json_decode(base64_decode($event['custom_data'])); + $custom_data = json_decode($event['custom_data']); foreach ($custom_data as $key => $value) { $target = str_replace('_customdata_'.$key.'_', $value, $target); } @@ -4754,7 +4754,7 @@ function events_page_custom_data($event) $table->head = []; $table->class = 'table_modal_alternate'; - $json_custom_data = base64_decode($event['custom_data']); + $json_custom_data = $event['custom_data']; $custom_data = json_decode($json_custom_data); if ($custom_data === null) { @@ -7637,7 +7637,7 @@ function events_get_field_value_by_event_id( // Parse the event custom data. if (!empty($event['custom_data'])) { - $custom_data = json_decode(base64_decode($event['custom_data'])); + $custom_data = json_decode($event['custom_data']); foreach ($custom_data as $key => $val) { $value = str_replace('_customdata_'.$key.'_', $val, $value); } From 62e0dfa36e00bea23ebfb43ca3741c52d0533e42 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Tue, 14 Jun 2022 13:11:39 +0200 Subject: [PATCH 002/114] #9146 Fixed dbmanager --- pandora_console/extensions/dbmanager.php | 55 +++++++++--------------- 1 file changed, 20 insertions(+), 35 deletions(-) diff --git a/pandora_console/extensions/dbmanager.php b/pandora_console/extensions/dbmanager.php index 8c248367dc..db92dda0a9 100644 --- a/pandora_console/extensions/dbmanager.php +++ b/pandora_console/extensions/dbmanager.php @@ -43,20 +43,11 @@ function dbmanager_query($sql, &$error, $dbconnection) $error = mysqli_error($dbconnection); return false; } - } else { - $result = mysql_query($sql, $dbconnection); - if ($result === false) { - $backtrace = debug_backtrace(); - $error = mysql_error(); - return false; - } } if ($result === true) { if ($config['mysqli']) { return mysqli_affected_rows($dbconnection); - } else { - return mysql_affected_rows(); } } @@ -64,23 +55,17 @@ function dbmanager_query($sql, &$error, $dbconnection) while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { array_push($retval, $row); } - } else { - while ($row = mysql_fetch_array($result, MYSQL_ASSOC)) { - array_push($retval, $row); - } } if ($config['mysqli']) { mysqli_free_result($result); - } else { - mysql_free_result($result); } if (! empty($retval)) { return $retval; } - // Return false, check with === or !== + // Return false, check with === or !== . return 'Empty'; } @@ -171,20 +156,6 @@ function dbmgr_extension_main() $data[1][0] = "Some samples of usage:
SHOW STATUS;
DESCRIBE tagente
SELECT * FROM tserver
UPDATE tagente SET id_grupo = 15 WHERE nombre LIKE '%194.179%'
"; - \enterprise_include_once('include/functions_metaconsole.php'); - $servers = \metaconsole_get_servers(); - if (is_array($servers) === true) { - $servers = array_reduce( - $servers, - function ($carry, $item) { - $carry[$item['id']] = $item['server_name']; - return $carry; - } - ); - } else { - $servers = []; - } - $data[2][0] = html_print_textarea( 'sql', 5, @@ -195,6 +166,21 @@ function dbmgr_extension_main() ); if (is_metaconsole() === true) { + // Get the servers. + \enterprise_include_once('include/functions_metaconsole.php'); + $servers = \metaconsole_get_servers(); + if (is_array($servers) === true) { + $servers = array_reduce( + $servers, + function ($carry, $item) { + $carry[$item['id']] = $item['server_name']; + return $carry; + } + ); + } else { + $servers = []; + } + $data[3][2] = html_print_input( [ 'name' => 'node_id', @@ -223,7 +209,7 @@ function dbmgr_extension_main() html_print_table($table); echo ''; - // Processing SQL Code + // Processing SQL Code. if ($sql == '') { return; } @@ -271,7 +257,7 @@ function dbmgr_extension_main() return; } - if (! is_array($result)) { + if (is_array($result) === false) { echo 'Output: '.$result; db_pandora_audit( @@ -315,11 +301,10 @@ if (is_metaconsole() === true) { ); extensions_add_meta_function('dbmgr_extension_main'); -} else { } -// This adds a option in the operation menu +// This adds a option in the operation menu. extensions_add_godmode_menu_option(__('DB interface'), 'PM', 'gextensions', 'dbmanager/icon.png', 'v1r1', 'gdbman'); -// This sets the function to be called when the extension is selected in the operation menu +// This sets the function to be called when the extension is selected in the operation menu. extensions_add_godmode_function('dbmgr_extension_main'); From 5f05b79e668af6f8de876c27c3b227430411339e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Wed, 22 Jun 2022 12:06:34 +0200 Subject: [PATCH 003/114] Fix issue with header --- pandora_console/include/languages/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/languages/es.po b/pandora_console/include/languages/es.po index 852d2e5bed..0df366f57f 100644 --- a/pandora_console/include/languages/es.po +++ b/pandora_console/include/languages/es.po @@ -13022,7 +13022,7 @@ msgstr "ContraseƱa incorrecta" #: ../../operation/users/user_edit_notifications.php:36 #: ../../operation/users/user_edit_header.php:102 msgid "User notifications" -msgstr "Notifivaciones de usuario" +msgstr "Notificaciones de usuario" #: ../../operation/users/user_edit_notifications.php:64 #: ../../enterprise/include/lib/Metaconsole/Node.php:1165 From 5b9b3f08b1c507a727699911b6fae12ad1b6b31a Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Tue, 28 Jun 2022 12:10:10 +0200 Subject: [PATCH 004/114] changes in agent logrotate --- pandora_agents/unix/pandora_agent_logrotate | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pandora_agents/unix/pandora_agent_logrotate b/pandora_agents/unix/pandora_agent_logrotate index 1c7b5e9a9a..92540543c0 100644 --- a/pandora_agents/unix/pandora_agent_logrotate +++ b/pandora_agents/unix/pandora_agent_logrotate @@ -7,4 +7,7 @@ compress notifempty copytruncate + postrotate + /bin/systemctl restart pandora_agent_daemon + endscript } From 609dc7deabedc21ce2d526fa000f364638d01a05 Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Tue, 28 Jun 2022 12:11:13 +0200 Subject: [PATCH 005/114] changes in agent logrotate --- pandora_agents/unix/pandora_agent_logrotate | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_agents/unix/pandora_agent_logrotate b/pandora_agents/unix/pandora_agent_logrotate index 92540543c0..032f0dded7 100644 --- a/pandora_agents/unix/pandora_agent_logrotate +++ b/pandora_agents/unix/pandora_agent_logrotate @@ -7,7 +7,7 @@ compress notifempty copytruncate - postrotate - /bin/systemctl restart pandora_agent_daemon - endscript + postrotate + /bin/systemctl restart pandora_agent_daemon + endscript } From 36e2043102f00c373a24f1514c94e615cad28b53 Mon Sep 17 00:00:00 2001 From: "edu.corral" Date: Wed, 6 Jul 2022 10:58:16 +0200 Subject: [PATCH 006/114] ent-9091 setup view --- pandora_console/godmode/setup/setup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php index b1bad59936..8c8587b1ef 100644 --- a/pandora_console/godmode/setup/setup.php +++ b/pandora_console/godmode/setup/setup.php @@ -324,7 +324,7 @@ switch ($section) { } // Put header inside div for special sizing.(No right margin). -echo '
'; +echo '
'; // Header. ui_print_page_header( __('Configuration').$subpage, From 53fa3c8b8db183ff07d97a92d95f28ded45c5fc4 Mon Sep 17 00:00:00 2001 From: "edu.corral" Date: Wed, 6 Jul 2022 12:15:31 +0200 Subject: [PATCH 007/114] ent-9185 tree view alerts modal window --- pandora_console/include/functions_treeview.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php index f0f3d921ff..3fc35f4d84 100755 --- a/pandora_console/include/functions_treeview.php +++ b/pandora_console/include/functions_treeview.php @@ -473,9 +473,9 @@ function treeview_printAlertsTable($id_module, $server_data=[], $no_head=false) if ($user_access_node && check_acl($config['id_user'], $id_group, 'LW')) { // Actions table - echo '
'; + echo ''; } From 01ba149280cd8c1ec4f41ef5c50814e4b8841b72 Mon Sep 17 00:00:00 2001 From: Daniel Barbero Martin Date: Fri, 8 Jul 2022 13:40:20 +0200 Subject: [PATCH 008/114] new console report pandora_enterprise#6367 --- pandora_console/general/header.php | 15 +- pandora_console/general/main_menu.php | 6 +- .../general/reporting_console_node.php | 103 ++ pandora_console/godmode/menu.php | 847 +++++++-------- pandora_console/godmode/servers/discovery.php | 6 + .../godmode/setup/setup_general.php | 11 + .../wizards/DiscoveryTaskList.class.php | 4 +- pandora_console/include/functions.php | 47 + pandora_console/include/functions_config.php | 8 + .../include/styles/maintenance.css | 18 + pandora_console/index.php | 22 +- pandora_console/operation/menu.php | 961 +++++++++--------- 12 files changed, 1150 insertions(+), 898 deletions(-) create mode 100644 pandora_console/general/reporting_console_node.php diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index 7384ac17ff..85fd409f33 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -436,9 +436,22 @@ echo sprintf('
', $menuTypeClass); ); $header_logout .= '
'; - echo '
'.$config['custom_title_header'].''.$config['custom_subtitle_header'].'
+ if (is_reporting_console_node() === true) { + echo '
'; + echo ''; + echo $config['custom_title_header']; + echo ''; + echo ''; + echo $config['custom_subtitle_header']; + echo ''; + echo '
'; + echo '
'; + echo '
'.$header_support, $header_docu, $header_user, $header_logout.'
'; + } else { + echo '
'.$config['custom_title_header'].''.$config['custom_subtitle_header'].'
'.$header_searchbar.'
'.$header_autorefresh, $header_autorefresh_counter, $header_discovery, $servers_list, $header_feedback, $header_support, $header_docu, $header_user, $header_logout.'
'; + } ?>
diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php index 590dbe328a..159e55b584 100644 --- a/pandora_console/general/main_menu.php +++ b/pandora_console/general/main_menu.php @@ -58,6 +58,10 @@ if (isset($config['autohidden_menu']) === true && (bool) $config['autohidden_men // Start of full lateral menu. echo sprintf('