Merge branch 'develop' into ent-13314-bordes-blancos-en-tema-negro-de-la-tactical-view-son-muy-feos

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-122.0.6261.128-1.el8.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-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 \

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-122.0.6261.128-1.el8.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-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"

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"

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

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

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;

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}

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

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

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}

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}

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

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{240403}
+{240404}
 
 ViewReadme
 {Yes}

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;

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

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

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

pandora_console/godmode/alerts/alert_list.list.php

@@ -1333,10 +1333,9 @@ 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({
+                        $(`#update_action-div-${alert_id} select`).select2({
-                        //    tags: true,
+                           dropdownParent: $(this).parent()
-                        //    dropdownParent: $(`#update_action-div-${alert_id}`)
+                        });
-                        //});
                     },
                     width: 600,
                     height: 350

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'));

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] = '<span title="Operations">'.__('Op.').'</span>'.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 {
@@ -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') {

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');
+    $no_data_msg = __('There are no servers registered on the database. Please, check the configuration and start the Pandora Server service');
-    echo "<div class='nf'>".__('There are no servers configured into the database').$server_clippy.'</div>';
+    ui_print_info_message($no_data_msg);
     return;
 }
 

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.

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

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 +=

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 = '<div class="container-center" style="'.$style.'">';
+                $output = '<div class="container-center">';
             break;
 
             case CUSTOM_GRAPH_GAUGE:

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,

pandora_console/include/styles/pandora_black.css

@@ -1893,6 +1893,17 @@ a.link-bold {
   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;
+}
+
 #general-tactical-view * {
   border-color: #333 !important;
 }

pandora_console/install.php

@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.776';
-            $build = '240403';
+            $build = '240404';
             $banner = "v$version Build $build";
             error_reporting(0);
 

pandora_console/pandora_console.redhat.spec

@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.776
-%define release     240403
+%define release     240404
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.rhel7.spec

@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.776
-%define release     240403
+%define release     240404
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.776
-%define release     240403
+%define release     240404
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/views/dashboard/slides.php

@@ -200,7 +200,10 @@ $output .= '<a id="prev-slide" href="'.$prev_slides_url.'">';
 $output .= html_print_image(
     'images/control_prev.png',
     true,
-    ['title' => __('Previous')]
+    [
+        'title' => __('Previous'),
+        'class' => 'invert_filter',
+    ]
 );
 $output .= '</a>';
 $output .= '</div>';
@@ -215,7 +218,10 @@ $output .= '<a href="'.$url.'&'.$stop_slides_url.'">';
 $output .= html_print_image(
     'images/control_stop.png',
     true,
-    ['title' => __('Stop')]
+    [
+        'title' => __('Stop'),
+        'class' => 'invert_filter',
+    ]
 );
 $output .= '</a>';
 $output .= '</div>';
@@ -226,7 +232,10 @@ $output .= '<a id="pause-btn" href="javascript:;">';
 $output .= html_print_image(
     'images/control_pause.png',
     true,
-    ['title' => __('Pause')]
+    [
+        'title' => __('Pause'),
+        'class' => 'invert_filter',
+    ]
 );
 $output .= '</a>';
 $output .= '</div>';
@@ -237,7 +246,10 @@ $output .= '<a id="next-slide" href="'.$next_slides_url.'">';
 $output .= html_print_image(
     'images/control_next.png',
     true,
-    ['title' => __('Next')]
+    [
+        'title' => __('Next'),
+        'class' => 'invert_filter',
+    ]
 );
 $output .= '</a>';
 $output .= '</div>';
@@ -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 .= '<div class="dashboard-title"><b>'.$name.'</b></div>';
 $output .= '</div>';
 
 $output .= '</div>';
+$output .= '
+<script>
+var controls = document.querySelector("#dashboard-controls-slides");
+autoHideElement(controls, 1000);
+</script>
+';
 
 echo $output;

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.776-240403
+Version: 7.0NG.776-240404
 Architecture: all
 Priority: optional
 Section: admin

pandora_server/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_cpan=0
 package_pandora=1

pandora_server/lib/PandoraFMS/Config.pm

@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.776";
-my $pandora_build = "240403";
+my $pandora_build = "240404";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

pandora_server/lib/PandoraFMS/PluginTools.pm

@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.776";
-my $pandora_build = "240403";
+my $pandora_build = "240404";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );

pandora_server/lib/PandoraFMS/Tools.pm

@@ -648,6 +648,7 @@ sub safe_input($) {
 
 	return "" unless defined($value);
 
+    $value =~ s/<\/?script(.*?)>//gs;
 	$value =~ s/(.)/$CHR2ENT{$1}||$1/ge;
 	
 	return $value;

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}

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}

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

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;

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);
@@ -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) {