From b67ff002d614968923bce09aba77d60e6e016383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Su=C3=A1rez?= Date: Mon, 25 Mar 2024 15:34:16 -0600 Subject: [PATCH 01/13] Validate macros on SQL --- .../godmode/reporting/reporting_builder.php | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 38206b060c..d0c56d01a7 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -2408,10 +2408,15 @@ switch ($action) { $values['server_name'] = get_parameter('combo_server_sql'); if ($sql !== '') { + // Replaces possible macros to check the validity of the query + $macros_sql = $sql; + $macros_sql = str_replace('_start_date_', '0', $macros_sql); + $macros_sql = str_replace('_end_date_', 'NOW()', $macros_sql); + if ($values['server_name'] === 'all') { $servers_connection = metaconsole_get_connections(); foreach ($servers_connection as $key => $s) { - $good_format = db_validate_sql($sql, $s['server_name']); + $good_format = db_validate_sql($macros_sql, $s['server_name']); } // Reconnected in nodo if exist. @@ -2423,9 +2428,9 @@ switch ($action) { } } else if ($server_id === 0) { // Connect with node if not exist conexion. - $good_format = db_validate_sql($sql, (is_metaconsole() === true) ? $values['server_name'] : false); + $good_format = db_validate_sql($macros_sql, (is_metaconsole() === true) ? $values['server_name'] : false); } else { - $good_format = db_validate_sql($sql); + $good_format = db_validate_sql($macros_sql); } } } else if ($values['type'] == 'url') { @@ -3353,10 +3358,15 @@ switch ($action) { if ($sql !== '') { + // Replaces possible macros to check the validity of the query + $macros_sql = $sql; + $macros_sql = str_replace('_start_date_', '0', $macros_sql); + $macros_sql = str_replace('_end_date_', 'NOW()', $macros_sql); + if ($values['server_name'] === 'all') { $servers_connection = metaconsole_get_connections(); foreach ($servers_connection as $key => $s) { - $good_format = db_validate_sql($sql, $s['server_name']); + $good_format = db_validate_sql($macros_sql, $s['server_name']); } // Reconnected in nodo if exist. @@ -3368,9 +3378,9 @@ switch ($action) { } } else if ($server_id === 0) { // Connect with node if not exist conexion. - $good_format = db_validate_sql($sql, (is_metaconsole() === true) ? $values['server_name'] : false); + $good_format = db_validate_sql($macros_sql, (is_metaconsole() === true) ? $values['server_name'] : false); } else { - $good_format = db_validate_sql($sql); + $good_format = db_validate_sql($macros_sql); } } } else if ($values['type'] == 'url') { From f9f5548798d1bdb6d716995639573c924c15ebd8 Mon Sep 17 00:00:00 2001 From: rafael Date: Mon, 1 Apr 2024 12:53:46 +0200 Subject: [PATCH 02/13] 13256 adding new version of chromium v122 to online installer --- extras/deploy-scripts/pandora_deploy_community_el8.sh | 4 ++-- extras/deploy-scripts/pandora_deploy_community_el9.sh | 4 ++-- extras/deploy-scripts/pandora_deploy_community_ubuntu_2204.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extras/deploy-scripts/pandora_deploy_community_el8.sh b/extras/deploy-scripts/pandora_deploy_community_el8.sh index 72ee496fa0..9917f99631 100644 --- a/extras/deploy-scripts/pandora_deploy_community_el8.sh +++ b/extras/deploy-scripts/pandora_deploy_community_el8.sh @@ -394,8 +394,8 @@ console_dependencies=" \ mod_ssl \ libzstd \ openldap-clients \ - https://firefly.pandorafms.com/centos8/chromium-110.0.5481.177-1.el7.x86_64.rpm \ - https://firefly.pandorafms.com/centos8/chromium-common-110.0.5481.177-1.el7.x86_64.rpm \ + https://firefly.pandorafms.com/centos8/chromium-122.0.6261.128-1.el8.x86_64.rpm \ + https://firefly.pandorafms.com/centos8/chromium-common-122.0.6261.128-1.el8.x86_64.rpm \ https://firefly.pandorafms.com/centos8/perl-Net-Telnet-3.04-1.el8.noarch.rpm \ https://firefly.pandorafms.com/centos8/pandora_gotty-1.0-1.el8.x86_64.rpm \ https://firefly.pandorafms.com/centos8/pandorafms_made-0.1.0-1.el8.x86_64.rpm \ diff --git a/extras/deploy-scripts/pandora_deploy_community_el9.sh b/extras/deploy-scripts/pandora_deploy_community_el9.sh index 70b473b49b..738833d774 100644 --- a/extras/deploy-scripts/pandora_deploy_community_el9.sh +++ b/extras/deploy-scripts/pandora_deploy_community_el9.sh @@ -386,8 +386,8 @@ console_dependencies=" \ mod_ssl \ libzstd \ openldap-clients \ - https://firefly.pandorafms.com/centos8/chromium-110.0.5481.177-1.el7.x86_64.rpm \ - https://firefly.pandorafms.com/centos8/chromium-common-110.0.5481.177-1.el7.x86_64.rpm \ + https://firefly.pandorafms.com/centos8/chromium-122.0.6261.128-1.el8.x86_64.rpm \ + https://firefly.pandorafms.com/centos8/chromium-common-122.0.6261.128-1.el8.x86_64.rpm \ https://firefly.pandorafms.com/centos8/pandora_gotty-1.0-1.el8.x86_64.rpm \ https://firefly.pandorafms.com/centos8/pandorafms_made-0.1.0-1.el8.x86_64.rpm " execute_cmd "dnf install -y $console_dependencies" "Installing Pandora FMS Console dependencies" diff --git a/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204.sh b/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204.sh index 6d0bb69d06..4f541b4125 100644 --- a/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204.sh +++ b/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204.sh @@ -371,7 +371,7 @@ ln -s /usr/bin/fping /usr/sbin/fping &>> "$LOGFILE" # Chrome rm -f /usr/bin/chromium-browser &>> "$LOGFILE" -CHROME_VERSION=google-chrome-stable_110.0.5481.177-1_amd64.deb +CHROME_VERSION=google-chrome-stable_122.0.6261.128-1_amd64.deb execute_cmd "wget https://dl.google.com/linux/deb/pool/main/g/google-chrome-stable/${CHROME_VERSION}" "Downloading google chrome" execute_cmd "apt install -y ./${CHROME_VERSION}" "Intalling google chrome" execute_cmd "ln -s /usr/bin/google-chrome /usr/bin/chromium-browser" "Creating /usr/bin/chromium-browser Symlink" From 9bc0b4c0504457ff422f078be1fc98bacf9c4f8a Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Tue, 2 Apr 2024 11:41:47 +0200 Subject: [PATCH 03/13] 13281-Fix overflow in Defined custom graph widget --- pandora_console/include/lib/Dashboard/Widgets/custom_graph.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pandora_console/include/lib/Dashboard/Widgets/custom_graph.php b/pandora_console/include/lib/Dashboard/Widgets/custom_graph.php index 4cb4734105..29c5c17372 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/custom_graph.php +++ b/pandora_console/include/lib/Dashboard/Widgets/custom_graph.php @@ -504,9 +504,8 @@ class CustomGraphWidget extends Widget break; case CUSTOM_GRAPH_VBARS: - $style = 'padding: 10px;'; $height = $size['height']; - $output = '
'; + $output = '
'; break; case CUSTOM_GRAPH_GAUGE: From 833dfcc62ac19c06e5f8f29b288b122e03d22e76 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Tue, 2 Apr 2024 11:42:38 +0200 Subject: [PATCH 04/13] 13281-Remove console.log --- pandora_console/include/javascript/qrcode.js | 1 - 1 file changed, 1 deletion(-) diff --git a/pandora_console/include/javascript/qrcode.js b/pandora_console/include/javascript/qrcode.js index 33f38e1b6f..c807ffe94f 100644 --- a/pandora_console/include/javascript/qrcode.js +++ b/pandora_console/include/javascript/qrcode.js @@ -2413,7 +2413,6 @@ date: 2018-05-14 15:05:04 }); } - console.log(vCard); formattedVCardString += "FN" + encodingPrefix + ":" + e(formattedName) + nl(); formattedVCardString += From 22c1e5a9edc9856d1a6e1d4dd88f5a4db4c5e716 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Tue, 2 Apr 2024 15:03:26 +0200 Subject: [PATCH 05/13] 13215-Fix select2 into modal in Alerts actions --- pandora_console/godmode/alerts/alert_list.list.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index 2d8b092471..d6be411c3d 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -1333,10 +1333,10 @@ function show_display_update_action(id_module_action, alert_id, alert_id_agent_m }, open: function() { $(`#update_action-div-${alert_id}`).css('overflow', 'hidden'); - //$(`#action_select_ajax-${alert_id}`).select2({ - // tags: true, - // dropdownParent: $(`#update_action-div-${alert_id}`) - //}); + $(`#update_action-div-${alert_id} select`).select2({ + tags: true, + dropdownParent: $(this).parent() + }); }, width: 600, height: 350 From ea3717b69387a3af26620fcc0785eb287cb9f332 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Tue, 2 Apr 2024 19:10:47 +0200 Subject: [PATCH 06/13] 13299-Change empty server list message --- pandora_console/godmode/servers/servers.build_table.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php index 7a651a7a43..45e5c0e596 100644 --- a/pandora_console/godmode/servers/servers.build_table.php +++ b/pandora_console/godmode/servers/servers.build_table.php @@ -49,8 +49,8 @@ $date = time(); $servers = servers_get_info(); if ($servers === false) { - $server_clippy = clippy_context_help('servers_down'); - echo "
".__('There are no servers configured into the database').$server_clippy.'
'; + $no_data_msg = __('There are no servers configured into the database').'
'.__('All servers down. Can you up all servers. You go to terminal in linux and execute the next command: "sudo /etc/init.d/pandora_server restart". It\'s possible need introduce root pass.'); + ui_print_info_message($no_data_msg); return; } From ada98364181df42a730b27c518b152c6c0ca1c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Su=C3=A1rez?= Date: Tue, 2 Apr 2024 17:21:10 -0600 Subject: [PATCH 07/13] Changes to avoid injection --- pandora_console/include/functions_io.php | 4 ++++ pandora_server/lib/PandoraFMS/Tools.pm | 1 + pandora_server/util/pandora_manage.pl | 2 ++ 3 files changed, 7 insertions(+) diff --git a/pandora_console/include/functions_io.php b/pandora_console/include/functions_io.php index a58c77fc62..a3b08230a8 100755 --- a/pandora_console/include/functions_io.php +++ b/pandora_console/include/functions_io.php @@ -90,6 +90,10 @@ function io_safe_input($value) $value = utf8_encode($value); } + if (preg_match('/<\/?script(.*?)>/', $value)) { + $value = preg_replace('/<\/?script(.*?)>/', '', $value); + } + $valueHtmlEncode = htmlentities(($value ?? ''), ENT_QUOTES, 'UTF-8', true); // Replace the character '\' for the equivalent html entitie diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm index 43b7db611b..b2a11e3ab0 100755 --- a/pandora_server/lib/PandoraFMS/Tools.pm +++ b/pandora_server/lib/PandoraFMS/Tools.pm @@ -647,6 +647,7 @@ sub safe_input($) { return "" unless defined($value); + $value =~ s/<\/?script(.*?)>//gs; $value =~ s/(.)/$CHR2ENT{$1}||$1/ge; return $value; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 6ac06feae0..aa6e800097 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -3429,6 +3429,8 @@ sub cli_agent_update() { my @id_agents; my $id_agent; + $new_value = safe_input($new_value); + if (defined $use_alias and $use_alias eq 'use_alias') { @id_agents = get_agent_ids_from_alias($dbh,$agent_name); foreach my $id (@id_agents) { From a0d6f6c40784a12bcc52d33192bba2c537725c5f Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Wed, 3 Apr 2024 09:12:42 +0200 Subject: [PATCH 08/13] 13285-Fix controls in full screen dashboards --- pandora_console/include/styles/dashboards.css | 3 +- .../include/styles/pandora_black.css | 11 ++++++ pandora_console/views/dashboard/slides.php | 36 +++++++++++++++---- 3 files changed, 43 insertions(+), 7 deletions(-) diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css index 00a780be6d..fb53e37c35 100644 --- a/pandora_console/include/styles/dashboards.css +++ b/pandora_console/include/styles/dashboards.css @@ -450,7 +450,8 @@ li#search_input_widget { } div#dashboard-controls-slides { - width: 720px !important; + min-width: 720px; + text-wrap: nowrap; } div#dashboard-controls, diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index 80032efbb7..0d759395b8 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -1892,3 +1892,14 @@ a.link-bold { text-decoration: none; font-weight: bold; } + +div#dashboard-controls-slides { + background-color: #333; +} + +div#dashboard-controls-slides + .select2-container + .select2-selection--single + .select2-selection__rendered { + color: var(--text-color) !important; +} diff --git a/pandora_console/views/dashboard/slides.php b/pandora_console/views/dashboard/slides.php index eda18b0000..5c869fbdde 100644 --- a/pandora_console/views/dashboard/slides.php +++ b/pandora_console/views/dashboard/slides.php @@ -200,7 +200,10 @@ $output .= ''; $output .= html_print_image( 'images/control_prev.png', true, - ['title' => __('Previous')] + [ + 'title' => __('Previous'), + 'class' => 'invert_filter', + ] ); $output .= ''; $output .= '
'; @@ -215,7 +218,10 @@ $output .= ''; $output .= html_print_image( 'images/control_stop.png', true, - ['title' => __('Stop')] + [ + 'title' => __('Stop'), + 'class' => 'invert_filter', + ] ); $output .= ''; $output .= '
'; @@ -226,7 +232,10 @@ $output .= ''; $output .= html_print_image( 'images/control_pause.png', true, - ['title' => __('Pause')] + [ + 'title' => __('Pause'), + 'class' => 'invert_filter', + ] ); $output .= ''; $output .= ''; @@ -237,7 +246,10 @@ $output .= ''; $output .= html_print_image( 'images/control_next.png', true, - ['title' => __('Next')] + [ + 'title' => __('Next'), + 'class' => 'invert_filter', + ] ); $output .= ''; $output .= ''; @@ -249,14 +261,20 @@ if ($cellModeSlides === 0) { $output .= html_print_image( 'images/visual_console.png', true, - ['title' => __('Boxed mode')] + [ + 'title' => __('Boxed mode'), + 'class' => 'invert_filter', + ] ); $msg_tooltip = __('This mode will show the dashboard with all the widgets in the screen. Click to change to single screen mode.'); } else { $output .= html_print_image( 'images/dashboard.png', true, - ['title' => __('Single screen')] + [ + 'title' => __('Single screen'), + 'class' => 'invert_filter', + ] ); $msg_tooltip = __('This mode will show each widget in a screen, rotating between elements in each dashboard. Click to change to boxed mode.'); } @@ -275,5 +293,11 @@ $output .= '
'.$name.'
'; $output .= ''; $output .= ''; +$output .= ' + +'; echo $output; From 8a022c6d1fb1dfa0abf3f67998d913d5e26f60c1 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Wed, 3 Apr 2024 12:53:13 +0200 Subject: [PATCH 09/13] 13299-Change empty server list message --- pandora_console/godmode/servers/servers.build_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php index 45e5c0e596..bbd77f7b14 100644 --- a/pandora_console/godmode/servers/servers.build_table.php +++ b/pandora_console/godmode/servers/servers.build_table.php @@ -49,7 +49,7 @@ $date = time(); $servers = servers_get_info(); if ($servers === false) { - $no_data_msg = __('There are no servers configured into the database').'
'.__('All servers down. Can you up all servers. You go to terminal in linux and execute the next command: "sudo /etc/init.d/pandora_server restart". It\'s possible need introduce root pass.'); + $no_data_msg = __('There are no servers registered on the database. Please, check the configuration and start the Pandora Server service'); ui_print_info_message($no_data_msg); return; } From 22b53d2cb1291cf0a168b34b76bf0da0182ef8db Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Wed, 3 Apr 2024 14:55:41 +0200 Subject: [PATCH 10/13] 13215-Fix select2 into modal in Alerts actions --- pandora_console/godmode/alerts/alert_list.list.php | 1 - 1 file changed, 1 deletion(-) diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index d6be411c3d..bfab15382d 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -1334,7 +1334,6 @@ function show_display_update_action(id_module_action, alert_id, alert_id_agent_m open: function() { $(`#update_action-div-${alert_id}`).css('overflow', 'hidden'); $(`#update_action-div-${alert_id} select`).select2({ - tags: true, dropdownParent: $(this).parent() }); }, From a23978e54103b07b7ce6376e3890fe91d5a537ca Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Wed, 3 Apr 2024 15:08:06 +0200 Subject: [PATCH 11/13] 13296-Fix next button with same name in Alerts->Templates --- pandora_console/godmode/alerts/configure_alert_template.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php index 5bd57522fd..33ed7b6dca 100644 --- a/pandora_console/godmode/alerts/configure_alert_template.php +++ b/pandora_console/godmode/alerts/configure_alert_template.php @@ -350,7 +350,8 @@ function update_template($step) 'previous_name' => $previous_name, ]; - if ($name_check === false) { + $original_name = db_get_value('name', 'talert_templates', 'id', $id); + if ($name_check === false || $original_name === $name_check) { $result = alerts_update_alert_template($id, $values); } else { ui_print_warning_message(__('Another template with the same name already exists')); From 6d1410d4308fa3dafc28182d19a571592b680176 Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 4 Apr 2024 01:00:07 +0200 Subject: [PATCH 12/13] 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.redhat_bin.el8.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.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 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 2f68d61fa0..49a0183938 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.776-240403 +Version: 7.0NG.776-240404 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 2ead6c3ea5..8bb7b260a7 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.776-240403" +pandora_version="7.0NG.776-240404" 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 a28c816f2e..5d3739cf0a 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1039,7 +1039,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.776'; -use constant AGENT_BUILD => '240403'; +use constant AGENT_BUILD => '240404'; # 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 fe4e8523ca..b0ba0ab82d 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240403 +%define release 240404 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec index 75392b5824..a367cc3aad 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240403 +%define release 240404 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec index 7e7b99ee68..abf4fb7654 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240403 +%define release 240404 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index 68b9e1e803..a4079517e7 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240403 +%define release 240404 Summary: Pandora FMS Linux agent, binary version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index d347fc2a5a..f16c6773a5 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240403 +%define release 240404 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 945445dbcc..6393c44e2f 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240403" +PI_BUILD="240404" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 82a73d292f..3c78f290ea 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{240403} +{240404} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 0c2965d723..c3675292b4 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.776 Build 240403") +#define PANDORA_VERSION ("7.0NG.776 Build 240404") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 848f06553e..374f404f59 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Pandora FMS" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.776(Build 240403))" + VALUE "ProductVersion", "(7.0NG.776(Build 240404))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 705c240e87..d651c78e45 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.776-240403 +Version: 7.0NG.776-240404 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 4958e0ca16..5e4f8f1baa 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.776-240403" +pandora_version="7.0NG.776-240404" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index d2ca4aae78..cf561c9b3c 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ use DI\ContainerBuilder; /* * Pandora build version and version */ -$build_version = 'PC240403'; +$build_version = 'PC240404'; $pandora_version = 'v7.0NG.776'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index bb494bfa08..952d8931b5 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index c0d537f9c8..39c69c63d7 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -7,7 +7,7 @@ %define debug_package %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240403 +%define release 240404 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 4490d3ce94..bfb5725669 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240403 +%define release 240404 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 238f088cec..7e1d429362 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240403" +PI_BUILD="240404" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 717d5973d4..101a9a9ddb 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -38,7 +38,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.776 Build 240403"; +my $version = "7.0NG.776 Build 240404"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 6ac06feae0..1afcb4ad3d 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.776 Build 240403"; +my $version = "7.0NG.776 Build 240404"; # save program name for logging my $progname = basename($0); From d03afac8826ca46273d056a939a7ac575829c686 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Thu, 4 Apr 2024 10:06:06 +0200 Subject: [PATCH 13/13] #13267 fixed columns --- pandora_console/godmode/reporting/reporting_builder.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 38206b060c..1a8f62015b 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -911,7 +911,7 @@ switch ($action) { // Admin options only for RM flag. - if (check_acl($config['id_user'], 0, 'RM')) { + if (check_acl($config['id_user'], 0, 'RR')) { $table->head[$next] = __('Private'); $table->headstyle[$next] = 'min-width: 40px;text-align: left;'; $table->size[$next] = '2%'; @@ -929,7 +929,7 @@ switch ($action) { $next++; $op_column = false; - if (is_metaconsole() === false) { + if (is_metaconsole() === false && check_acl($config['id_user'], 0, 'RM')) { $op_column = true; $table->head[$next] = ''.__('Op.').''.html_print_checkbox( 'all_delete', @@ -1082,7 +1082,7 @@ switch ($action) { } // Admin options only for RM flag. - if (check_acl($config['id_user'], 0, 'RM')) { + if (check_acl($config['id_user'], 0, 'RR')) { if ($report['private'] == 1) { $data[$next] = __('Yes'); } else {