From 6dc775649dee49ec6b018f5c46da8f04b7181dce Mon Sep 17 00:00:00 2001 From: Calvo Date: Mon, 14 Mar 2022 15:29:40 +0100 Subject: [PATCH 01/14] Fix dashboard events responses --- pandora_console/include/ajax/events.php | 14 +++++++------- .../include/lib/Dashboard/Widgets/events_list.php | 1 + pandora_console/include/styles/pandora.css | 3 +++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index e8a0d5831a..8446748cd4 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -1578,14 +1578,14 @@ if ($get_extended_event) { $comments = '
'; - $notifications = ''; - $notifications .= ''; - $notifications .= ''; - $notifications .= ''; - $notifications .= ''; - $notifications .= ''; + $notifications = '
'.ui_print_error_message(__('Error adding comment'), '', true).'
'; + $notifications .= '
'.ui_print_success_message(__('Comment added successfully'), '', true).'
'; + $notifications .= '
'.ui_print_error_message(__('Error changing event status'), '', true).'
'; + $notifications .= '
'.ui_print_success_message(__('Event status changed successfully'), '', true).'
'; + $notifications .= '
'.ui_print_error_message(__('Error changing event owner'), '', true).'
'; + $notifications .= '
'.ui_print_success_message(__('Event owner changed successfully'), '', true).'
'; - $loading = ''; + $loading = '
'.html_print_image('images/spinner.gif', true).'
'; $i = 0; $tab['general'] = $i++; diff --git a/pandora_console/include/lib/Dashboard/Widgets/events_list.php b/pandora_console/include/lib/Dashboard/Widgets/events_list.php index 602533e73a..ebd4dfb09f 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/events_list.php +++ b/pandora_console/include/lib/Dashboard/Widgets/events_list.php @@ -502,6 +502,7 @@ class EventsListWidget extends Widget \ui_require_css_file('events', 'include/styles/', true); \ui_require_css_file('tables', 'include/styles/', true); + \ui_require_javascript_file('pandora_events', 'include/javascript/', true); $this->values['groupId'] = explode(',', $this->values['groupId'][0]); $this->values['tagsId'] = explode(',', $this->values['tagsId'][0]); diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index b6a7a72d93..74e6594f97 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -875,6 +875,9 @@ select:-internal-list-box { .invisible_important { display: none !important; } +.invisible_events { + display: none; +} .visible { display: block; From 52df92e715d1198cd79811c9d629fe6d47e44768 Mon Sep 17 00:00:00 2001 From: Calvo Date: Mon, 14 Mar 2022 17:56:04 +0100 Subject: [PATCH 02/14] Fix files repo download file hash error --- pandora_console/extensions/files_repo/files_repo_list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/extensions/files_repo/files_repo_list.php b/pandora_console/extensions/files_repo/files_repo_list.php index cc1584dc17..783e155dc4 100644 --- a/pandora_console/extensions/files_repo/files_repo_list.php +++ b/pandora_console/extensions/files_repo/files_repo_list.php @@ -77,7 +77,7 @@ if (!empty($files)) { $file_name = explode('/', $file['location']); $file_decoded = $file_name[(count($file_name) - 1)]; $file_path = base64_encode($file_decoded); - $hash = md5($file_path.$config['dbpass']); + $hash = md5($file_path.$config['server_unique_identifier']); $url = ui_get_full_url( 'include/get_file.php?file='.urlencode($file_path).'&hash='.$hash ); From a90e31be4f9cbd39d86b12657dbf1a2dc221f498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Fri, 18 Mar 2022 14:03:36 +0100 Subject: [PATCH 03/14] Fix credential storing with spaces --- .../include/class/CredentialStore.class.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/class/CredentialStore.class.php b/pandora_console/include/class/CredentialStore.class.php index 82ab94ee97..5919eef8f0 100644 --- a/pandora_console/include/class/CredentialStore.class.php +++ b/pandora_console/include/class/CredentialStore.class.php @@ -14,7 +14,7 @@ * |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______| * * ============================================================================ - * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas + * Copyright (c) 2005-2022 Artica Soluciones Tecnologicas * Please see http://pandorafms.org for full contribution list * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -644,8 +644,15 @@ class CredentialStore extends Wizard ]; // Spaces are not allowed. - $values['identifier'] = preg_replace('/\s+/', '-', trim($identifier)); - + $values['identifier'] = \io_safe_input( + preg_replace( + '/\s+/', + '-', + trim( + \io_safe_output($identifier) + ) + ) + ); return $values; } From ba6a56b9fc63a9710b39af1992493899b7e440e9 Mon Sep 17 00:00:00 2001 From: Luis Date: Mon, 21 Mar 2022 18:15:58 +0100 Subject: [PATCH 04/14] WIP: event dashboard responses --- pandora_console/include/ajax/events.php | 8 ++++-- pandora_console/include/functions_events.php | 2 ++ .../include/javascript/pandora_dashboards.js | 25 ++++++++++++++++++- .../include/javascript/pandora_events.js | 9 ++++++- .../lib/Dashboard/Widgets/events_list.php | 13 ++++++---- 5 files changed, 48 insertions(+), 9 deletions(-) diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index 8446748cd4..988c458a1c 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -1269,10 +1269,14 @@ if ($change_status) { ); if ($return !== false) { + $event_st = events_display_status($new_status); + echo json_encode( [ - 'status' => 'status_ok', - 'user' => db_get_value( + 'status_title' => $event_st['title'], + 'status_img' => html_print_image($event_st['img'], true, false, true), + 'status' => 'status_ok', + 'user' => db_get_value( 'fullname', 'tusuario', 'id_user', diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 26f41a2589..1861134e3f 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -5008,6 +5008,8 @@ function events_page_general($event) $event_st = events_display_status($event['estado']); $data = []; + + $table_general->rowid[7] = 'general_status'; $data[0] = __('Status'); $data[1] = $event_st['title']; $data[2] = html_print_image($event_st['img'], true); diff --git a/pandora_console/include/javascript/pandora_dashboards.js b/pandora_console/include/javascript/pandora_dashboards.js index aacf542cbb..104073ef84 100644 --- a/pandora_console/include/javascript/pandora_dashboards.js +++ b/pandora_console/include/javascript/pandora_dashboards.js @@ -651,7 +651,7 @@ function initialiceLayout(data) { url: data.url, data: { page: data.page, - method: "drawWidget", + method: "drawCell", dashboardId: data.dashboardId, cellId: cellId, newWidth: newWidth, @@ -1329,6 +1329,29 @@ function dashboardShowEventDialog(settings) { close: function() { //$("#refrcounter").countdown("resume"); //$("div.vc-countdown").countdown("resume"); + debugger; + $.ajax({ + method: "post", + url: settings.ajaxUrl, + data: { + page: "operation/dashboard/dashboard", + method: "drawWidget", + dashboardId: settings.dashboardId, + cellId: settings.cellId, + widgetId: settings.widgetId, + redraw: 1 + }, + success: function(dataWidget) { + // Widget empty and reload. + $("#widget-" + settings.cellId + " .content-widget").empty(); + $("#widget-" + settings.cellId + " .content-widget").append( + dataWidget + ); + }, + error: function(error) { + console.error(error); + } + }); }, overlay: { opacity: 0.5, diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js index 357e22318c..6826eb3eed 100644 --- a/pandora_console/include/javascript/pandora_events.js +++ b/pandora_console/include/javascript/pandora_events.js @@ -504,7 +504,7 @@ function event_change_status(event_ids) { if ($("#notification_status_error").length) { $("#notification_status_error").hide(); } - + debugger; if (data.status == "status_ok") { if (typeof dt_events !== "undefined") { dt_events.draw(false); @@ -519,6 +519,13 @@ function event_change_status(event_ids) { "N/A" ); } + + $("#general_status") + .find(".general_status") + .text(data.status_title); + $("#general_status") + .find("img") + .attr("src", data.status_img); } else { $("#notification_status_error").show(); } diff --git a/pandora_console/include/lib/Dashboard/Widgets/events_list.php b/pandora_console/include/lib/Dashboard/Widgets/events_list.php index ebd4dfb09f..c3b01a177e 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/events_list.php +++ b/pandora_console/include/lib/Dashboard/Widgets/events_list.php @@ -718,16 +718,19 @@ class EventsListWidget extends Widget $settings = json_encode( [ - 'event' => $event, - 'page' => 'include/ajax/events', - 'cellId' => $this->cellId, - 'ajaxUrl' => \ui_get_full_url( + 'event' => $event, + 'page' => 'include/ajax/events', + 'cellId' => $this->cellId, + 'ajaxUrl' => \ui_get_full_url( 'ajax.php', false, false, false ), - 'result' => false, + 'result' => false, + 'dashboardId' => $this->dashboardId, + 'widgetId' => $this->widgetId, + 'cellId' => $this->cellId, ] ); From 174f6dce511ce3753f3554d1baeecd872d2871a6 Mon Sep 17 00:00:00 2001 From: Calvo Date: Tue, 22 Mar 2022 18:02:53 +0100 Subject: [PATCH 05/14] Fix dashboard event list, Removed missing debugger in code --- pandora_console/include/ajax/events.php | 2 ++ pandora_console/include/functions_events.php | 2 +- .../javascript/multiselect_filtered.js | 1 - .../include/javascript/pandora_dashboards.js | 29 +++++++++++++++++-- .../include/javascript/pandora_events.js | 2 +- .../lib/Dashboard/Widgets/events_list.php | 6 ++++ 6 files changed, 37 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index 988c458a1c..45b159dae5 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -1588,6 +1588,8 @@ if ($get_extended_event) { $notifications .= '
'.ui_print_success_message(__('Event status changed successfully'), '', true).'
'; $notifications .= '
'.ui_print_error_message(__('Error changing event owner'), '', true).'
'; $notifications .= '
'.ui_print_success_message(__('Event owner changed successfully'), '', true).'
'; + $notifications .= '
'.ui_print_error_message(__('Error deleting event'), '', true).'
'; + $loading = '
'.html_print_image('images/spinner.gif', true).'
'; diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 1861134e3f..879c36c38e 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -3752,7 +3752,7 @@ function events_page_responses($event, $childrens_ids=[]) $data = []; $data[0] = __('Delete event'); $data[1] = ''; - $data[2] = '
'; + $data[2] = ''; $data[2] .= html_print_button( __('Delete event'), 'delete_button', diff --git a/pandora_console/include/javascript/multiselect_filtered.js b/pandora_console/include/javascript/multiselect_filtered.js index 74f24f5a0a..dcaee528b0 100644 --- a/pandora_console/include/javascript/multiselect_filtered.js +++ b/pandora_console/include/javascript/multiselect_filtered.js @@ -232,7 +232,6 @@ function fmModuleChange(uniqId, isMeta) { selection: showCommonModules }, function(data) { - debugger; $("#filtered-module-modules-" + uniqId).html(""); if (data) { jQuery.each(data, function(id, value) { diff --git a/pandora_console/include/javascript/pandora_dashboards.js b/pandora_console/include/javascript/pandora_dashboards.js index 104073ef84..a0f8f0a5d5 100644 --- a/pandora_console/include/javascript/pandora_dashboards.js +++ b/pandora_console/include/javascript/pandora_dashboards.js @@ -651,7 +651,7 @@ function initialiceLayout(data) { url: data.url, data: { page: data.page, - method: "drawCell", + method: "drawWidget", dashboardId: data.dashboardId, cellId: cellId, newWidth: newWidth, @@ -1326,10 +1326,35 @@ function dashboardShowEventDialog(settings) { resizable: true, draggable: true, modal: true, + create: function() { + $("#button-delete_button").removeAttr("onclick"); + $("#button-delete_button").click(function() { + var confirm_message = $("#hidden-delete_confirm_message").val(); + if (confirm(confirm_message) == false) { + return false; + } + $.ajax({ + method: "post", + url: settings.ajaxUrl, + data: { + page: "include/ajax/events", + delete_event: 1, + id_evento: settings.event.id_evento, + filter: [] + }, + success: function() { + $("#notification_delete_error").show(); + $("#event_details_window").dialog("close"); + }, + error: function(error) { + console.error(error); + } + }); + }); + }, close: function() { //$("#refrcounter").countdown("resume"); //$("div.vc-countdown").countdown("resume"); - debugger; $.ajax({ method: "post", url: settings.ajaxUrl, diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js index 6826eb3eed..86107bb03d 100644 --- a/pandora_console/include/javascript/pandora_events.js +++ b/pandora_console/include/javascript/pandora_events.js @@ -504,7 +504,7 @@ function event_change_status(event_ids) { if ($("#notification_status_error").length) { $("#notification_status_error").hide(); } - debugger; + if (data.status == "status_ok") { if (typeof dt_events !== "undefined") { dt_events.draw(false); diff --git a/pandora_console/include/lib/Dashboard/Widgets/events_list.php b/pandora_console/include/lib/Dashboard/Widgets/events_list.php index c3b01a177e..21336e7419 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/events_list.php +++ b/pandora_console/include/lib/Dashboard/Widgets/events_list.php @@ -669,6 +669,12 @@ class EventsListWidget extends Widget true ); + $output .= \html_print_input_hidden( + 'delete_confirm_message', + __('Are you sure?'), + true + ); + $table = new \StdClass; $table->class = 'widget_groups_status databox'; $table->cellspacing = '1'; From 61713b453a0ad96f2e685264a751f806b504862a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Thu, 24 Mar 2022 13:53:22 +0100 Subject: [PATCH 06/14] Added control for ascii characters --- .../include/class/CredentialStore.class.php | 8 ++-- .../include/graphs/functions_utils.php | 40 +++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/class/CredentialStore.class.php b/pandora_console/include/class/CredentialStore.class.php index 5919eef8f0..27486433ee 100644 --- a/pandora_console/include/class/CredentialStore.class.php +++ b/pandora_console/include/class/CredentialStore.class.php @@ -623,11 +623,13 @@ class CredentialStore extends Wizard $error = __('You must select a group where store this key!'); } else if (empty($product) === true) { $error = __('You must specify a product type'); - } else if (empty($username) === true && (empty($password) === true)) { + } else if (empty($username) === true || (empty($password) === true)) { $error = __('You must specify a username and/or password'); + } else if (evaluate_ascii_valid_string(io_safe_output($identifier)) === false) { + $error = __('Identifier with forbidden characters. Check the documentation.'); } - if (isset($error)) { + if (isset($error) === true) { $this->ajaxMsg('error', $error); exit; } @@ -1277,7 +1279,7 @@ class CredentialStore extends Wizard }); } - + /** * Delete selected key */ diff --git a/pandora_console/include/graphs/functions_utils.php b/pandora_console/include/graphs/functions_utils.php index 11737099a8..e68a11a9f1 100644 --- a/pandora_console/include/graphs/functions_utils.php +++ b/pandora_console/include/graphs/functions_utils.php @@ -328,3 +328,43 @@ function convert_array_multi($array, $glue) $result = substr($result, 0, (0 - strlen($glue))); return $result; } + + +/** + * Evaluate if the chars of coming variable has in the range stablished. + * + * @param string $string String for be evaluated. + * @param array $ranges Ranges for valid chars. Min: [ x <= Y ] Max: [ Y > x ]. + * Example of valid ranges: [ '32:126', '150:188' ]. + * + * @return boolean. + */ +function evaluate_ascii_valid_string(string $string='', array $ranges=[ '33:38', '40:126' ]) +{ + if (empty($string) === true) { + return false; + } + + $countChars = strlen($string); + // Let's explore all the chars. + for ($i = 0; $i < $countChars; $i++) { + // Get ascii number of the char. + $asciiNumber = ord($string[$i]); + // Check in all ranges. + $rangeValidation = false; + foreach ($ranges as $range) { + list($minRangeValue, $maxRangeValue) = explode(':', $range, 2); + // Check if is in range. + if ($asciiNumber > (int) $minRangeValue && $asciiNumber < (int) $maxRangeValue) { + $rangeValidation = true; + } + } + + // None of the ranges was validated. + if ($rangeValidation === false) { + return false; + } + } + + return true; +} From 6ed885118852db58092aa59de4b0d297708142f3 Mon Sep 17 00:00:00 2001 From: Calvo Date: Thu, 24 Mar 2022 18:52:06 +0100 Subject: [PATCH 07/14] Fix event list widget actions on dashboard --- pandora_console/include/ajax/events.php | 73 +++++++++++++++++-- pandora_console/include/functions_events.php | 14 ++-- .../include/javascript/pandora_dashboards.js | 4 +- .../include/javascript/pandora_events.js | 4 + .../lib/Dashboard/Widgets/events_list.php | 7 ++ 5 files changed, 88 insertions(+), 14 deletions(-) diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index 45b159dae5..e74006d406 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -26,6 +26,8 @@ * ============================================================================ */ +use PandoraFMS\Enterprise\Metaconsole\Node; + // Begin. global $config; @@ -86,6 +88,7 @@ $get_event_filters = get_parameter('get_event_filters', 0); $get_comments = (bool) get_parameter('get_comments', false); $get_events_fired = (bool) get_parameter('get_events_fired'); $get_id_source_event = get_parameter('get_id_source_event'); +$node_id = (int) get_parameter('node_id', 0); if ($get_comments === true) { $event = get_parameter('event', false); $filter = get_parameter('filter', false); @@ -195,7 +198,23 @@ if ($delete_event) { return; } - $r = events_delete($id_evento, $filter); + if ($node_id > 0) { + try { + $node = new Node($node_id); + $node->connect(); + $r = events_delete($id_evento, $filter, false, true); + } catch (\Exception $e) { + // Unexistent agent. + $node->disconnect(); + $success = false; + echo 'owner_error'; + } finally { + $node->disconnect(); + } + } else { + $r = events_delete($id_evento, $filter); + } + if ($r === false) { echo 'Failed'; } else { @@ -1261,12 +1280,32 @@ if ($change_status) { $event_ids = get_parameter('event_ids'); $new_status = get_parameter('new_status'); - $return = events_change_status( - explode(',', $event_ids), - $new_status, - $meta, - $history - ); + if ($node_id > 0) { + try { + $node = new Node($node_id); + $node->connect(); + $return = events_change_status( + explode(',', $event_ids), + $new_status, + $meta, + $history + ); + } catch (\Exception $e) { + // Unexistent agent. + $node->disconnect(); + $success = false; + echo 'owner_error'; + } finally { + $node->disconnect(); + } + } else { + $return = events_change_status( + explode(',', $event_ids), + $new_status, + $meta, + $history + ); + } if ($return !== false) { $event_st = events_display_status($new_status); @@ -1310,7 +1349,22 @@ if ($change_owner) { $new_owner = ''; } - $return = events_change_owner($event_id, $new_owner, true, $meta, $history); + if ($node_id > 0) { + try { + $node = new Node($node_id); + $node->connect(); + $return = events_change_owner($event_id, $new_owner, true, $meta, $history); + } catch (\Exception $e) { + // Unexistent agent. + $node->disconnect(); + $success = false; + echo 'owner_error'; + } finally { + $node->disconnect(); + } + } else { + $return = events_change_owner($event_id, $new_owner, true, $meta, $history); + } if ($return) { echo 'owner_ok'; @@ -1415,6 +1469,9 @@ if ($get_extended_event) { // Print group_rep in a hidden field to recover it from javascript. html_print_input_hidden('group_rep', (int) $group_rep); + if ($node_id > 0) { + html_print_input_hidden('node_id', (int) $node_id); + } if ($event === false) { return; diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 879c36c38e..10a77f9d5c 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -352,13 +352,14 @@ function events_get_column_names($fields, $table_alias=false) /** * Validates all events matching target filter. * - * @param integer $id_evento Master event. - * @param array $filter Optional. Filter options. - * @param boolean $history Apply on historical table. + * @param integer $id_evento Master event. + * @param array $filter Optional. Filter options. + * @param boolean $history Apply on historical table. + * @param boolean $force_node Force node table. * * @return integer Events validated or false if error. */ -function events_delete($id_evento, $filter=null, $history=false) +function events_delete($id_evento, $filter=null, $history=false, $force_node=false) { if (!isset($id_evento) || $id_evento <= 0) { return false; @@ -368,7 +369,10 @@ function events_delete($id_evento, $filter=null, $history=false) $filter = ['group_rep' => 0]; } - $table = events_get_events_table(is_metaconsole(), $history); + $table = events_get_events_table( + ($force_node === false) ? is_metaconsole() : false, + $history + ); switch ($filter['group_rep']) { case '0': diff --git a/pandora_console/include/javascript/pandora_dashboards.js b/pandora_console/include/javascript/pandora_dashboards.js index a0f8f0a5d5..928896ef90 100644 --- a/pandora_console/include/javascript/pandora_dashboards.js +++ b/pandora_console/include/javascript/pandora_dashboards.js @@ -1313,7 +1313,8 @@ function dashboardShowEventDialog(settings) { dialog_page: "", meta: 0, history: 0, - filter: [] + filter: [], + node_id: settings.node_id }, dataType: "html", success: function(data) { @@ -1339,6 +1340,7 @@ function dashboardShowEventDialog(settings) { data: { page: "include/ajax/events", delete_event: 1, + node_id: settings.node_id, id_evento: settings.event.id_evento, filter: [] }, diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js index 86107bb03d..eda55136f5 100644 --- a/pandora_console/include/javascript/pandora_events.js +++ b/pandora_console/include/javascript/pandora_events.js @@ -476,6 +476,7 @@ function event_change_status(event_ids) { var new_status = $("#estado").val(); var meta = $("#hidden-meta").val(); var history = $("#hidden-history").val(); + var node_id = $("#hidden-node_id").val(); $("#button-status_button").attr("disabled", "disabled"); $("#response_loading").show(); @@ -487,6 +488,7 @@ function event_change_status(event_ids) { event_ids: event_ids, new_status: new_status, meta: meta, + node_id: node_id, history: history }, type: "POST", @@ -540,6 +542,7 @@ function event_change_owner() { var new_owner = $("#id_owner").val(); var meta = $("#hidden-meta").val(); var history = $("#hidden-history").val(); + var node_id = $("#hidden-node_id").val(); $("#button-owner_button").attr("disabled", "disabled"); $("#response_loading").show(); @@ -551,6 +554,7 @@ function event_change_owner() { event_id: event_id, new_owner: new_owner, meta: meta, + node_id: node_id, history: history }, type: "POST", diff --git a/pandora_console/include/lib/Dashboard/Widgets/events_list.php b/pandora_console/include/lib/Dashboard/Widgets/events_list.php index 21336e7419..e0c1bfe3cf 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/events_list.php +++ b/pandora_console/include/lib/Dashboard/Widgets/events_list.php @@ -669,6 +669,12 @@ class EventsListWidget extends Widget true ); + $output .= \html_print_input_hidden( + 'meta', + is_metaconsole(), + true + ); + $output .= \html_print_input_hidden( 'delete_confirm_message', __('Are you sure?'), @@ -737,6 +743,7 @@ class EventsListWidget extends Widget 'dashboardId' => $this->dashboardId, 'widgetId' => $this->widgetId, 'cellId' => $this->cellId, + 'node_id' => $this->nodeId, ] ); From 1e7a73829a6609cde4db36220424567ad621e62b Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Thu, 24 Mar 2022 19:23:35 +0100 Subject: [PATCH 08/14] added missing timestamp to pandora_db process on historical database --- pandora_server/util/pandora_db.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index f4fe7f88d7..617db0ab49 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -1079,6 +1079,10 @@ sub pandoradb_history ($$) { log_message ('', "\n"); } + # Update tconfig with last time of database maintance time (now) + db_do ($dbh, "DELETE FROM tconfig WHERE token = 'db_maintance'"); + db_do ($dbh, "INSERT INTO tconfig (token, value) VALUES ('db_maintance', '".time()."')"); + log_message ('', "Ending at ". strftime ("%Y-%m-%d %H:%M:%S", localtime()) . "\n"); } From 5e6bdaeb1592f8b108980757ecf6f376a9f092d2 Mon Sep 17 00:00:00 2001 From: Calvo Date: Fri, 25 Mar 2022 14:05:38 +0100 Subject: [PATCH 09/14] Fix events dashboard user owner entities --- pandora_console/include/ajax/events.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index e74006d406..04bb68a2a8 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -1380,9 +1380,11 @@ if ($change_owner) { if ($get_extended_event) { global $config; - $event = get_parameter('event', false); + $event = io_safe_output(get_parameter('event', false)); $filter = get_parameter('filter', false); + $event = io_safe_output($event); + if ($event === false) { return; } From 4109d9485351aecc4b189c7e86478c835e075180 Mon Sep 17 00:00:00 2001 From: Calvo Date: Fri, 25 Mar 2022 14:07:44 +0100 Subject: [PATCH 10/14] Fix events dashboard user owner entities --- pandora_console/include/ajax/events.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index 04bb68a2a8..8daf7bb786 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -1383,8 +1383,6 @@ if ($get_extended_event) { $event = io_safe_output(get_parameter('event', false)); $filter = get_parameter('filter', false); - $event = io_safe_output($event); - if ($event === false) { return; } From b7923fe4941e97c5dc76f5ee854dfc3569083263 Mon Sep 17 00:00:00 2001 From: Calvo Date: Mon, 28 Mar 2022 11:18:08 +0200 Subject: [PATCH 11/14] Added files repo error information for post_max_size and upload_max_filesize --- pandora_console/extensions/files_repo.php | 2 +- pandora_console/include/functions.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pandora_console/extensions/files_repo.php b/pandora_console/extensions/files_repo.php index 34e5fe52d2..c319954748 100644 --- a/pandora_console/extensions/files_repo.php +++ b/pandora_console/extensions/files_repo.php @@ -145,7 +145,7 @@ function pandora_files_repo_godmode() // Check for an anoying error that causes the $_POST and $_FILES arrays. // were empty if the file is larger than the post_max_size. if (intval($server_content_length) > 0 && empty($_POST)) { - ui_print_error_message(__('The file exceeds the maximum size')); + ui_print_error_message(__('Problem uploading. Please check this PHP runtime variable values: 
  post_max_size (currently '.ini_get('post_max_size').')
')); } // GET and POST parameters. diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index c4f3e5ef3e..82f5ea6cca 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -2887,6 +2887,7 @@ function translate_file_upload_status($status_code) case UPLOAD_ERR_INI_SIZE: $message = __('The file exceeds the maximum size'); + $message .= __('Please check this PHP runtime variable values: 
  upload_max_filesize (currently '.ini_get('upload_max_filesize').')
'); break; case UPLOAD_ERR_FORM_SIZE: From 44e93fa1ed23d346423c5c4780bcd81e9a0ffa34 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 28 Mar 2022 13:48:33 +0200 Subject: [PATCH 12/14] #8693 Emptying collate for alias and nombre --- pandora_console/extras/mr/53.sql | 3 +++ pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pandora_console/extras/mr/53.sql b/pandora_console/extras/mr/53.sql index dfb7976a91..bb7431fdea 100644 --- a/pandora_console/extras/mr/53.sql +++ b/pandora_console/extras/mr/53.sql @@ -2,6 +2,9 @@ START TRANSACTION; ALTER TABLE `tipam_vlan` ADD COLUMN `custom_id` bigint(20) unsigned DEFAULT NULL; +ALTER TABLE tagente MODIFY alias varchar(600) NOT NULL DEFAULT ''; +ALTER TABLE tagente MODIFY nombre varchar(600) NOT NULL DEFAULT ''; + UPDATE `tuser_task` SET `parameters` = 'a:3:{i:0;a:2:{s:11:"description";s:11:"Description";s:4:"type";s:4:"text";}i:1;a:3:{s:11:"description";s:20:"Save to disk in path";s:4:"type";s:6:"string";s:13:"default_value";s:21:"_%_ATTACHMENT_PATH_%_";}i:2;a:3:{s:11:"description";s:14:"Active backups";s:4:"type";s:6:"number";s:13:"default_value";i:3;}}' WHERE `function_name` = 'cron_task_do_backup'; CREATE TABLE IF NOT EXISTS `tbackup` ( diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql index 535182d147..fcedcf16ae 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql @@ -1664,7 +1664,8 @@ UPDATE tagente SET tagente.alias = tagente.nombre; ALTER TABLE `tagente` MODIFY COLUMN `remote` tinyint(1) NOT NULL DEFAULT '0', MODIFY COLUMN `cascade_protection_module` int(10) unsigned NOT NULL DEFAULT '0', MODIFY COLUMN `update_secondary_groups` tinyint(1) NOT NULL DEFAULT '0', - MODIFY COLUMN `alias` varchar(600) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '', + MODIFY COLUMN `alias` varchar(600) NOT NULL DEFAULT '', + MODIFY COLUMN `nombre` varchar(600) NOT NULL DEFAULT '', MODIFY COLUMN `alias_as_name` tinyint(2) NOT NULL DEFAULT '0'; -- --------------------------------------------------------------------- From 6bf82accadf87bb76c75c4fb2fdade69315b500d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Mon, 28 Mar 2022 17:19:36 +0200 Subject: [PATCH 13/14] Subquery needed for avoid duplicates --- pandora_console/include/functions_tactical.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/functions_tactical.php b/pandora_console/include/functions_tactical.php index 942e88832c..bfd556981b 100644 --- a/pandora_console/include/functions_tactical.php +++ b/pandora_console/include/functions_tactical.php @@ -118,6 +118,7 @@ function tactical_get_data($id_user=false, $user_strict=false, $acltags, $return $user_groups_ids = implode(',', array_unique($user_group_children_ids)); } + // Subquery is needed for avoid possible duplicity in id_agente. $sql_stats = sprintf( 'SELECT tma.id_grupo, COUNT(tma.id_agente) AS agents_total, SUM(tma.total_count) AS monitors_total, @@ -128,10 +129,12 @@ function tactical_get_data($id_user=false, $user_strict=false, $acltags, $return SUM(tma.notinit_count) AS monitors_not_init, SUM(tma.fired_count) AS alerts_fired FROM tmetaconsole_agent tma - LEFT JOIN tmetaconsole_agent_secondary_group tmasg - ON tma.id_agente = tmasg.id_agent - WHERE tma.disabled = 0 - AND tma.id_grupo IN (%s) OR tmasg.id_group IN (%s) + WHERE tma.disabled = 0 + AND tma.id_agente IN ( + SELECT DISTINCT tmag.id_agente FROM tmetaconsole_agent tmag + LEFT JOIN tmetaconsole_agent_secondary_group tmasg + ON tmag.id_agente = tmasg.id_agent WHERE tmag.id_grupo IN (%s) OR tmasg.id_group IN (%s) + ) GROUP BY tma.id_grupo', $user_groups_ids, $user_groups_ids From 01c2fd5da4cddf7e8f6cc5ccbd0d3a1b6878c5cd Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 30 Mar 2022 01:00:52 +0200 Subject: [PATCH 14/14] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 8a24454d6a..735369d2e7 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.760-220329 +Version: 7.0NG.760-220330 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 898cd02142..b2cb2ea88b 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.760-220329" +pandora_version="7.0NG.760-220330" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index ec8e331a07..631d134add 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1015,7 +1015,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.760'; -use constant AGENT_BUILD => '220329'; +use constant AGENT_BUILD => '220330'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 4575acdf79..bd18df8bce 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.760 -%define release 220329 +%define release 220330 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index b01bf8ad5d..78979d3707 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.760 -%define release 220329 +%define release 220330 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 2e174c0222..b1b855189b 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.760" -PI_BUILD="220329" +PI_BUILD="220330" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 8cbb4589b1..225f8c74a0 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{220329} +{220330} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index e20932ec6e..995f60c249 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0NG.760 Build 220329") +#define PANDORA_VERSION ("7.0NG.760 Build 220330") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 15d3f4bc94..cf91832174 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.760(Build 220329))" + VALUE "ProductVersion", "(7.0NG.760(Build 220330))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 136cfb0807..b91cb91ee5 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.760-220329 +Version: 7.0NG.760-220330 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 09d94ac540..09fdcd3c0a 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.760-220329" +pandora_version="7.0NG.760-220330" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 4b3d0460df..bf66713c09 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC220329'; +$build_version = 'PC220330'; $pandora_version = 'v7.0NG.760'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index ac2156bfcb..ed875862df 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index ae2b2c4e98..fbf38a6d51 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.760 -%define release 220329 +%define release 220330 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 76d87ee4fe..263732c362 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.760 -%define release 220329 +%define release 220330 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 673777778e..636b6f7f7b 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.760" -PI_BUILD="220329" +PI_BUILD="220330" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 51f32bcfff..4c48e40590 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.760 Build 220329"; +my $version = "7.0NG.760 Build 220330"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index aed7632f5e..6531bd7bbf 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.760 Build 220329"; +my $version = "7.0NG.760 Build 220330"; # save program name for logging my $progname = basename($0);