Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria

Conflicts:
	pandora_console/extras/mr/32.sql

extras/docker/build_and_push.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
 docker build --rm=true --pull --no-cache --build-arg BRANCH="develop" --build-arg DB_PASS="pandora" -t pandorafms/pandorafms:7 . && \
+[ "$QA_ENV" == "" ] && \
 docker push pandorafms/pandorafms:7

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.738-190913
+Version: 7.0NG.738-190924
 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.738-190913"
+pandora_version="7.0NG.738-190924"
 
 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

@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.738';
-use constant AGENT_BUILD => '190913';
+use constant AGENT_BUILD => '190924';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;

pandora_agents/unix/pandora_agent.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.738
-%define release     190913
+%define release     190924
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.738
-%define release     190913
+%define release     190924
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.738"
-PI_BUILD="190913"
+PI_BUILD="190924"
 OS_NAME=`uname -s`
 
 FORCE=0
@@ -162,7 +162,15 @@ uninstall () {
 	rm -Rf $PANDORA_BASE$PANDORA_EXEC_BIN 2> /dev/null
 	rm -Rf $PANDORA_BASE$PANDORA_REVENT_BIN 2> /dev/null
 	rm -f  $DESTDIR/etc/logrotate.d/pandora_agent
-	
+
+	# Remove systemd service if exists
+	if [ $(systemctl --v | grep systemd | wc -l) != 0 ]
+	then
+		PANDORA_AGENT_SERVICE="/etc/systemd/system/pandora_agent_daemon.service"
+		rm -f $PANDORA_AGENT_SERVICE
+		systemctl reset-failed
+	fi
+
 	#Test if exist Pandora Server in this machine
 	if [ -d $PANDORA_BASE$PANDORA_TEMP/data_in ]
 	then
@@ -465,6 +473,22 @@ install () {
 			else
 				RCDIRS="/etc/rc2.d /etc/rc3.d"
 			fi
+
+			# Create systemd service
+			if [ $(systemctl --v | grep systemd | wc -l) != 0 ]
+			then
+				echo "Creating systemd service for pandora_agent_daemon"
+
+				PANDORA_AGENT_SERVICE="/etc/systemd/system/pandora_agent_daemon.service"
+				EXEC_START='ExecStart='$PANDORA_BASE$PANDORA_BIN' '$PANDORA_BASE$PANDORA_CFG
+
+				rm -f $PANDORA_AGENT_SERVICE
+				cp pandora_agent_daemon.service $PANDORA_AGENT_SERVICE
+
+				sed -i "s|^ExecStart=.*$|$EXEC_START|g" $PANDORA_AGENT_SERVICE
+
+				systemctl daemon-reload
+			fi
 		fi
 		[ "$RCDIRS" ] && for RCDIR in $RCDIRS
 		do

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190913}
+{190924}
 
 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.738(Build 190913)")
+#define PANDORA_VERSION ("7.0NG.738(Build 190924)")
 
 string pandora_path;
 string pandora_dir;

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.738(Build 190913))"
+      VALUE "ProductVersion", "(7.0NG.738(Build 190924))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.738-190913
+Version: 7.0NG.738-190924
 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.738-190913"
+pandora_version="7.0NG.738-190924"
 
 package_pear=0
 package_pandora=1

pandora_console/extras/mr/32.sql

@@ -1,5 +1,16 @@
 START TRANSACTION;
 
+ALTER TABLE `tdatabase` MODIFY `last_error` text;
+ALTER TABLE `tdatabase` MODIFY `host` VARCHAR(255) DEFAULT '';
+ALTER TABLE `tdatabase` ADD COLUMN `label` VARCHAR(255) DEFAULT '';
+ALTER TABLE `tdatabase` MODIFY `os_user` VARCHAR(255) DEFAULT '';
+ALTER TABLE `tdatabase` MODIFY `db_port` INT UNSIGNED NOT NULL DEFAULT 3306;
+ALTER TABLE `tdatabase` MODIFY `os_port` INT UNSIGNED NOT NULL DEFAULT 22;
+ALTER TABLE `tdatabase` ADD COLUMN `ssh_key` TEXT;
+ALTER TABLE `tdatabase` ADD COLUMN `ssh_pubkey` TEXT;
+
+UPDATE `tdatabase` set `label`=`host`;
+
 UPDATE `tlayout_data` SET `height` = 70 , `width` = 70 WHERE `height` = 0 && `width` = 0 && image NOT LIKE '%dot%' && ((`type` IN (0,5)) ||
 (`type` = 10 && `image` IS NOT NULL && `image` != '' && `image` != 'none') ||
 (`type` = 11 && `image` IS NOT NULL && `image` != '' && `image` != 'none' && `show_statistics` = 0));
@@ -19,4 +30,10 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('incident_status', '');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('incident_title', '');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('incident_content', '');
 
-COMMIT;
+COMMIT;
+
+ALTER TABLE `treport_content` ADD COLUMN `uncompressed_module` TINYINT DEFAULT '0';
+ALTER TABLE `treport_content_template` ADD COLUMN `uncompressed_module` TINYINT DEFAULT '0';
+
+
+COMMIT;

pandora_console/extras/pandora_diag.php

@@ -726,7 +726,7 @@ render_info_data(
     echo "<tr><th style='background-color:#b1b1b1;font-weight:bold;font-style:italic;border-radius:2px;' align=center colspan='2'>".__(' Pandora FMS Licence Information').'</th></tr>';
 
     render_row(html_print_textarea('keys[customer_key]', 10, 255, $settings->customer_key, 'style="height:40px; width:450px;"', true), 'Customer key');
-    render_row($license['expiry_date'], 'Expires');
+    render_row($license['expiry_date'], $license['expiry_caption']);
     render_row($license['limit'].' agents', 'Platform Limit');
     render_row($license['count'].' agents', 'Current Platform Count');
     render_row($license['count_enabled'].' agents', 'Current Platform Count (enabled: items)');

pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

@@ -219,14 +219,17 @@ CREATE TABLE IF NOT EXISTS `tdashboard` (
 -- Table `tdatabase`
 -- ---------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tdatabase` (
-	`id` int(10) unsigned NOT NULL auto_increment,
+	`id` INT(10) unsigned NOT NULL auto_increment,
-	`host` varchar(100) default '',
+	`host` VARCHAR(255) default '',
-	`os_port` int(4) unsigned default '22',
+	`label` VARCHAR(255) default '',
-	`os_user` varchar(100) default '',
+	`os_port` INT UNSIGNED NOT NULL DEFAULT 22,
-	`db_port` int(4) unsigned default '3306',
+	`os_user` VARCHAR(255) default '',
+	`db_port` INT UNSIGNED NOT NULL DEFAULT 3306,
 	`status` tinyint(1) unsigned default '0',
 	`action` tinyint(1) unsigned default '0',
-	`last_error` varchar(255) default '',
+	`ssh_key` TEXT,
+	`ssh_pubkey` TEXT,
+	`last_error` TEXT,
 	PRIMARY KEY (`id`)
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8 ;
 
@@ -798,6 +801,7 @@ ALTER TABLE `treport_content_template` ADD COLUMN `agent_min_value` TINYINT(1) D
 ALTER TABLE `treport_content_template` ADD COLUMN `current_month` TINYINT(1) DEFAULT '1';
 ALTER TABLE `treport_content_template` ADD COLUMN `failover_mode` tinyint(1) DEFAULT '1';
 ALTER TABLE `treport_content_template` ADD COLUMN `failover_type` tinyint(1) DEFAULT '1';
+ALTER TABLE `treport_content_template` ADD COLUMN `uncompressed_module` TINYINT DEFAULT '0';
 
 -- -----------------------------------------------------
 -- Table `treport_content_sla_com_temp` (treport_content_sla_combined_template)
@@ -1466,6 +1470,7 @@ ALTER TABLE `treport_content` ADD COLUMN `current_month` TINYINT(1) DEFAULT '1';
 ALTER TABLE `treport_content` ADD COLUMN `failover_mode` tinyint(1) DEFAULT '0';
 ALTER TABLE `treport_content` ADD COLUMN `failover_type` tinyint(1) DEFAULT '0';
 ALTER table `treport_content` MODIFY COLUMN `name` varchar(300) NULL;
+ALTER TABLE `treport_content` ADD COLUMN `uncompressed_module` TINYINT DEFAULT '0';
 
 -- ---------------------------------------------------------------------
 -- Table `tmodule_relationship`

pandora_console/general/firts_task/HA_cluster_builder.php

@@ -1,15 +1,25 @@
 <?php
-// Pandora FMS - http://pandorafms.com
+/**
-// ==================================================
+ * Manage database HA cluster.
-// Copyright (c) 2005-2018 Artica Soluciones Tecnologicas
+ *
-// Please see http://pandorafms.org for full contribution list
+ * @category   Manager
-// This program is free software; you can redistribute it and/or
+ * @package    Pandora FMS
-// modify it under the terms of the GNU General Public License
+ * @subpackage Database HA cluster
-// as published by the Free Software Foundation; version 2
+ * @version    1.0.0
-// This program is distributed in the hope that it will be useful,
+ * @license    See below
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *    ______                 ___                    _______ _______ ________
-// GNU General Public License for more details.
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2007-2012 Artica Soluciones Tecnologicas, http://www.artica.es
+ * This code is NOT free software. This code is NOT licenced under GPL2 licence
+ * You cannnot redistribute it without written permission of copyright holder.
+ * ============================================================================
+ */
+
 global $config;
 
 check_login();
@@ -24,8 +34,6 @@ if (! check_acl($config['id_user'], 0, 'PM')) {
 }
 
 ui_require_css_file('firts_task');
-?>
-<?php
 ui_print_info_message(['no_close' => true, 'message' => __('There are no HA clusters defined yet.') ]);
 ?>
 
@@ -44,8 +52,9 @@ ui_print_info_message(['no_close' => true, 'message' => __('There are no HA clus
     </p>
         
         <?php
-        if (check_acl($config['id_user'], 0, 'AW')) {
+        if (check_acl($config['id_user'], 0, 'PM')) {
             echo "<div id='create_master_window'></div>";
+            echo "<div id='msg'></div>";
             ?>
             <input style="margin-bottom:20px;" onclick="show_create_ha_cluster();" type="submit" class="button_task" value="<?php echo __('Add new node'); ?>" />
             <?php
@@ -53,35 +62,3 @@ ui_print_info_message(['no_close' => true, 'message' => __('There are no HA clus
         ?>
     </div>
 </div>
-<script type="text/javascript">
-    function show_create_ha_cluster() {
-        var params = {};
-        params["dialog_master"] = 1;
-        params["page"] = "enterprise/include/ajax/HA_cluster.ajax";
-        jQuery.ajax ({
-            data: params,
-            dataType: "html",
-            type: "POST",
-            url: "ajax.php",
-            success: function (data) {
-                $("#create_master_window").dialog ({
-                    title: '<?php echo __('Add master node'); ?>',
-                    resizable: true,
-                    draggable: true,
-                    modal: true,
-                    close: function() {
-                        
-                    },
-                    overlay: {
-                        opacity: 0.5,
-                        background: "black"
-                    },
-                    width: 800,
-                    height: 600
-                }).empty()
-                .html(data)
-                .show ();
-            }
-        });
-    }
-</script>

pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php

@@ -353,7 +353,7 @@ html_print_table($table);
 echo "<div style='text-align:right; width:".$table->width."'>";
 echo '<span id="oid_loading" class="invisible">'.html_print_image('images/spinner.gif', true).'</span>';
 html_print_submit_button(__('WMI Explore'), 'wmi_explore', false, ['class' => 'sub next']);
-echo '</div>';
+echo '</div><br>';
 
 if ($wmiexplore && $fail) {
     ui_print_error_message(__('Unable to do WMI explorer'));
@@ -364,7 +364,7 @@ unset($table);
 echo '</form>';
 
 if ($wmiexplore && !$fail) {
-    echo '<span id ="none_text" style="display: none;">'.__('None').'</span>';
+    echo '<br><span id ="none_text" style="display: none;">'.__('None').'</span>';
     echo "<form method='post' action='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=agent_wizard&wizard_section=wmi_explorer&id_agente=$id_agent'>";
     echo '<span id="form_interfaces">';
 
@@ -379,7 +379,7 @@ if ($wmiexplore && !$fail) {
     // Namespace
     html_print_input_hidden('server_to_exec', $server_to_exec);
 
-    $table->width = '98%';
+    $table->width = '100%';
 
     // Mode selector
     $modes = [];
@@ -404,7 +404,7 @@ if ($wmiexplore && !$fail) {
 
     $table->colspan[1][0] = 2;
     $table->data[1][2] = '<b>'.__('Modules').'</b>';
-    $table->cellstyle[1][2] = 'vertical-align: middle;';
+    $table->cellstyle[1][2] = 'text-align: center;';
 
     // Components list
     $table->data[2][0] = '<div class="wizard_mode_form wizard_mode_components">';
@@ -495,7 +495,7 @@ if ($wmiexplore && !$fail) {
         'width: 300px;'
     );
     $table->data[2][0] .= '</div>';
-    $table->cellstyle[2][0] = 'vertical-align: top; text-align: center;';
+    $table->cellstyle[2][0] = 'vertical-align: bottom; text-align: center;';
 
 
     // Components arrow

pandora_console/godmode/groups/credential_store.php

@@ -29,599 +29,43 @@
 // Begin.
 global $config;
 
-// Check access.
+require_once $config['homedir'].'/include/class/CredentialStore.class.php';
-check_login();
 
-if (! check_acl($config['id_user'], 0, 'PM')) {
+$ajaxPage = 'godmode/groups/credential_store';
-    db_pandora_audit(
-        'ACL Violation',
-        'Trying to access event viewer'
-    );
 
+// Control call flow.
+try {
+    // User access and validation is being processed on class constructor.
+    $cs = new CredentialStore($ajaxPage);
+} catch (Exception $e) {
     if (is_ajax()) {
-        return ['error' => 'noaccess'];
+        echo json_encode(['error' => '[CredentialStore]'.$e->getMessage() ]);
+        exit;
+    } else {
+        echo '[CredentialStore]'.$e->getMessage();
     }
 
-    include 'general/noaccess.php';
+    // Stop this execution, but continue 'globally'.
     return;
 }
 
-// Required files.
+// AJAX controller.
-ui_require_css_file('credential_store');
-require_once $config['homedir'].'/include/functions_credential_store.php';
-require_once $config['homedir'].'/include/functions_io.php';
-
 if (is_ajax()) {
-    $draw = get_parameter('draw', 0);
+    $method = get_parameter('method');
-    $filter = get_parameter('filter', []);
-    $get_key = get_parameter('get_key', 0);
-    $new_form = get_parameter('new_form', 0);
-    $new_key = get_parameter('new_key', 0);
-    $update_key = get_parameter('update_key', 0);
-    $delete_key = get_parameter('delete_key', 0);
 
-    if ($new_form) {
+    if (method_exists($cs, $method) === true) {
-        echo print_inputs();
+        if ($cs->ajaxMethod($method) === true) {
-        exit;
+            $cs->{$method}();
-    }
-
-    if ($delete_key) {
-        $identifier = get_parameter('identifier', null);
-
-        if (empty($identifier)) {
-            ajax_msg('error', __('identifier cannot be empty'));
-        }
-
-        if (db_process_sql_delete(
-            'tcredential_store',
-            ['identifier' => $identifier]
-        ) === false
-        ) {
-            ajax_msg('error', $config['dbconnection']->error, true);
         } else {
-            ajax_msg('result', $identifier, true);
+            $cs->error('Unavailable method.');
         }
+    } else {
+        $cs->error('Method not found. ['.$method.']');
     }
 
-    if ($update_key) {
+    // Stop any execution.
-        $data = get_parameter('values', null);
-
-        if ($data === null || !is_array($data)) {
-            echo json_encode(['error' => __('Invalid parameters, please retry')]);
-            exit;
-        }
-
-        $values = [];
-        foreach ($data as $key => $value) {
-            if ($key == 'identifier') {
-                $identifier = base64_decode($value);
-            } else if ($key == 'product') {
-                $product = base64_decode($value);
-            } else {
-                $values[$key] = base64_decode($value);
-            }
-        }
-
-        if (empty($identifier)) {
-            ajax_msg('error', __('identifier cannot be empty'));
-        }
-
-        if (empty($product)) {
-            ajax_msg('error', __('product cannot be empty'));
-        }
-
-        if (db_process_sql_update(
-            'tcredential_store',
-            $values,
-            ['identifier' => $identifier]
-        ) === false
-        ) {
-            ajax_msg('error', $config['dbconnection']->error);
-        } else {
-            ajax_msg('result', $identifier);
-        }
-
-        exit;
-    }
-
-    if ($new_key) {
-        $data = get_parameter('values', null);
-
-        if ($data === null || !is_array($data)) {
-            echo json_encode(['error' => __('Invalid parameters, please retry')]);
-            exit;
-        }
-
-        $values = [];
-        foreach ($data as $key => $value) {
-            $values[$key] = base64_decode($value);
-            if ($key == 'identifier') {
-                $values[$key] = preg_replace('/\s+/', '-', trim($values[$key]));
-            }
-        }
-
-        $identifier = $values['identifier'];
-
-        if (empty($identifier)) {
-            ajax_msg('error', __('identifier cannot be empty'));
-        }
-
-        if (empty($values['product'])) {
-            ajax_msg('error', __('product cannot be empty'));
-        }
-
-        if (db_process_sql_insert('tcredential_store', $values) === false) {
-            ajax_msg('error', $config['dbconnection']->error);
-        } else {
-            ajax_msg('result', $identifier);
-        }
-
-        exit;
-    }
-
-    if ($get_key) {
-        $identifier = get_parameter('identifier', null);
-
-        $key = get_key($identifier);
-        echo print_inputs($key);
-
-        exit;
-    }
-
-    if ($draw) {
-        // Datatables offset, limit and order.
-        $start = get_parameter('start', 0);
-        $length = get_parameter('length', $config['block_size']);
-        $order = get_datatable_order(true);
-        try {
-            ob_start();
-
-            $fields = [
-                'cs.*',
-                'tg.nombre as `group`',
-            ];
-
-            // Retrieve data.
-            $data = credentials_get_all(
-                // Fields.
-                $fields,
-                // Filter.
-                $filter,
-                // Offset.
-                $start,
-                // Limit.
-                $length,
-                // Order.
-                $order['direction'],
-                // Sort field.
-                $order['field']
-            );
-
-            // Retrieve counter.
-            $count = credentials_get_all(
-                'count',
-                $filter
-            );
-
-            if ($data) {
-                $data = array_reduce(
-                    $data,
-                    function ($carry, $item) {
-                        // Transforms array of arrays $data into an array
-                        // of objects, making a post-process of certain fields.
-                        $tmp = (object) $item;
-                        $tmp->username = io_safe_output($tmp->username);
-
-                        if (empty($tmp->group)) {
-                            $tmp->group = __('All');
-                        } else {
-                            $tmp->group = io_safe_output($tmp->group);
-                        }
-
-                        $carry[] = $tmp;
-                        return $carry;
-                    }
-                );
-            }
-
-            // Datatables format: RecordsTotal && recordsfiltered.
-            echo json_encode(
-                [
-                    'data'            => $data,
-                    'recordsTotal'    => $count,
-                    'recordsFiltered' => $count,
-                ]
-            );
-            // Capture output.
-            $response = ob_get_clean();
-        } catch (Exception $e) {
-            return json_encode(['error' => $e->getMessage()]);
-        }
-
-        // If not valid, show error with issue.
-        json_decode($response);
-        if (json_last_error() == JSON_ERROR_NONE) {
-            // If valid dump.
-            echo $response;
-        } else {
-            echo json_encode(
-                ['error' => $response]
-            );
-        }
-
-
-        exit;
-    }
-
     exit;
+} else {
+    // Run.
+    $cs->run();
 }
-
-// Datatables list.
-try {
-    $columns = [
-        'group',
-        'identifier',
-        'product',
-        'username',
-        'options',
-    ];
-
-    $column_names = [
-        __('Group'),
-        __('Identifier'),
-        __('Product'),
-        __('User'),
-        [
-            'text'  => __('Options'),
-            'class' => 'action_buttons',
-        ],
-    ];
-
-    $table_id = 'keystore';
-    // Load datatables user interface.
-    ui_print_datatable(
-        [
-            'id'                  => $table_id,
-            'class'               => 'info_table',
-            'style'               => 'width: 100%',
-            'columns'             => $columns,
-            'column_names'        => $column_names,
-            'ajax_url'            => 'godmode/groups/credential_store',
-            'ajax_postprocess'    => 'process_datatables_item(item)',
-            'no_sortable_columns' => [-1],
-            'order'               => [
-                'field'     => 'identifier',
-                'direction' => 'asc',
-            ],
-            'search_button_class' => 'sub filter float-right',
-            'form'                => [
-                'inputs' => [
-                    [
-                        'label'   => __('Group'),
-                        'type'    => 'select',
-                        'id'      => 'filter_id_group',
-                        'name'    => 'filter_id_group',
-                        'options' => users_get_groups_for_select(
-                            $config['id_user'],
-                            'AR',
-                            true,
-                            true,
-                            false
-                        ),
-                    ],
-                    [
-                        'label' => __('Free search'),
-                        'type'  => 'text',
-                        'class' => 'mw250px',
-                        'id'    => 'free_search',
-                        'name'  => 'free_search',
-                    ],
-                ],
-            ],
-        ]
-    );
-} catch (Exception $e) {
-    echo $e->getMessage();
-}
-
-// Auxiliar div.
-$new = '<div id="new_key" style="display: none"><form id="form_new">';
-$new .= '</form></div>';
-$details = '<div id="info_key" style="display: none"><form id="form_update">';
-$details .= '</form></div>';
-$aux = '<div id="aux" style="display: none"></div>';
-
-
-echo $new.$details.$aux;
-
-// Create button.
-echo '<div class="w100p flex-content-right">';
-html_print_submit_button(
-    __('Add key'),
-    'create',
-    false,
-    'class="sub next"'
-);
-echo '</div>';
-
-?>
-
-<script type="text/javascript">
-    function process_datatables_item(item) {
-        item.options = '<a href="javascript:" onclick="display_key(\'';
-        item.options += item.identifier;
-        item.options += '\')" ><?php echo html_print_image('images/eye.png', true, ['title' => __('Show')]); ?></a>';
-
-        item.options += '<a href="javascript:" onclick="delete_key(\'';
-        item.options += item.identifier;
-        item.options += '\')" ><?php echo html_print_image('images/cross.png', true, ['title' => __('Delete')]); ?></a>';
-    }
-
-    function handle_response(data) {
-        var title = "<?php echo __('Success'); ?>";
-        var text = '';
-        var failed = 0;
-        try {
-            data = JSON.parse(data);
-            text = data['result'];
-        } catch (err) {
-            title =  "<?php echo __('Failed'); ?>";
-            text = err.message;
-            failed = 1;
-        }
-        if (!failed && data['error'] != undefined) {
-            title =  "<?php echo __('Failed'); ?>";
-            text = data['error'];
-            failed = 1;
-        }
-
-        $('#aux').empty();
-        $('#aux').html(text);
-        $('#aux').dialog({
-            width: 450,
-            position: {
-                my: 'center',
-                at: 'center',
-                of: window,
-                collision: 'fit'
-            },
-            title: title,
-            buttons: [
-                {
-                    text: 'OK',
-                    click: function(e) {
-                        if (!failed) {
-                            dt_<?php echo $table_id; ?>.draw(0);
-                            $(".ui-dialog-content").dialog("close");
-                            cleanupDOM();
-                        } else {
-                            $(this).dialog('close');
-                        }
-                    }
-                }
-            ]
-        });
-    }
-    
-    function delete_key(id) {
-        $('#aux').empty();
-        $('#aux').text('<?php echo __('Are you sure?'); ?>');
-        $('#aux').dialog({
-            title: '<?php echo __('Delete'); ?> ' + id,
-            buttons: [
-                {
-                    class: 'ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel',
-                    text: '<?php echo __('Cancel'); ?>',
-                    click: function(e) {
-                        $(this).dialog('close');
-                        cleanupDOM();
-
-                    }
-                },
-                {
-                    text: 'Delete',
-                    class: 'ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next',
-                    click: function(e) {
-                        $.ajax({
-                            method: 'post',
-                            url: '<?php echo ui_get_full_url('ajax.php', false, false, false); ?>',
-                            data: {
-                                page: 'godmode/groups/credential_store',
-                                delete_key: 1,
-                                identifier: id
-                            },
-                            datatype: "json",
-                            success: function (data) {
-                                handle_response(data);
-                            },
-                            error: function(e) {
-                                handle_response(e);
-                            }
-                        });
-                    }
-                }
-            ]
-        });
-    }
-
-    function display_key(id) {
-        $('#form_update').empty();
-        $('#form_update').html('Loading...');
-        $.ajax({
-            method: 'post',
-            url: '<?php echo ui_get_full_url('ajax.php', false, false, false); ?>',
-            data: {
-                page: 'godmode/groups/credential_store',
-                get_key: 1,
-                identifier: id
-            },
-            success: function (data) {
-                $('#info_key').dialog({
-                    width: 580,
-                    height: 400,
-                    position: {
-                        my: 'center',
-                        at: 'center',
-                        of: window,
-                        collision: 'fit'
-                    },
-                    title: id,
-                    buttons: [
-                        {
-                            class: 'ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel',
-                            text: '<?php echo __('Cancel'); ?>',
-                            click: function(e) {
-                                $(this).dialog('close');
-                                cleanupDOM();
-                            }
-                        },
-                        {
-                            text: 'Update',
-                            class: 'ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next',
-                            click: function(e) {
-                                var values = {};
-
-                                $('#form_update :input').each(function() {
-                                    values[this.name] = btoa($(this).val());
-                                });
-
-                                $.ajax({
-                                    method: 'post',
-                                    url: '<?php echo ui_get_full_url('ajax.php', false, false, false); ?>',
-                                    data: {
-                                        page: 'godmode/groups/credential_store',
-                                        update_key: 1,
-                                        values: values
-                                    },
-                                    datatype: "json",
-                                    success: function (data) {
-                                        handle_response(data);
-                                    },
-                                    error: function(e) {
-                                        handle_response(e);
-                                    }
-                                });
-                            }
-                        }
-                    ]
-                });
-                $('#form_update').html(data);
-            }
-
-        })
-    }
-
-    function cleanupDOM() {
-        $('#div-identifier').empty();
-        $('#div-product').empty();
-        $('#div-username').empty();
-        $('#div-password').empty();
-        $('#div-extra_1').empty();
-        $('#div-extra_2').empty();
-    }
-
-    function calculate_inputs() {
-        if ($('#product :selected').val() == "CUSTOM") {
-            $('#div-username label').text('<?php echo __('User'); ?>');
-            $('#div-password label').text('<?php echo __('Password'); ?>');
-            $('#div-extra_1').hide();
-            $('#div-extra_2').hide();
-        } else if ($('#product :selected').val() == "AWS") {
-            $('#div-username label').text('<?php echo __('Access key ID'); ?>');
-            $('#div-password label').text('<?php echo __('Secret access key'); ?>');
-            $('#div-extra_1').hide();
-            $('#div-extra_2').hide();
-        } else if ($('#product :selected').val() == "AZURE") {
-            $('#div-username label').text('<?php echo __('Client ID'); ?>');
-            $('#div-password label').text('<?php echo __('Application secret'); ?>');
-            $('#div-extra_1 label').text('<?php echo __('Tenant or domain name'); ?>');
-            $('#div-extra_2 label').text('<?php echo __('Subscription id'); ?>');
-            $('#div-extra_1').show();
-            $('#div-extra_2').show();
-        } 
-    }
-
-    function add_key() {
-        // Clear form.
-        $('#form_update').empty();
-        $('#form_update').html('Loading...');
-        $.ajax({
-            method: 'post',
-            url: '<?php echo ui_get_full_url('ajax.php', false, false, false); ?>',
-            data: {
-                page: 'godmode/groups/credential_store',
-                new_form: 1
-            },
-            success: function(data) {
-                $('#form_new').html(data);
-                $('#id_group').val(0);
-                // By default CUSTOM.
-                $('#product').val('CUSTOM');
-                calculate_inputs();
-
-                $('#product').on('change', function() {
-                    calculate_inputs()
-                });
-
-                // Show form.
-                $('#new_key').dialog({
-                    width: 580,
-                    height: 400,
-                    position: {
-                        my: 'center',
-                        at: 'center',
-                        of: window,
-                        collision: 'fit'
-                    },
-                    title: "<?php echo __('Register new key into keystore'); ?>",
-                    buttons: [
-                        {
-                            class: 'ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel',
-                            text: "<?php echo __('Cancel'); ?>",
-                            click: function(e) {
-                                $(this).dialog('close');
-                                cleanupDOM();
-                            }
-                        },
-                        {
-                            class: 'ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next',
-                            text: 'OK',
-                            click: function(e) {
-                                var values = {};
-                                $('#form_new :input').each(function() {
-                                    values[this.name] = btoa($(this).val());
-                                });
-
-                                $.ajax({
-                                    method: 'post',
-                                    url: '<?php echo ui_get_full_url('ajax.php', false, false, false); ?>',
-                                    data: {
-                                        page: 'godmode/groups/credential_store',
-                                        new_key: 1,
-                                        values: values
-                                    },
-                                    datatype: "json",
-                                    success: function (data) {
-                                        handle_response(data);
-                                    },
-                                    error: function(e) {
-                                        handle_response(e);
-                                    }
-                                });
-                            }
-                        },
-                    ]
-                });
-            }
-        })
-
-
-    }
-    $(document).ready(function(){
-
-        $("#submit-create").on('click', function(){
-            add_key();
-        });
-    });
-
-</script>

pandora_console/godmode/reporting/reporting_builder.item_editor.php

@@ -153,6 +153,7 @@ $checks_in_ok_status = true;
 $unknown_checks = true;
 $agent_max_value = true;
 $agent_min_value = true;
+$uncompressed_module = true;
 
 switch ($action) {
     case 'new':
@@ -427,6 +428,7 @@ switch ($action) {
                     );
                     $idAgentModule = $item['id_agent_module'];
                     $period = $item['period'];
+                    $uncompressed_module = $item['uncompressed_module'];
                 break;
 
                 case 'historical_data':
@@ -810,7 +812,6 @@ switch ($action) {
     break;
 }
 
-
 $urlForm = $config['homeurl'].'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=item_editor&action='.$actionParameter.'&id_report='.$idReport;
 
 echo '<form action="'.$urlForm.'" method="post">';
@@ -1565,10 +1566,8 @@ $class = 'databox filters';
                     $all_modules = '';
                 } else {
                     $all_modules = db_get_all_rows_sql(
-                        'SELECT DISTINCT nombre, id_agente_modulo
+                        'SELECT DISTINCT nombre FROM 
-                            FROM tagente_modulo
+							tagente_modulo WHERE id_agente IN ('.implode(',', array_values($id_agents)).')'
-                            WHERE id_agente
-                                IN ('.implode(',', array_values($id_agents)).')'
                     );
                 }
 
@@ -2794,6 +2793,23 @@ $class = 'databox filters';
                 ?>
             </td>
         </tr>
+
+        <tr id="row_uncompressed_module" style="" class="datos">
+            <td style="font-weight:bold;">
+            <?php
+            echo __('Uncompress module').ui_print_help_tip(
+                __('Use uncompressed module data.'),
+                true
+            );
+            ?>
+            </td>
+            <td style="">
+            <?php
+            html_print_checkbox('uncompressed_module', 1, $item['uncompressed_module'], false, false, '', false);
+            ?>
+            </td>
+        </tr>
+
     </tbody>
 </table>
 
@@ -3529,6 +3545,9 @@ $(document).ready (function () {
 
     $("#id_agents").change(agent_changed_by_multiple_agents);
 
+    // Load selected modules by default
+    $("#id_agents2").trigger('click');
+
     $("#combo_group").change (
         function () {
             jQuery.post ("ajax.php",
@@ -4523,6 +4542,7 @@ function chooseType() {
     $('#row_select_fields').hide();
     $("#row_select_fields2").hide();
     $("#row_select_fields3").hide();
+    $("#row_uncompressed_module").hide();
 
     // SLA list default state.
     $("#sla_list").hide();
@@ -4731,6 +4751,7 @@ function chooseType() {
             $("#row_module").show();
             $("#row_period").show();
             $("#row_historical_db_check").hide();
+            $("#row_uncompressed_module").show();
             break;
 
         case 'historical_data':

pandora_console/godmode/reporting/reporting_builder.php

@@ -1908,6 +1908,11 @@ switch ($action) {
                             $values['id_agent'] = get_parameter('group');
                         }
 
+                        if ($values['type'] == 'sumatory') {
+                            $values['uncompressed_module'] = get_parameter('uncompressed_module', 0);
+                        }
+
+
                         $values['header_definition'] = get_parameter('header');
                         $values['column_separator'] = get_parameter('field');
                         $values['line_separator'] = get_parameter('line');
@@ -2464,6 +2469,10 @@ switch ($action) {
                             $values['id_agent'] = get_parameter('group');
                         }
 
+                        if ($values['type'] == 'sumatory') {
+                            $values['uncompressed_module'] = get_parameter('uncompressed_module', 0);
+                        }
+
                         $values['header_definition'] = get_parameter('header');
                         $values['column_separator'] = get_parameter('field');
                         $values['line_separator'] = get_parameter('line');

pandora_console/godmode/setup/license.php

@@ -107,7 +107,7 @@ $table->data = [];
 $table->data[0][0] = '<strong>'.__('Customer key').'</strong>';
 $table->data[0][1] = html_print_textarea('keys[customer_key]', 10, 255, $settings->customer_key, 'style="height:50px; width:450px;"', true);
 
-$table->data[1][0] = '<strong>'.__('Expires').'</strong>';
+$table->data[1][0] = '<strong>'.__($license['expiry_caption']).'</strong>';
 $table->data[1][1] = html_print_input_text('expires', $license['expiry_date'], '', 10, 255, true, true);
 
 $table->data[2][0] = '<strong>'.__('Platform Limit').'</strong>';

pandora_console/godmode/setup/setup_general.php

@@ -58,6 +58,16 @@ global $config;
 
 check_login();
 
+if (is_ajax()) {
+    enterprise_include_once('include/functions_cron.php');
+
+    $test_address = get_parameter('test_address', '');
+
+    $res = enterprise_hook('send_email_attachment', [$test_address, __('This is an email test sent from Pandora FMS. If you can read this, your configuration works.'), __('Testing Pandora FMS email'), null]);
+
+    echo $res;
+}
+
 $table = new StdClass();
 $table->class = 'databox filters';
 $table->id = 'setup_general';
@@ -68,6 +78,12 @@ $table->size[0] = '30%';
 $table->style[0] = 'font-weight:bold';
 $table->size[1] = '70%';
 
+$table_mail_conf = new stdClass();
+$table_mail_conf->width = '100%';
+$table_mail_conf->class = 'databox filters';
+$table_mail_conf->data = [];
+$table_mail_conf->style[0] = 'font-weight: bold';
+
 // Current config["language"] could be set by user, not taken from global setup !
 $current_system_lang = db_get_sql(
     'SELECT `value` FROM tconfig WHERE `token` = "language"'
@@ -330,6 +346,49 @@ echo '<legend>'.__('General options').'</legend>';
     html_print_input_hidden('update_config', 1);
     html_print_table($table);
 
+$encryption = [
+    'ssl'   => 'SSL/TLS',
+    'sslv2' => 'SSLv2',
+    'sslv3' => 'SSLv3',
+    'tls'   => 'STARTTLS',
+];
+
+echo '</fieldset>';
+
+echo '<fieldset>';
+echo '<legend>'.__('Mail configuration').'</legend>';
+
+$table_mail_conf->data[0][0] = __('From address');
+$table_mail_conf->data[0][1] = html_print_input_text('email_from_dir', $config['email_from_dir'], '', 30, 100, true);
+
+$table_mail_conf->data[1][0] = __('From name');
+$table_mail_conf->data[1][2] = html_print_input_text('email_from_name', $config['email_from_name'], '', 30, 100, true);
+
+$table_mail_conf->data[2][0] = __('SMTP Server');
+$table_mail_conf->data[2][1] = html_print_input_text('email_smtpServer', $config['email_smtpServer'], '', 30, 100, true);
+
+$table_mail_conf->data[3][0] = __('SMTP Port');
+$table_mail_conf->data[3][1] = html_print_input_text('email_smtpPort', $config['email_smtpPort'], '', 30, 100, true);
+
+$table_mail_conf->data[4][0] = __('Encryption');
+$table_mail_conf->data[4][1] = html_print_select($encryption, 'email_encryption', $config['email_encryption'], '', __('none'), 0, true);
+
+$table_mail_conf->data[5][0] = __('Email user');
+$table_mail_conf->data[5][1] = html_print_input_text('email_username', $config['email_username'], '', 30, 100, true);
+
+$table_mail_conf->data[6][0] = __('Email password');
+$table_mail_conf->data[6][1] = html_print_input_password('email_password', io_output_password($config['email_password']), '', 30, 100, true);
+
+$uniqid = uniqid();
+
+$table_mail_conf->data[7][0] = html_print_button(__('Email test'), 'email_test_dialog', false, "show_email_test('$uniqid');", 'class="sub next"', true).ui_print_help_tip(__('Check the current saved email configuration by sending a test email to a desired account.'), true);
+
+print_email_test_modal_window($uniqid);
+
+html_print_input_hidden('update_config', 1);
+html_print_table($table_mail_conf);
+
+
 echo '</fieldset>';
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
@@ -337,6 +396,25 @@ html_print_submit_button(__('Update'), 'update_button', false, 'class="sub upd"'
 echo '</div>';
 echo '</form>';
 
+// Print the modal window for the summary of each alerts group
+function print_email_test_modal_window($id)
+{
+    // Email config table.
+    $table_mail_test = new stdClass();
+    $table_mail_test->width = '100%';
+    $table_mail_test->class = 'databox filters';
+    $table_mail_test->data = [];
+    $table_mail_test->style[0] = 'font-weight: bold';
+    $table_mail_test->colspan[1][0] = 2;
+
+    $table_mail_test->data[0][0] = __('Address').ui_print_help_tip(__('Email address to which the test email will be sent. Please check your inbox after email is sent.'), true);
+    $table_mail_test->data[0][1] = html_print_input_text('email_test_address', '', '', 40, 100, true);
+
+    $table_mail_test->data[1][0] = html_print_button(__('Send'), 'email_test', false, '', 'class="sub next"', true).'&nbsp&nbsp<span id="email_test_sent_message" style="display:none;">Email sent</span><span id="email_test_failure_message" style="display:none;">Email could not been sent</span>';
+
+    echo '<div id="email_test_'.$id.'" title="'.__('Check mail configuration').'" style="display:none">'.html_print_table($table_mail_test, true).'</div>';
+}
+
 
 ?>
 <script type="text/javascript">
@@ -375,6 +453,40 @@ function show_timezone () {
     });
 }
 
+function show_email_test(id) {
+    $('#email_test_sent_message').hide();
+    $('#email_test_failure_message').hide();
+
+    $("#email_test_"+id).dialog({
+        resizable: true,
+        draggable: true,
+        modal: true,
+        height: 175,
+        width: 450,
+        overlay: {
+            opacity: 0.5,
+            background: "black"
+        }
+    });
+}
+
+function perform_email_test () {
+    var test_address = $('#text-email_test_address').val();
+
+    $.ajax({
+        type: "POST",
+        url: "ajax.php",
+        data: "page=godmode/setup/setup_general&test_address="+test_address,
+        dataType: "html",
+        success: function(data) {
+            $('#email_test_sent_message').show();
+        },
+        error: function() {
+            $('#email_test_failure_message').show();
+        },
+    });
+}
+
 $(document).ready (function () {
 
     $("#zone").attr("hidden", true);
@@ -431,5 +543,7 @@ $(document).ready (function () {
         });
         }
     })
+
+    $('input#button-email_test').click(perform_email_test);
 });
 </script>

pandora_console/include/config_process.php

@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC190913';
+$build_version = 'PC190924';
 $pandora_version = 'v7.0NG.738';
 
 // Do not overwrite default timezone set if defined.

pandora_console/include/constants.php

@@ -630,3 +630,21 @@ define('DEFAULT_NODE_COLOR', COL_NOTINIT);
 define('DEFAULT_NODE_IMAGE', 'images/networkmap/unknown.png');
 
 define('NODE_IMAGE_PADDING', 5);
+
+// Pandora Database HA constants.
+define('HA_ACTION_NONE', 0);
+define('HA_ACTION_DEPLOY', 1);
+define('HA_ACTION_RECOVER', 2);
+define('HA_ACTION_PROMOTE', 3);
+define('HA_ACTION_DEMOTE', 4);
+define('HA_ACTION_DISABLE', 5);
+define('HA_ACTION_ENABLE', 6);
+define('HA_ACTION_CLEANUP', 7);
+define('HA_ACTION_RESYNC', 8);
+
+define('HA_UNINITIALIZED', 0);
+define('HA_ONLINE', 1);
+define('HA_PENDING', 2);
+define('HA_PROCESSING', 3);
+define('HA_DISABLED', 4);
+define('HA_FAILED', 5);

pandora_console/include/functions_agents.php

@@ -68,6 +68,57 @@ function agents_get_agent_id_by_module_id($id_agente_modulo)
 }
 
 
+/**
+ * Search for agent data anywhere.
+ *
+ * Note: This method matches with server (perl) locate_agent.
+ * Do not change order!
+ *
+ * @param string $field Alias, name or IP address of searchable agent.
+ *
+ * @return array Agent of false if not found.
+ */
+function agents_locate_agent(string $field)
+{
+    global $config;
+
+    $table = 'tagente';
+    if (is_metaconsole()) {
+        $table = 'tmetaconsole_agent';
+    }
+
+    // Alias.
+    $sql = sprintf(
+        'SELECT *
+         FROM %s
+         WHERE alias = "%s"',
+        $table,
+        $field
+    );
+    $agent = db_get_row_sql($sql);
+
+    if ($agent !== false) {
+        return $agent;
+    }
+
+    // Addr.
+    $agent = agents_get_agent_with_ip($field);
+    if ($agent !== false) {
+        return $agent;
+    }
+
+    // Name.
+    $sql = sprintf(
+        'SELECT *
+         FROM %s
+         WHERE nombre = "%s"',
+        $table,
+        $field
+    );
+    return db_get_row_sql($sql);
+}
+
+
 /**
  * Get agent id from an agent alias.
  *

pandora_console/include/functions_config.php

@@ -325,6 +325,34 @@ function config_update_config()
                     if (!config_update_value('unique_ip', get_parameter('unique_ip'))) {
                         $error_update[] = __('unique_ip');
                     }
+
+                    if (!config_update_value('email_smtpServer', get_parameter('email_smtpServer'))) {
+                        $error_update[] = __('Server SMTP');
+                    }
+
+                    if (!config_update_value('email_from_dir', get_parameter('email_from_dir'))) {
+                        $error_update[] = __('From dir');
+                    }
+
+                    if (!config_update_value('email_from_name', get_parameter('email_from_name'))) {
+                        $error_update[] = __('From name');
+                    }
+
+                    if (!config_update_value('email_smtpPort', (int) get_parameter('email_smtpPort'))) {
+                        $error_update[] = __('Port SMTP');
+                    }
+
+                    if (!config_update_value('email_encryption', get_parameter('email_encryption'))) {
+                        $error_update[] = __('Encryption');
+                    }
+
+                    if (!config_update_value('email_username', get_parameter('email_username'))) {
+                        $error_update[] = __('Email user');
+                    }
+
+                    if (!config_update_value('email_password', get_parameter('email_password'))) {
+                        $error_update[] = __('Email password');
+                    }
                 break;
 
                 case 'enterprise':
@@ -419,34 +447,6 @@ function config_update_config()
                         if (!config_update_value('inventory_changes_blacklist', implode(',', $inventory_changes_blacklist))) {
                             $error_update[] = __('Inventory changes blacklist');
                         }
-
-                        if (!config_update_value('email_from_dir', get_parameter('email_from_dir'))) {
-                            $error_update[] = __('From dir');
-                        }
-
-                        if (!config_update_value('email_from_name', get_parameter('email_from_name'))) {
-                            $error_update[] = __('From name');
-                        }
-
-                        if (!config_update_value('email_smtpServer', get_parameter('email_smtpServer'))) {
-                            $error_update[] = __('Server SMTP');
-                        }
-
-                        if (!config_update_value('email_smtpPort', (int) get_parameter('email_smtpPort'))) {
-                            $error_update[] = __('Port SMTP');
-                        }
-
-                        if (!config_update_value('email_encryption', get_parameter('email_encryption'))) {
-                            $error_update[] = __('Encryption');
-                        }
-
-                        if (!config_update_value('email_username', get_parameter('email_username'))) {
-                            $error_update[] = __('Email user');
-                        }
-
-                        if (!config_update_value('email_password', get_parameter('email_password'))) {
-                            $error_update[] = __('Email password');
-                        }
                     }
                 break;
 

pandora_console/include/functions_credential_store.php

@@ -24,422 +24,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  * ============================================================================
+ *
+ * Moved to CredentialStore.class.php
  */
 
-// Begin.
+// Deprecated.
-
-
-/**
- * Returns an array with all the credentials matching filter and ACL.
- *
- * @param array   $fields     Fields array or 'count' keyword to retrieve count.
- * @param array   $filter     Filters to be applied.
- * @param integer $offset     Offset (pagination).
- * @param integer $limit      Limit (pagination).
- * @param string  $order      Sort order.
- * @param string  $sort_field Sort field.
- *
- * @return array With all results or false if error.
- * @throws Exception On error.
- */
-function credentials_get_all(
-    $fields,
-    array $filter,
-    $offset=null,
-    $limit=null,
-    $order=null,
-    $sort_field=null
-) {
-    $sql_filters = [];
-    $order_by = '';
-    $pagination = '';
-
-    global $config;
-
-    if (!is_array($filter)) {
-        error_log('[credential_get_all] Filter must be an array.');
-        throw new Exception('[credential_get_all] Filter must be an array.');
-    }
-
-    $count = false;
-    if (!is_array($fields) && $fields == 'count') {
-        $fields = ['cs.*'];
-        $count = true;
-    } else if (!is_array($fields)) {
-        error_log('[credential_get_all] Fields must be an array or "count".');
-        throw new Exception('[credential_get_all] Fields must be an array or "count".');
-    }
-
-    if (isset($filter['product']) && !empty($filter['product'])) {
-        $sql_filters[] = sprintf(' AND cs.product = "%s"', $filter['product']);
-    }
-
-    if (isset($filter['free_search']) && !empty($filter['free_search'])) {
-        $sql_filters[] = vsprintf(
-            ' AND (lower(cs.username) like lower("%%%s%%")
-                OR cs.identifier like "%%%s%%"
-                OR lower(cs.product) like lower("%%%s%%"))',
-            array_fill(0, 3, $filter['free_search'])
-        );
-    }
-
-    if (isset($filter['filter_id_group']) && $filter['filter_id_group'] > 0) {
-        $propagate = db_get_value(
-            'propagate',
-            'tgrupo',
-            'id_grupo',
-            $filter['filter_id_group']
-        );
-
-        if (!$propagate) {
-            $sql_filters[] = sprintf(
-                ' AND cs.id_group = %d ',
-                $filter['filter_id_group']
-            );
-        } else {
-            $groups = [ $filter['filter_id_group'] ];
-            $childrens = groups_get_childrens($id_group, null, true);
-            if (!empty($childrens)) {
-                foreach ($childrens as $child) {
-                    $groups[] = (int) $child['id_grupo'];
-                }
-            }
-
-            $filter['filter_id_group'] = $groups;
-            $sql_filters[] = sprintf(
-                ' AND cs.id_group IN (%s) ',
-                join(',', $filter['filter_id_group'])
-            );
-        }
-    }
-
-    if (isset($filter['group_list']) && is_array($filter['group_list'])) {
-        $sql_filters[] = sprintf(
-            ' AND cs.id_group IN (%s) ',
-            join(',', $filter['group_list'])
-        );
-    }
-
-    if (isset($order)) {
-        $dir = 'asc';
-        if ($order == 'desc') {
-            $dir = 'desc';
-        };
-
-        if (in_array(
-            $sort_field,
-            [
-                'group',
-                'identifier',
-                'product',
-                'username',
-                'options',
-            ]
-        )
-        ) {
-            $order_by = sprintf(
-                'ORDER BY `%s` %s',
-                $sort_field,
-                $dir
-            );
-        }
-    }
-
-    if (isset($limit) && $limit > 0
-        && isset($offset) && $offset >= 0
-    ) {
-        $pagination = sprintf(
-            ' LIMIT %d OFFSET %d ',
-            $limit,
-            $offset
-        );
-    }
-
-    $sql = sprintf(
-        'SELECT %s
-         FROM tcredential_store cs
-         LEFT JOIN tgrupo tg
-            ON tg.id_grupo = cs.id_group
-         WHERE 1=1
-         %s
-         %s
-         %s',
-        join(',', $fields),
-        join(' ', $sql_filters),
-        $order_by,
-        $pagination
-    );
-
-    if ($count) {
-        $sql = sprintf('SELECT count(*) as n FROM ( %s ) tt', $sql);
-
-        return db_get_value_sql($sql);
-    }
-
-    return db_get_all_rows_sql($sql);
-}
-
-
-/**
- * Retrieves target key from keystore or false in case of error.
- *
- * @param string $identifier Key identifier.
- *
- * @return array Key or false if error.
- */
-function get_key($identifier)
-{
-    return db_get_row_filter(
-        'tcredential_store',
-        [ 'identifier' => $identifier ]
-    );
-}
-
-
-/**
- * Minor function to dump json message as ajax response.
- *
- * @param string  $type   Type: result || error.
- * @param string  $msg    Message.
- * @param boolean $delete Deletion messages.
- *
- * @return void
- */
-function ajax_msg($type, $msg, $delete=false)
-{
-    $msg_err = 'Failed while saving: %s';
-    $msg_ok = 'Successfully saved into keystore ';
-
-    if ($delete) {
-        $msg_err = 'Failed while removing: %s';
-        $msg_ok = 'Successfully deleted ';
-    }
-
-    if ($type == 'error') {
-        echo json_encode(
-            [
-                $type => ui_print_error_message(
-                    __(
-                        $msg_err,
-                        $msg
-                    ),
-                    '',
-                    true
-                ),
-            ]
-        );
-    } else {
-        echo json_encode(
-            [
-                $type => ui_print_success_message(
-                    __(
-                        $msg_ok,
-                        $msg
-                    ),
-                    '',
-                    true
-                ),
-            ]
-        );
-    }
-
-    exit;
-}
-
-
-/**
- * Generates inputs for new/update forms.
- *
- * @param array $values Values or null.
- *
- * @return string Inputs.
- */
-function print_inputs($values=null)
-{
-    if (!is_array($values)) {
-        $values = [];
-    }
-
-    $return = '';
-    $return .= html_print_input(
-        [
-            'label'       => __('Identifier'),
-            'name'        => 'identifier',
-            'input_class' => 'flex-row',
-            'type'        => 'text',
-            'value'       => $values['identifier'],
-            'disabled'    => (bool) $values['identifier'],
-            'return'      => true,
-            'script'      => 'alert(\'puta\')',
-        ]
-    );
-    $return .= html_print_input(
-        [
-            'label'       => __('Group'),
-            'name'        => 'id_group',
-            'id'          => 'id_group',
-            'input_class' => 'flex-row',
-            'type'        => 'select_groups',
-            'selected'    => $values['id_group'],
-            'return'      => true,
-            'class'       => 'w50p',
-        ]
-    );
-    $return .= html_print_input(
-        [
-            'label'       => __('Product'),
-            'name'        => 'product',
-            'input_class' => 'flex-row',
-            'type'        => 'select',
-            'script'      => 'calculate_inputs()',
-            'fields'      => [
-                'CUSTOM' => __('Custom'),
-                'AWS'    => __('Aws'),
-                'AZURE'  => __('Azure'),
-                // 'GOOGLE' => __('Google'),
-            ],
-            'selected'    => $values['product'],
-            'disabled'    => (bool) $values['product'],
-            'return'      => true,
-        ]
-    );
-    $user_label = __('Username');
-    $pass_label = __('Password');
-    $extra_1_label = __('Extra');
-    $extra_2_label = __('Extra (2)');
-    $extra1 = true;
-    $extra2 = true;
-
-    // Remember to update credential_store.php also.
-    switch ($values['product']) {
-        case 'AWS':
-            $user_label = __('Access key ID');
-            $pass_label = __('Secret access key');
-            $extra1 = false;
-            $extra2 = false;
-        break;
-
-        case 'AZURE':
-            $user_label = __('Account ID');
-            $pass_label = __('Application secret');
-            $extra_1_label = __('Tenant or domain name');
-            $extra_2_label = __('Subscription id');
-        break;
-
-        case 'GOOGLE':
-            // Need further investigation.
-        case 'CUSTOM':
-            $user_label = __('Account ID');
-            $pass_label = __('Password');
-            $extra1 = false;
-            $extra2 = false;
-        default:
-            // Use defaults.
-        break;
-    }
-
-    $return .= html_print_input(
-        [
-            'label'       => $user_label,
-            'name'        => 'username',
-            'input_class' => 'flex-row',
-            'type'        => 'text',
-            'value'       => $values['username'],
-            'return'      => true,
-        ]
-    );
-    $return .= html_print_input(
-        [
-            'label'       => $pass_label,
-            'name'        => 'password',
-            'input_class' => 'flex-row',
-            'type'        => 'password',
-            'value'       => $values['password'],
-            'return'      => true,
-        ]
-    );
-    if ($extra1) {
-        $return .= html_print_input(
-            [
-                'label'       => $extra_1_label,
-                'name'        => 'extra_1',
-                'input_class' => 'flex-row',
-                'type'        => 'text',
-                'value'       => $values['extra_1'],
-                'return'      => true,
-            ]
-        );
-    }
-
-    if ($extra2) {
-        $return .= html_print_input(
-            [
-                'label'       => $extra_2_label,
-                'name'        => 'extra_2',
-                'input_class' => 'flex-row',
-                'type'        => 'text',
-                'value'       => $values['extra_2'],
-                'return'      => true,
-                'display'     => $extra2,
-            ]
-        );
-    }
-
-    return $return;
-}
-
-
-/**
- * Retrieve all identifiers available for current user.
- *
- * @param string $product Target product.
- *
- * @return array Of account identifiers.
- */
-function credentials_list_accounts($product)
-{
-    global $config;
-
-    check_login();
-
-    include_once $config['homedir'].'/include/functions_users.php';
-
-    static $user_groups;
-
-    if (!isset($user_groups)) {
-        $user_groups = users_get_groups(
-            $config['id_user'],
-            'AR'
-        );
-
-        // Always add group 'ALL' because 'ALL' group credentials
-        // must be available for all users.
-        if (is_array($user_groups)) {
-            $user_groups = ([0] + array_keys($user_groups));
-        } else {
-            $user_groups = [0];
-        }
-    }
-
-    $creds = credentials_get_all(
-        ['identifier'],
-        [
-            'product'    => $product,
-            'group_list' => $user_groups,
-        ]
-    );
-
-    if ($creds === false) {
-        return [];
-    }
-
-    $ret = array_reduce(
-        $creds,
-        function ($carry, $item) {
-            $carry[$item['identifier']] = $item['identifier'];
-            return $carry;
-        }
-    );
-
-    return $ret;
-}

pandora_console/include/functions_db.php

@@ -46,6 +46,25 @@ function db_select_engine()
 }
 
 
+/**
+ * Connects to target DB.
+ *
+ * @param array $setup Database definition.
+ *
+ * @return mixed Dbconnection or null.
+ */
+function get_dbconnection(array $setup)
+{
+    return mysqli_connect(
+        $setup['dbhost'],
+        $setup['dbuser'],
+        $setup['dbpass'],
+        $setup['dbname'],
+        $setup['dbport']
+    );
+}
+
+
 function db_connect($host=null, $db=null, $user=null, $pass=null, $port=null, $critical=true, $charset=null)
 {
     global $config;

pandora_console/include/functions_events.php

@@ -2739,6 +2739,10 @@ function events_get_agent(
         $date = time_w_fixed_tz($date);
     }
 
+    if (is_metaconsole() && $events_group === false) {
+        $id_server = true;
+    }
+
     if (empty($date)) {
         $date = get_system_time();
     }

pandora_console/include/functions_html.php

@@ -98,6 +98,23 @@ function hd($var, $file='', $oneline=false)
 }
 
 
+/**
+ * Encapsulation (ob) for debug print function.
+ *
+ * @param mixed   $var     Variable to be dumped.
+ * @param string  $file    Target file path.
+ * @param boolean $oneline Show in oneline.
+ *
+ * @return string Dump string.
+ */
+function obhd($var, $file='', $oneline=false)
+{
+    ob_start();
+    hd($var, $file, $oneline);
+    return ob_get_clean();
+}
+
+
 function debug()
 {
     $args_num = func_num_args();
@@ -1458,6 +1475,14 @@ function html_print_input_password(
         $attr['class'] = $class;
     }
 
+    if ($disabled === false) {
+        // Trick to avoid password completion on most browsers.
+        if ($autocomplete !== 'on') {
+            $disabled = true;
+            $attr['onfocus'] = "this.removeAttribute('readonly');";
+        }
+    }
+
     return html_print_input_text_extended($name, $value, 'password-'.$name, $alt, $size, $maxlength, $disabled, '', $attr, $return, true, '', $autocomplete);
 }
 
@@ -1570,6 +1595,7 @@ function html_print_input_image($name, $src, $value, $style='', $return=false, $
         'onkeypress',
         'onkeydown',
         'onkeyup',
+        'class',
     ];
 
     foreach ($attrs as $attribute) {
@@ -3152,7 +3178,8 @@ function html_print_input($data, $wrapper='div', $input_only=false)
                 ((isset($data['return']) === true) ? $data['return'] : false),
                 ((isset($data['disabled']) === true) ? $data['disabled'] : false),
                 ((isset($data['required']) === true) ? $data['required'] : false),
-                ((isset($data['class']) === true) ? $data['class'] : '')
+                ((isset($data['class']) === true) ? $data['class'] : ''),
+                ((isset($data['autocomplete']) === true) ? $data['autocomplete'] : 'off')
             );
         break;
 

pandora_console/include/functions_io.php

@@ -507,7 +507,7 @@ function ___($string /*, variable arguments */)
 }
 
 
-/*
+/**
  * json_encode for multibyte characters.
  *
  * @param string Text string to be encoded.
@@ -528,7 +528,7 @@ function io_json_mb_encode($string, $encode_options=0)
 }
 
 
-/*
+/**
  * Prepare the given password to be stored in the Pandora FMS Database,
  * encrypting it if necessary.
  *
@@ -541,16 +541,22 @@ function io_input_password($password)
     global $config;
 
     enterprise_include_once('include/functions_crypto.php');
-    $ciphertext = enterprise_hook('openssl_encrypt_decrypt', ['encrypt', io_safe_output($password)]);
+    $ciphertext = enterprise_hook(
+        'openssl_encrypt_decrypt',
+        [
+            'encrypt',
+            io_safe_input($password),
+        ]
+    );
     if ($ciphertext === ENTERPRISE_NOT_HOOK) {
-            return $password;
+            return io_safe_input($password);
     }
 
     return $ciphertext;
 }
 
 
-/*
+/**
  * Process the given password read from the Pandora FMS Database,
  * decrypting it if necessary.
  *
@@ -563,10 +569,17 @@ function io_output_password($password)
     global $config;
 
     enterprise_include_once('include/functions_crypto.php');
-    $plaintext = enterprise_hook('openssl_encrypt_decrypt', ['decrypt', io_safe_output($password)]);
+    $plaintext = enterprise_hook(
+        'openssl_encrypt_decrypt',
+        [
+            'decrypt',
+            $password,
+        ]
+    );
+
     if ($plaintext === ENTERPRISE_NOT_HOOK) {
-            return $password;
+            return io_safe_output($password);
     }
 
-    return $plaintext;
+    return io_safe_output($plaintext);
 }

pandora_console/include/functions_menu.php

@@ -545,7 +545,6 @@ function menu_add_extras(&$menu)
     $menu_extra['estado']['sub']['godmode/snmpconsole/snmp_filters']['text'] = __('SNMP filters');
     $menu_extra['estado']['sub']['enterprise/godmode/snmpconsole/snmp_trap_editor']['text'] = __('SNMP trap editor');
     $menu_extra['estado']['sub']['snmpconsole']['sub2']['godmode/snmpconsole/snmp_trap_generator']['text'] = __('SNMP trap generator');
-
     $menu_extra['estado']['sub']['snmpconsole']['sub2']['operation/snmpconsole/snmp_view']['text'] = __('SNMP console');
 
     $menu_extra['workspace']['sub']['operation/incidents/incident_detail']['text'] = __('Manage incident');

pandora_console/include/functions_reporting.php

@@ -4903,7 +4903,8 @@ function reporting_value($report, $content, $type, $pdf=false)
             $value = reporting_get_agentmodule_data_sum(
                 $content['id_agent_module'],
                 $content['period'],
-                $report['datetime']
+                $report['datetime'],
+                $content['uncompressed_module']
             );
             if (!$config['simple_module_value']) {
                 $formated_value = $value;
@@ -10725,17 +10726,19 @@ function reporting_get_agentmodule_data_min($id_agent_module, $period=0, $date=0
  * @param int Agent module id to get the sumatory.
  * @param int Period of time to check (in seconds)
  * @param int Top date to check the values. Default current time.
+ * @param boolean Show uncompressed data from module
  *
  * @return float The sumatory of the module values in the interval.
  */
 function reporting_get_agentmodule_data_sum(
     $id_agent_module,
     $period=0,
-    $date=0
+    $date=0,
+    $uncompressed_module=true
 ) {
     global $config;
 
-    // Initialize variables
+    // Initialize variables.
     if (empty($date)) {
         $date = get_system_time();
     }
@@ -10757,21 +10760,24 @@ function reporting_get_agentmodule_data_sum(
         $id_module_type
     );
     $module_interval = modules_get_interval($id_agent_module);
-    $uncompressed_module = is_module_uncompressed($module_name);
+    // Check if module must be compressed.
+    if (!$uncompressed_module) {
+        $uncompressed_module = is_module_uncompressed($module_name);
+    }
 
     // Wrong module type
     if (is_module_data_string($module_name)) {
         return 0;
     }
 
-    // Incremental modules are treated differently
+    // Incremental modules are treated differently.
     $module_inc = is_module_inc($module_name);
 
-    if ($uncompressed_module) {
+    if (!$uncompressed_module) {
-        // Get module data
+        // Get module data.
         $interval_data = db_get_all_rows_sql(
             '
-            SELECT * FROM tagente_datos 
+            SELECT * FROM tagente_datos
             WHERE id_agente_modulo = '.(int) $id_agent_module.'
                 AND utimestamp > '.(int) $datelimit.'
                 AND utimestamp < '.(int) $date.'
@@ -10792,7 +10798,7 @@ function reporting_get_agentmodule_data_sum(
         return false;
     }
 
-    // Set initial conditions
+    // Set initial conditions.
     $total = 0;
     $partial_total = 0;
     $count_sum = 0;
@@ -10801,18 +10807,9 @@ function reporting_get_agentmodule_data_sum(
         $partial_total = 0;
         $count_sum = 0;
 
-        switch ($config['dbtype']) {
+        if (!$uncompressed_module) {
-            case 'mysql':
+            $total += $data['datos'];
-            case 'postgresql':
+        } else if (!$module_inc) {
-                // Do none
-            break;
-
-            case 'oracle':
-                $data['datos'] = oracle_format_float_to_php($data['datos']);
-            break;
-        }
-
-        if (!$module_inc) {
             foreach ($data['data'] as $val) {
                 if (is_numeric($val['datos'])) {
                     $partial_total += $val['datos'];
@@ -10824,7 +10821,7 @@ function reporting_get_agentmodule_data_sum(
                 continue;
             }
 
-            $total += ($partial_total / $count_sum);
+            $total += $partial_total;
         } else {
             $last = end($data['data']);
             $total += $last['datos'];

pandora_console/include/functions_reporting_html.php

@@ -2532,7 +2532,7 @@ function reporting_html_monitor_report($table, $item, $mini, $pdf=0)
             true
         ).' '.__('OK').': '.remove_right_zeros(
             number_format(
-                $item['data']['ok']['formated_value'],
+                $item['data']['ok']['value'],
                 $config['graph_precision']
             )
         ).' %</p>';
@@ -2543,7 +2543,7 @@ function reporting_html_monitor_report($table, $item, $mini, $pdf=0)
             true
         ).' '.__('Not OK').': '.remove_right_zeros(
             number_format(
-                $item['data']['fail']['formated_value'],
+                $item['data']['fail']['value'],
                 $config['graph_precision']
             )
         ).' % '.'</p>';

pandora_console/include/functions_ui.php

@@ -2679,6 +2679,7 @@ function get_shape_status_set($type)
         case STATUS_MODULE_UNKNOWN:
         case STATUS_AGENT_UNKNOWN:
         case STATUS_AGENT_DOWN:
+        case STATUS_AGENT_NO_MONITORS:
             $return = ['class' => 'status_rounded_rectangles'];
         break;
 

pandora_console/include/javascript/pandora.js

@@ -1890,6 +1890,16 @@ function load_modal(settings) {
     width = settings.onshow.width;
   }
 
+  settings.target.html("Loading modal...");
+  settings.target
+    .dialog({
+      title: "Loading",
+      close: false,
+      width: 200,
+      buttons: []
+    })
+    .show();
+
   $.ajax({
     method: "post",
     url: settings.url,
@@ -1898,6 +1908,9 @@ function load_modal(settings) {
     data: data,
     success: function(data) {
       settings.target.html(data);
+      if (settings.onload != undefined) {
+        settings.onload(data);
+      }
       settings.target.dialog({
         resizable: true,
         draggable: true,
@@ -1915,7 +1928,9 @@ function load_modal(settings) {
             text: settings.modal.cancel,
             click: function() {
               $(this).dialog("close");
-              settings.cleanup();
+              if (typeof settings.cleanup == "function") {
+                settings.cleanup();
+              }
             }
           },
           {
@@ -1925,6 +1940,9 @@ function load_modal(settings) {
             click: function() {
               if (AJAX_RUNNING) return;
               AJAX_RUNNING = 1;
+              if (settings.onsubmit.preaction != undefined) {
+                settings.onsubmit.preaction();
+              }
               var formdata = new FormData();
               if (settings.extradata) {
                 settings.extradata.forEach(function(item) {
@@ -1952,7 +1970,9 @@ function load_modal(settings) {
                 contentType: false,
                 data: formdata,
                 success: function(data) {
-                  settings.ajax_callback(data);
+                  if (settings.ajax_callback != undefined) {
+                    settings.ajax_callback(data);
+                  }
                   AJAX_RUNNING = 0;
                 }
               });

pandora_console/include/styles/credential_store.css

@@ -10,3 +10,33 @@
 #new_key select {
   width: 60%;
 }
+
+ul.wizard li > label:not(.p-switch) {
+  width: auto;
+}
+
+form.top-action-buttons ul.wizard {
+  display: flex;
+  flex-direction: row;
+}
+
+ul.wizard li {
+  margin-right: 1em;
+}
+
+form.modal ul.wizard li {
+  display: flex;
+  flex-direction: row;
+  width: 90%;
+  margin: 0 auto;
+  justify-items: center;
+}
+
+form.modal ul.wizard li * {
+  flex: 1;
+}
+
+ul.wizard li.flex-indep {
+  flex: 1;
+  margin: 0;
+}

pandora_console/include/styles/pandora.css

@@ -452,6 +452,9 @@ select:-internal-list-box {
 .mw120px {
   min-width: 120px;
 }
+.mw180px {
+  min-width: 180px;
+}
 .mw250px {
   min-width: 250px;
 }
@@ -3182,6 +3185,7 @@ table#policy_modules td * {
 
 #news_board {
   min-width: 530px;
+  width: 100%;
 }
 
 #right_column_logon_ok {

pandora_console/include/styles/pandoraPDF.css

@@ -27,9 +27,6 @@
  * GNU General Public License for more details.
  * ============================================================================
  */
-table {
-  text-align: center;
-}
 
 table.header_table {
   width: 100%;
@@ -72,6 +69,7 @@ table.table_beauty tbody tr td {
 
 table.databox {
   margin-bottom: 20px;
+  text-align: center;
 }
 
 th.title_table_pdf {

pandora_console/include/visual-console-client/vc.main.css

@@ -13,27 +13,27 @@
   display: flex;
   -webkit-box-orient: initial;
   -webkit-box-direction: initial;
-      -ms-flex-direction: initial;
+  -ms-flex-direction: initial;
-          flex-direction: initial;
+  flex-direction: initial;
   justify-items: center;
   -webkit-box-align: center;
-      -ms-flex-align: center;
+  -ms-flex-align: center;
-          align-items: center;
+  align-items: center;
   -webkit-user-select: text;
-     -moz-user-select: text;
+  -moz-user-select: text;
-      -ms-user-select: text;
+  -ms-user-select: text;
-          user-select: text;
+  user-select: text;
 }
 
 .visual-console-item.is-editing {
   border: 2px dashed #b2b2b2;
   -webkit-transform: translateX(-2px) translateY(-2px);
-          transform: translateX(-2px) translateY(-2px);
+  transform: translateX(-2px) translateY(-2px);
   cursor: move;
   -webkit-user-select: none;
-     -moz-user-select: none;
+  -moz-user-select: none;
-      -ms-user-select: none;
+  -ms-user-select: none;
-          user-select: none;
+  user-select: none;
 }
 
 .visual-console-item.is-editing > .resize-draggable {
@@ -60,17 +60,17 @@
   display: flex;
   -webkit-box-orient: vertical;
   -webkit-box-direction: normal;
-      -ms-flex-direction: column;
+  -ms-flex-direction: column;
-          flex-direction: column;
+  flex-direction: column;
   -webkit-box-pack: center;
-      -ms-flex-pack: center;
+  -ms-flex-pack: center;
-          justify-content: center;
+  justify-content: center;
   justify-items: center;
   -ms-flex-line-pack: center;
-      align-content: center;
+  align-content: center;
   -webkit-box-align: center;
-      -ms-flex-align: center;
+  -ms-flex-align: center;
-          align-items: center;
+  align-items: center;
 }
 
 .visual-console-item .digital-clock > span {
@@ -89,7 +89,7 @@
 }
 
 .visual-console-item .digital-clock > span.timezone {
-  font-size: 25px;
+  font-size: 28px;
 }
 
 /* Analog clock */
@@ -100,18 +100,17 @@
 
 .visual-console-item .analogic-clock .hour-hand {
   -webkit-animation: rotate-hour 43200s infinite linear;
-          animation: rotate-hour 43200s infinite linear;
+  animation: rotate-hour 43200s infinite linear;
 }
 
 .visual-console-item .analogic-clock .minute-hand {
   -webkit-animation: rotate-minute 3600s infinite linear;
-          animation: rotate-minute 3600s infinite linear;
+  animation: rotate-minute 3600s infinite linear;
 }
 
 .visual-console-item .analogic-clock .second-hand {
   -webkit-animation: rotate-second 60s infinite linear;
-          animation: rotate-second 60s infinite linear;
+  animation: rotate-second 60s infinite linear;
 }
 
-
+/*# sourceMappingURL=vc.main.css.map*/
-/*# sourceMappingURL=vc.main.css.map*/

pandora_console/include/web2image.js

@@ -61,6 +61,7 @@ page.onConsoleMessage = function(msg) {
 page.onError = function(msg) {
   console.log(msg);
   page.close();
+  phantom.exit();
 };
 
 page.onCallback = function(st) {
@@ -74,4 +75,9 @@ page.onCallback = function(st) {
   phantom.exit();
 };
 
-page.open(url, "POST", post_data, function(status) {});
+page.open(url, "POST", post_data, function(status) {
+  if (status == "fail") {
+    console.out("Failed to generate chart.");
+    phantom.exit();
+  }
+});

pandora_console/install.php

@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.738';
-            $build = '190913';
+            $build = '190924';
             $banner = "v$version Build $build";
 
             error_reporting(0);

pandora_console/operation/events/events.php

@@ -1247,6 +1247,14 @@ try {
         ];
     }
 
+    // Identifies column instructions to make it unsortable.
+    if (in_array('instructions', $fields) > 0) {
+        $fields[array_search('instructions', $fields)] = [
+            'text'  => 'instructions',
+            'class' => 'column-instructions',
+        ];
+    }
+
     $evento_id = array_search('evento', $fields);
     if ($evento_id !== false) {
         $fields[$evento_id] = [
@@ -1411,6 +1419,7 @@ try {
             'no_sortable_columns' => [
                 -1,
                 -2,
+                'column-instructions',
             ],
             'ajax_postprocess'    => 'process_datatables_item(item)',
             'drawCallback'        => 'process_datatables_callback(this, settings)',

pandora_console/operation/incidents/list_integriaims_incidents.php

@@ -27,7 +27,7 @@ if (! check_acl($config['id_user'], 0, 'IR')) {
 
 // Header tabs.
 $onheader = integriaims_tabs('list_tab');
-ui_print_page_header(__('Integria IMS Incidents'), '', false, '', false, $onheader);
+ui_print_page_header(__('Integria IMS Tickets'), '', false, '', false, $onheader);
 
 // Check if Integria integration enabled.
 if ($config['integria_enabled'] == 0) {
@@ -112,7 +112,7 @@ $table->data[0][3] = html_print_select(
     'incident_status',
     $incident_status,
     '',
-    __('Select'),
+    __('All'),
     0,
     true
 );
@@ -123,7 +123,7 @@ $table->data[0][5] = html_print_select(
     'incident_group',
     $incident_group,
     '',
-    __('Select'),
+    __('All'),
     1,
     true
 );
@@ -140,7 +140,7 @@ $table->data[1][5] = html_print_select(
     'incident_priority',
     $incident_priority,
     '',
-    __('Select'),
+    __('All'),
     -1,
     true
 );
@@ -151,7 +151,7 @@ $table->data[2][1] = html_print_select(
     'incident_resolution',
     $incident_resolution,
     '',
-    __('Select'),
+    __('All'),
     '',
     true
 );
@@ -221,7 +221,7 @@ $integria_incidents_form .= '<div>'.html_print_submit_button(__('Filter'), 'filt
 $integria_incidents_form .= '</div>';
 $integria_incidents_form .= '</form>';
 
-ui_toggle($integria_incidents_form, __('Add Custom filter'), '', '', false);
+ui_toggle($integria_incidents_form, __('Filter'), '', '', false);
 
 /*
  * Order api call 'get_incidents'.

pandora_console/operation/menu.php

@@ -479,7 +479,7 @@ if (check_acl($config['id_user'], 0, 'IR')
     $sub2 = [];
     $sub2['operation/incidents/incident']['text'] = __('List of Incidents');
     $sub2[$sec2sub]['text'] = __('Statistics');
-    $sub2['operation/incidents/list_integriaims_incidents']['text'] = __('Integria IMS Incidents');
+    $sub2['operation/incidents/list_integriaims_incidents']['text'] = __('Integria IMS Tickets');
 
     $sub[$sec2]['sub2'] = $sub2;
     $sec2 = $temp_sec2;

pandora_console/operation/reporting/reporting_viewer.php

@@ -17,7 +17,6 @@ global $config;
 check_login();
 
 enterprise_hook('open_meta_frame');
-
 $id_report = (int) get_parameter('id');
 
 if (! $id_report) {
@@ -125,7 +124,7 @@ if (!defined('METACONSOLE')) {
 }
 
 // Page header for metaconsole
-if ($config['metaconsole'] == 1 and defined('METACONSOLE')) {
+if (is_metaconsole()) {
     // Bread crumbs
     ui_meta_add_breadcrumb(['link' => 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder', 'text' => __('Reporting')]);
 

pandora_console/operation/visual_console/legacy_public_view.php

@@ -115,6 +115,7 @@ echo '</li>';
 // Countdown.
 echo '<li class="nomn">';
 echo '<div class="vc-refr">';
+echo '<div class="vc-countdown style="display: inline;"></div>';
 echo '<div id="vc-refr-form">';
 echo __('Refresh').':';
 echo html_print_select(
@@ -187,7 +188,7 @@ $ignored_params['refr'] = '';
         var controls = document.getElementById('vc-controls');
         autoHideElement(controls, 1000);
         
-        $('select#refr').change(function (event) {
+        $('#vc-controls').change(function (event) {
             refr = Number.parseInt(event.target.value, 10);
             startCountDown(refr, false);
         });

pandora_console/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.738
-%define release     190913
+%define release     190924
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.rhel7.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.738
-%define release     190913
+%define release     190924
 
 # 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.738
-%define release     190913
+%define release     190924
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/pandoradb.sql

@@ -1455,6 +1455,7 @@ CREATE TABLE IF NOT EXISTS `treport_content` (
 	`current_month` TINYINT(1) DEFAULT '1',
 	`failover_mode` tinyint(1) DEFAULT '1',
 	`failover_type` tinyint(1) DEFAULT '1',
+	`uncompressed_module` TINYINT DEFAULT '0',
 	PRIMARY KEY(`id_rc`),
 	FOREIGN KEY (`id_report`) REFERENCES treport(`id_report`)
 		ON UPDATE CASCADE ON DELETE CASCADE
@@ -2438,14 +2439,17 @@ CREATE TABLE IF NOT EXISTS `tdashboard` (
 -- Table `tdatabase`
 -- ---------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tdatabase` (
-	`id` int(10) unsigned NOT NULL auto_increment,
+	`id` INT(10) unsigned NOT NULL auto_increment,
-	`host` varchar(100) default '',
+	`host` VARCHAR(255) default '',
-	`os_port` int(4) unsigned default '22',
+	`label` VARCHAR(255) default '',
-	`os_user` varchar(100) default '',
+	`os_port` INT UNSIGNED NOT NULL DEFAULT 22,
-	`db_port` int(4) unsigned default '3306',
+	`os_user` VARCHAR(255) default '',
+	`db_port` INT UNSIGNED NOT NULL DEFAULT 3306,
 	`status` tinyint(1) unsigned default '0',
 	`action` tinyint(1) unsigned default '0',
-	`last_error` varchar(255) default '',
+	`ssh_key` TEXT,
+	`ssh_pubkey` TEXT,
+	`last_error` TEXT,
 	PRIMARY KEY (`id`)
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8 ;
 
@@ -2998,6 +3002,7 @@ CREATE TABLE IF NOT EXISTS `treport_content_template` (
 	`current_month` TINYINT(1) DEFAULT '1',
 	`failover_mode` tinyint(1) DEFAULT '1',
 	`failover_type` tinyint(1) DEFAULT '1',
+	`uncompressed_module` TINYINT DEFAULT '0',
 	PRIMARY KEY(`id_rc`)
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8;
 

pandora_console/pandoradb_data.sql

@@ -1331,7 +1331,8 @@ UPDATE `tnotification_source` SET `enabled`=1 WHERE `description` = 'System&#x20
 -- 
 INSERT INTO `tlayout`
 VALUES
-    (1, 'Demo visual console', 0, 'fondo.jpg', 1080, 1920, 'white', 0);
+    (1, 'Demo visual console', 0, 'fondo.jpg', 1080, 1920, 'white', 0),
+    (2,'Demo visual console 2',0,'fondo-keep-alive.jpg',1080,1920,'#FFF',0);
 
 -- 
 -- Dumping data for table `tlayout_data`
@@ -1434,5 +1435,20 @@ VALUES
 	(94,1,580,904,0,0,'<p style="text-align: center; overflow: hidden;"><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;"><strong><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Office 7 - </span></strong></span><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Rack 2</span></p>','white',4,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,0),
 	(95,1,132,907,0,0,'<p style="text-align: center; overflow: hidden;"><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;"><strong><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Office 7 - </span></strong></span><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Rack 1</span></p>','white',4,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,0),
 	(96,1,733,20,0,0,'<p style="overflow: hidden;"><span class="visual_font_size_48pt"><strong><span style="color: #ffffff; font-family: opensans;">OFFICE RACKS</span></strong></span></p>','white',4,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(97,1,1479,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60)
+	(97,1,1479,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
-;
+    (98,2,709,103,0,400,'','white',19,3600,0,0,0,0,1,0,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','timedate','Europe/Madrid',0,0),
+    (99,2,178,481,111,111,'','status',0,3600,11556,430,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+    (100,2,542,481,111,111,'','status',0,3600,13,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+    (101,2,905,481,111,111,'','status',0,3600,114,11,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+    (102,2,1276,481,111,111,'','status',0,3600,7,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+    (103,2,1631,482,111,111,'','status',0,3600,11547,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+    (104,2,157,393,0,0,'<p style=\"line-height: 18px;\"><span class=\"visual_font_size_28pt\" style=\"line-height: 18px; color: #ffffff;\">Backups</span></p>\n<p style=\"line-height: 18px;\"> </p>','white',              
+4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),     
+    (105,2,512,382,96,172,'&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_28pt&quot;&#x20;style=&quot;font-family:&#x20;opensans;&#x20;color:&#x20;#ffffff;&quot;&gt;DB&#x20;Status&lt;/span&gt;&lt;/p&gt;&#x0a;&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&amp;nbsp;&lt;/p&gt;','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),            
+    (106,2,886,382,0,0,'<p style=\"line-height: 18px; overflow: hidden;\"><span class=\"visual_font_size_28pt\" style=\"color: #ffffff; font-family: opensans;\">Disk slave</span></p>\n<p style=\"line-height: 18px; overflow: hidden;\"> </p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+    (107,2,1251,382,0,0,'<p style=\"line-height: 18px; overflow: hidden;\"><span class=\"visual_font_size_28pt\" style=\"color: #ffffff; font-family: opensans;\">Disk /var</span></p>\n<p style=\"line-height: 18px; overflow: hidden;\"> </p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+    (108,2,1547,382,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_28pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&#x20;font-family:&#x20;opensans;&quot;&gt;Authentification&lt;/span&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), 
+    (109,2,126,820,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_36pt&quot;&#x20;style=&quot;font-family:&#x20;opensans;&#x20;color:&#x20;#ffffff;&quot;&gt;Processing&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+    (110,2,755,820,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_36pt&quot;&#x20;style=&quot;font-family:&#x20;opensans;&#x20;color:&#x20;#ffffff;&quot;&gt;Network&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+    (111,2,1281,820,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_36pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&#x20;font-family:&#x20;opensans;&quot;&gt;Storage&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0)
+;

pandora_server/DEBIAN/control

@@ -1,10 +1,10 @@
 package: pandorafms-server
-Version: 7.0NG.738-190913
+Version: 7.0NG.738-190924
 Architecture: all
 Priority: optional
 Section: admin
 Installed-Size: 640
 Maintainer: ÁRTICA ST <info@artica.es>
 Homepage: http://pandorafms.org/
-Depends: perl (>= 5.8), libdbi-perl, libdbd-mysql-perl, libtime-format-perl, libnetaddr-ip-perl, libtime-format-perl, libxml-simple-perl, libxml-twig-perl, libhtml-parser-perl, snmp, snmpd, traceroute, xprobe2, nmap, sudo, libwww-perl, libsocket6-perl, libio-socket-inet6-perl, snmp-mibs-downloader, libjson-perl, libnet-telnet-perl, libencode-locale-perl, libgeo-ip-perl
+Depends: perl (>= 5.8), libdbi-perl, libdbd-mysql-perl, libtime-format-perl, libnetaddr-ip-perl, libtime-format-perl, libxml-simple-perl, libxml-twig-perl, libhtml-parser-perl, snmp, snmpd, traceroute, xprobe2, nmap, sudo, libwww-perl, libsocket6-perl, libio-socket-inet6-perl, libio-socket-ssl-perl, snmp-mibs-downloader, libjson-perl, libnet-telnet-perl, libencode-locale-perl, libgeo-ip-perl
 Description: Pandora FMS is a monitoring system for big IT environments. It uses remote tests, or local agents to grab information. Pandora supports all standard OS (Linux, AIX, HP-UX, Solaris and Windows XP,2000/2003), and support multiple setups in HA enviroments. This is the server package. Server makes the remote checks and process information transfer by Pandora FMS agents to the server.

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.738-190913"
+pandora_version="7.0NG.738-190924"
 
 package_cpan=0
 package_pandora=1

pandora_server/bin/pandora_server

@@ -365,9 +365,11 @@ sub pandora_server_tasks ($) {
 
 		# COMMON TASKS (master and non-master) 
 		# ---------------------------------------------------------------
-
-		# Rotate Log File
 		if (($counter % 30) == 0) {
+			# Update configuration options from the console.
+			pandora_get_sharedconfig ($pa_config, $dbh);
+
+			# Rotate the log file.
 			pandora_rotate_logfile($pa_config);
 			
 			# Set event storm protection

pandora_server/conf/pandora_server.conf.new

@@ -226,8 +226,9 @@ recon_threads 1
 dataserver_threads 1
 
 # mta_address: External Mailer (MTA) IP Address to be used by Pandora FMS internal email capabilities
+# If not set, the MTA configuration specified in the Pandora FMS Console will be used.
 
-mta_address localhost
+#mta_address localhost
 
 # mta_port, this is the mail server port (default 25)
 
@@ -250,6 +251,10 @@ mta_address localhost
 
 #mta_from Pandora FMS <pandora@mydomain.com>
 
+# SMTP encryption protocol (none, ssl, starttls)
+
+#mta_encryption none
+
 # Set 1 if want eMail deliver alert in separate mail  (default). 
 # Set 0 if want eMail deliver shared mail by all destination.
 mail_in_separate 1

pandora_server/conf/pandora_server.conf.windows

@@ -214,6 +214,7 @@ recon_threads 2
 dataserver_threads 2
 
 # mta_address: External Mailer (MTA) IP Address to be used by Pandora FMS internal email capabilities
+# If not set, the MTA configuration specified in the Pandora FMS Console will be used.
 
 #mta_address localhost
 
@@ -235,6 +236,10 @@ dataserver_threads 2
 #           probably you need to change it to avoid problems with your antispam
 #mta_from pandora@sampledomain.com
 
+# SMTP encryption protocol (none, ssl, starttls)
+
+#mta_encryption none
+
 # xprobe2: Optional package to detect OS types using advanced TCP/IP 
 # fingerprinting tecniques, much more accurates than stadard nmap.
 # If not provided, nmap is used insted xprobe2

pandora_server/lib/PandoraFMS/Config.pm

@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.738";
-my $pandora_build = "190913";
+my $pandora_build = "190924";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
@@ -187,6 +187,33 @@ sub pandora_get_sharedconfig ($$) {
 		[$dbh]
 	);
 	$pa_config->{'rb_product_name'} = 'Pandora FMS' unless (defined ($pa_config->{'rb_product_name'}) && $pa_config->{'rb_product_name'} ne '');
+
+	# Mail transport agent configuration. Local configuration takes precedence.
+	if ($pa_config->{"mta_local"} eq 0) {
+		$pa_config->{"mta_address"} = pandora_get_tconfig_token ($dbh, 'email_smtpServer', '');
+		$pa_config->{"mta_from"} = '"' . pandora_get_tconfig_token ($dbh, 'email_from_name', 'Pandora FMS') . '" <' . 
+		                           pandora_get_tconfig_token ($dbh, 'email_from_dir', 'pandora@pandorafms.org') . '>';
+		$pa_config->{"mta_pass"} = pandora_get_tconfig_token ($dbh, 'email_password', '');
+		$pa_config->{"mta_port"} = pandora_get_tconfig_token ($dbh, 'email_smtpPort', '');
+		$pa_config->{"mta_user"} = pandora_get_tconfig_token ($dbh, 'email_username', '');
+		$pa_config->{"mta_encryption"} = pandora_get_tconfig_token ($dbh, 'email_encryption', '');
+
+		# Auto-negotiate the auth mechanism, since it cannot be set from the console.
+		# Do not include PLAIN, it generates the following error:
+		# 451 4.5.0 SMTP protocol violation, see RFC 2821
+		$pa_config->{"mta_auth"} = 'DIGEST-MD5 CRAM-MD5 LOGIN';
+
+		# Fix the format of mta_encryption.
+		if ($pa_config->{"mta_encryption"} eq 'tls') {
+			$pa_config->{"mta_encryption"} = 'starttls';
+		}
+		elsif ($pa_config->{"mta_encryption"} =~ m/^ssl/) {
+			$pa_config->{"mta_encryption"} = 'ssl';
+		}
+		else {
+			$pa_config->{"mta_encryption"} = 'none';
+		}
+	}
 }
 
 ##########################################################################
@@ -303,12 +330,14 @@ sub pandora_load_config {
 	$pa_config->{"dynamic_constant"} = 10; # 7.0
 	
 	# Internal MTA for alerts, each server need its own config.
-	$pa_config->{"mta_address"} = '127.0.0.1'; # Introduced on 2.0
+	$pa_config->{"mta_address"} = ''; # Introduced on 2.0
-	$pa_config->{"mta_port"} = '25'; # Introduced on 2.0
+	$pa_config->{"mta_port"} = ''; # Introduced on 2.0
 	$pa_config->{"mta_user"} = ''; # Introduced on 2.0
 	$pa_config->{"mta_pass"} = ''; # Introduced on 2.0
 	$pa_config->{"mta_auth"} = 'none'; # Introduced on 2.0 (Support LOGIN PLAIN CRAM-MD5 DIGEST-MD)
 	$pa_config->{"mta_from"} = 'pandora@localhost'; # Introduced on 2.0 
+	$pa_config->{"mta_encryption"} = 'none'; # 7.0 739
+	$pa_config->{"mta_local"} = 0; # 7.0 739
 	$pa_config->{"mail_in_separate"} = 1; # 1: eMail deliver alert mail in separate mails.
 					      # 0: eMail deliver 1 mail with all destination.
 
@@ -582,6 +611,7 @@ sub pandora_load_config {
 		}
 		elsif ($parametro =~ m/^mta_address\s(.*)/i) { 
 			$pa_config->{'mta_address'}= clean_blank($1); 
+			$pa_config->{'mta_local'}=1;
 		}
 		elsif ($parametro =~ m/^mta_port\s(.*)/i) { 
 			$pa_config->{'mta_port'}= clean_blank($1); 
@@ -592,6 +622,9 @@ sub pandora_load_config {
 		elsif ($parametro =~ m/^mta_from\s(.*)/i) { 
 			$pa_config->{'mta_from'}= clean_blank($1); 
 		}
+		elsif ($parametro =~ m/^mta_encryption\s(.*)/i) { 
+			$pa_config->{'mta_encryption'}= clean_blank($1); 
+		}
 		elsif ($parametro =~ m/^mail_in_separate\s+([0-9]*)/i) { 
 			$pa_config->{'mail_in_separate'}= clean_blank($1); 
 		}
@@ -1004,7 +1037,7 @@ sub pandora_load_config {
 			$pa_config->{'console_pass'}= safe_input(clean_blank($1));
 		}
 		elsif ($parametro =~ m/^encryption_passphrase\s(.*)/i) { # 6.0
-			$pa_config->{'encryption_passphrase'}= safe_input(clean_blank($1));
+			$pa_config->{'encryption_passphrase'} = clean_blank($1);
 		}
 		elsif ($parametro =~ m/^unknown_interval\s+([0-9]*)/i) { # > 5.1SP2
 			$pa_config->{'unknown_interval'}= clean_blank($1);

pandora_server/lib/PandoraFMS/Core.pm

@@ -3155,11 +3155,20 @@ sub pandora_get_config_value ($$) {
 ##########################################################################
 ## Get credential from credential store
 ##########################################################################
-sub pandora_get_credential ($$) {
+sub pandora_get_credential ($$$) {
-	my ($dbh, $identifier) = @_;
+	my ($pa_config, $dbh, $identifier) = @_;
 
 	my $key = get_db_single_row($dbh, 'SELECT * FROM tcredential_store WHERE identifier = ?', $identifier);
 
+	$key->{'username'} = pandora_output_password(
+		$pa_config,
+		safe_output($key->{'username'})
+	);
+	$key->{'password'} = pandora_output_password(
+		$pa_config,
+		safe_output($key->{'password'})
+	);
+
 	return $key;
 }
 

pandora_server/lib/PandoraFMS/PluginTools.pm

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

pandora_server/lib/PandoraFMS/Sendmail.pm

@@ -32,7 +32,9 @@ $VERSION = '0.79_16';
 
     'tz'      => '', # only to override automatic detection
     'port'    => 25, # change it if you always use a non-standard port
-    'debug'   => 0 # prints stuff to STDERR
+    'debug'   => 0, # prints stuff to STDERR
+    'encryption'  => 'none', # no, ssl or starttls
+	'timeout' => 5, # timeout for socket reads/writes in seconds
 );
 
 # *******************************************************************
@@ -54,7 +56,8 @@ use vars qw(
             $auth_support
            );
 
-use Socket;
+use IO::Socket::INET;
+use IO::Select;
 use Time::Local; # for automatic time zone detection
 use Sys::Hostname; # for use of hostname in HELO
 
@@ -62,6 +65,12 @@ use Sys::Hostname; # for use of hostname in HELO
 
 $auth_support = 'DIGEST-MD5 CRAM-MD5 PLAIN LOGIN';
 
+# IO::Socket object.
+my $S;
+
+# IO::Select object.
+my $Sel;
+
 # use MIME::QuotedPrint if available and configured in %mailcfg
 eval("use MIME::QuotedPrint");
 $mailcfg{'mime'} &&= (!$@);
@@ -178,9 +187,9 @@ sub sendmail {
     local $_;
 
     my (%mail, $k,
-        $smtp, $server, $port, $connected, $localhost,
+        $smtp, $server, $port, $localhost,
         $fromaddr, $recip, @recipients, $to, $header,
-        %esmtp, @wanted_methods,
+        %esmtp, @wanted_methods, $encryption
        );
     use vars qw($server_reply);
     # -------- a few internal subs ----------
@@ -191,7 +200,7 @@ sub sendmail {
             $error .= "Server said: $server_reply\n";
             print STDERR "Server said: $server_reply\n" if $^W;
         }
-        close S;
+        close $S if defined($S);
         return 0;
     }
 
@@ -200,31 +209,40 @@ sub sendmail {
         for $i (0..$#_) {
             # accept references, so we don't copy potentially big data
             my $data = ref($_[$i]) ? $_[$i] : \$_[$i];
-            if ($mailcfg{'debug'} > 5) {
+            if ($mailcfg{'debug'} > 9) {
                 if (length($$data) < 500) {
-                    print ">", $$data;
+                    print STDERR ">", $$data;
                 }
                 else {
-                    print "> [...", length($$data), " bytes sent ...]\n";
+                    print STDERR "> [...", length($$data), " bytes sent ...]\n";
                 }
             }
-            print(S $$data) || return 0;
+			my @sockets = $Sel->can_write($mailcfg{'timeout'});
+			return 0 if (!@sockets);
+           	syswrite($sockets[0], $$data) || return 0;
         }
         1;
     }
 
     sub socket_read {
+		my $buffer;
         $server_reply = "";
-        do {
+
-            $_ = <S>;
+		while (my @sockets = $Sel->can_read($mailcfg{'timeout'})) {
-            $server_reply .= $_;
+			return if (!@sockets);
-            #chomp $_;
+			# 16kByte is the maximum size of an SSL frame and because sysread
-            print "<$_" if $mailcfg{'debug'} > 5;
+			# returns data from only a single SSL frame you can guarantee that
-            if (/^[45]/ or !$_) {
+			# there are no pending data.
-                chomp $server_reply;
+ 		    sysread($sockets[0], $buffer, 65535) || return;
-                return; # return false
+        	$server_reply .= $buffer;
-            }
+			last if ($buffer =~ m/\n$/);
-        } while (/^[\d]+-/);
+		}
+
+        print STDERR "<$server_reply" if $mailcfg{'debug'} > 9;
+        if ($server_reply =~ /^[45]/) {
+            chomp $server_reply;
+            return; # return false
+        }
         chomp $server_reply;
         return $server_reply;
     }
@@ -260,13 +278,15 @@ sub sendmail {
     }
 
     $smtp = $mail{'Smtp'} || $mail{'Server'};
-    unshift @{$mailcfg{'smtp'}}, $smtp if ($smtp and $mailcfg{'smtp'}->[0] ne $smtp);
+    $mailcfg{'smtp'}->[0] = $smtp if ($smtp and $mailcfg{'smtp'}->[0] ne $smtp);
+
+    $encryption = $mail{'Encryption'} || $mail{'Encryption'};
 
     # delete non-header keys, so we don't send them later as mail headers
     # I like this syntax, but it doesn't seem to work with AS port 5.003_07:
     # delete @mail{'Smtp', 'Server'};
     # so instead:
-    delete $mail{'Smtp'}; delete $mail{'Server'};
+    delete $mail{'Smtp'}; delete $mail{'Server'}; delete $mail{'Encryption'};
 
     $mailcfg{'port'} = $mail{'Port'} || $mailcfg{'port'} || 25;
     delete $mail{'Port'};
@@ -343,48 +363,36 @@ sub sendmail {
     $localhost = hostname() || 'localhost';
 
     foreach $server ( @{$mailcfg{'smtp'}} ) {
-        # open socket needs to be inside this foreach loop on Linux,
+        print STDERR "- trying $server\n" if $mailcfg{'debug'} > 9;
-        # otherwise all servers fail if 1st one fails !??! why?
-        unless ( socket S, AF_INET, SOCK_STREAM, scalar(getprotobyname 'tcp') ) {
-            return fail("socket failed ($!)")
-        }
-
-        print "- trying $server\n" if $mailcfg{'debug'} > 1;
 
         $server =~ s/\s+//go; # remove spaces just in case of a typo
         # extract port if server name like "mail.domain.com:2525"
         $port = ($server =~ s/:(\d+)$//o) ? $1 : $mailcfg{'port'};
         $smtp = $server; # save $server for use outside foreach loop
 
-        my $smtpaddr = inet_aton $server;
+        # load IO::Socket SSL if needed
-        unless ($smtpaddr) {
+        if ($encryption ne 'none') {
-            $error .= "$server not found\n";
+            eval "require IO::Socket::SSL" || return fail("IO::Socket::SSL is not available");
-            next; # next server
         }
-
         my $retried = 0; # reset retries for each server
-        while ( ( not $connected = connect S, pack_sockaddr_in($port, $smtpaddr) )
+        if ($encryption ne 'ssl') {
-            and ( $retried < $mailcfg{'retries'} )
+            $S = new IO::Socket::INET(PeerPort => $port, PeerAddr => $server, Proto => 'tcp');
-              ) {
-            $retried++;
-            $error .= "connect to $server failed ($!)\n";
-            print "- connect to $server failed ($!)\n" if $mailcfg{'debug'} > 1;
-            print "retrying in $mailcfg{'delay'} seconds...\n" if $mailcfg{'debug'} > 1;
-            sleep $mailcfg{'delay'};
         }
-
+        else {
-        if ( $connected ) {
+            $S = new IO::Socket::SSL(PeerPort => $port, PeerAddr => $server, Proto => 'tcp', SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE(), Domain => AF_INET);
-            print "- connected to $server\n" if $mailcfg{'debug'} > 3;
+        }
+        if ( $S ) {
+            print STDERR "- connected to $server\n" if $mailcfg{'debug'} > 9;
             last;
         }
         else {
             $error .= "connect to $server failed\n";
-            print "- connect to $server failed, next server...\n" if $mailcfg{'debug'} > 1;
+            print STDERR "- connect to $server failed, next server...\n" if $mailcfg{'debug'} > 9;
             next; # next server
         }
     }
 
-    unless ( $connected ) {
+    unless ( $S ) {
         return fail("connect to $smtp failed ($!) no (more) retries!")
     };
 
@@ -397,8 +405,9 @@ sub sendmail {
               ;
     }
 
-    my($oldfh) = select(S); $| = 1; select($oldfh);
+	$Sel = new IO::Select() || return fail("IO::Select error");
-
+	$Sel->add($S);
+	
     socket_read()
         || return fail("Connection error from $smtp on port $port ($_)");
     socket_write("EHLO $localhost$CRLF")
@@ -418,8 +427,37 @@ sub sendmail {
             || return fail("send HELO error (lost connection?)");
     }
 
-    if ($auth) {
+    # STARTTLS
-        warn "AUTH requested\n" if ($mailcfg{debug} > 4);
+    if ($encryption eq 'starttls') {
+        defined($esmtp{'STARTTLS'})
+            || return fail('STARTTLS not supported');
+        socket_write("STARTTLS$CRLF") || return fail("send STARTTLS error");
+        socket_read()
+            || return fail('STARTTLS error');
+        IO::Socket::SSL->start_SSL($S, SSL_hostname => $server, SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE())
+            || return fail("start_SSL failed");
+
+        # The client SHOULD send an EHLO command as the
+        # first command after a successful TLS negotiation.
+        socket_write("EHLO $localhost$CRLF")
+            || return fail("send EHLO error (lost connection?)");
+        my $ehlo = socket_read();
+        if ($ehlo) {
+            # The server MUST discard any knowledge
+            # obtained from the client.
+            %esmtp = ();
+
+            # parse EHLO response
+            map {
+                s/^\d+[- ]//;
+                my ($k, $v) = split /\s+/, $_, 2;
+                $esmtp{$k} = $v || 1 if $k;
+            } split(/\n/, $ehlo);
+        }
+    }
+
+    if (defined($auth) && $auth->{'user'} ne '') {
+        warn "AUTH requested\n" if ($mailcfg{debug} > 9);
         # reduce wanted methods to those supported
         my @methods = grep {$esmtp{'AUTH'}=~/(^|\s)$_(\s|$)/i}
                         grep {$auth_support =~ /(^|\s)$_(\s|$)/i}
@@ -480,9 +518,9 @@ sub sendmail {
                 my $challenge = socket_read()
                     || return fail("AUTH DIGEST-MD5 failed: $server_reply");
                 $challenge =~ s/^\d+\s+//; $challenge =~ s/[\r\n]+$//;
-                warn "\nCHALLENGE=", decode_base64($challenge), "\n" if ($mailcfg{debug} > 10);
+                warn "\nCHALLENGE=", decode_base64($challenge), "\n" if ($mailcfg{debug} > 9);
                 my $response = _digest_md5($auth->{user}, $auth->{password}, decode_base64($challenge), $auth->{realm});
-                warn "\nRESPONSE=$response\n" if ($mailcfg{debug} > 10);
+                warn "\nRESPONSE=$response\n" if ($mailcfg{debug} > 9);
                 socket_write(encode_base64($response, ""), $CRLF)
                     || return fail("AUTH DIGEST-MD5 failed: $server_reply");
                 my $status = socket_read()
@@ -562,7 +600,7 @@ sub sendmail {
     socket_write("QUIT$CRLF")
            || return fail("send QUIT error");
     socket_read();
-    close S;
+    close $S;
 
     return 1;
 } # end sub sendmail

pandora_server/lib/PandoraFMS/Tools.pm

@@ -140,6 +140,7 @@ our @EXPORT = qw(
 	generate_agent_name_hash
 	long_to_ip
 	ip_to_long
+	get_enabled_servers
 );
 
 # ID of the different servers
@@ -518,7 +519,14 @@ sub pandora_sendmail {
 		Smtp		=> $pa_config->{"mta_address"},
 		Port		=> $pa_config->{"mta_port"},
 		From		=> $pa_config->{"mta_from"},
+		Encryption	=> $pa_config->{"mta_encryption"},
 	);
+
+	# Set the timeout.
+	$PandoraFMS::Sendmail::mailcfg{'timeout'} = $pa_config->{"tcp_timeout"};
+
+	# Enable debugging.
+	$PandoraFMS::Sendmail::mailcfg{'debug'} = $pa_config->{"verbosity"};
 	
 	if (defined($content_type)) {
 		$mail{'Content-Type'} = $content_type;
@@ -535,15 +543,12 @@ sub pandora_sendmail {
 		$mail{auth} = {user=>$pa_config->{"mta_user"}, password=>$pa_config->{"mta_pass"}, method=>$pa_config->{"mta_auth"}, required=>1 };
 	}
 
-	if (sendmail %mail) { 
+	eval {
-		return;
+		if (!sendmail(%mail)) { 
-	}
+			logger ($pa_config, "[ERROR] Sending email to $to_address with subject $subject", 1);
-	else {
+			logger ($pa_config, "ERROR Code: $Mail::Sendmail::error", 5) if (defined($Mail::Sendmail::error));
-		logger ($pa_config, "[ERROR] Sending email to $to_address with subject $subject", 1);
-		if (defined($Mail::Sendmail::error)){
-			logger ($pa_config, "ERROR Code: $Mail::Sendmail::error", 5);
 		}
-	}
+	};
 }
 
 ##########################################################################
@@ -619,7 +624,7 @@ sub logger ($$;$) {
 	$message = safe_output ($message);
 
 	$level = 1 unless defined ($level);
-	return if ($level > $pa_config->{'verbosity'});
+	return if (!defined ($pa_config->{'verbosity'}) || $level > $pa_config->{'verbosity'});
 
 	if (!defined($pa_config->{'log_file'})) {
 		print strftime ("%Y-%m-%d %H:%M:%S", localtime()) . " [V". $level ."] " . $message . "\n";
@@ -2049,6 +2054,25 @@ sub long_to_ip {
 	return inet_ntoa pack("N", ($ip_long));
 }
 
+###############################################################################
+# Returns a list with enabled servers.
+###############################################################################
+sub get_enabled_servers {
+	my $conf = shift;
+
+	if (ref($conf) ne "HASH") {
+		return ();
+	}
+
+	my @server_list = map {
+		if ($_ =~ /server$/i && $conf->{$_} > 0) {
+			$_
+		} else {
+		}
+	} keys %{$conf};
+
+	return @server_list;
+}
 # End of function declaration
 # End of defined Code
 

pandora_server/pandora_server.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.738
-%define release     190913
+%define release     190924
 
 Summary:            Pandora FMS Server
 Name:               %{name}
@@ -27,7 +27,7 @@ Requires:           perl(DBI) perl(DBD::mysql)
 Requires:           perl(HTTP::Request::Common) perl(LWP::Simple) perl(LWP::UserAgent)
 Requires:           perl(XML::Simple) perl(XML::Twig) net-snmp-utils
 Requires:           perl(NetAddr::IP) net-snmp net-tools
-Requires:           perl(IO::Socket::INET6) perl(Net::Telnet)
+Requires:           perl(IO::Socket::INET6) perl(IO::Socket::SSL) perl(Net::Telnet)
 Requires:           nmap sudo perl(JSON)
 Requires:           perl(Time::HiRes) perl(Encode::Locale)
 Requires:           perl perl(Sys::Syslog) perl(HTML::Entities) perl(Geo::IP)

pandora_server/pandora_server.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.738
-%define release     190913
+%define release     190924
 
 Summary:            Pandora FMS Server
 Name:               %{name}
@@ -24,7 +24,7 @@ Provides:           %{name}-%{version}
 Requires:           perl-DBI perl-DBD-mysql perl-libwww-perl
 Requires:           perl-NetAddr-IP net-snmp net-tools perl-XML-Twig
 Requires:           nmap sudo perl-HTML-Tree perl-XML-Simple perl-Net-Telnet
-Requires:           perl-IO-Socket-INET6 perl-Socket6 snmp-mibs perl-JSON
+Requires:           perl-IO-Socket-INET6 perl-Socket6 perl-IO-Socket-SSL snmp-mibs perl-JSON
 Requires:           perl-Encode-Locale perl-Geo-IP
 
 %description

pandora_server/pandora_server_installer

@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.738"
-PI_BUILD="190913"
+PI_BUILD="190924"
 
 MODE=$1
 if [ $# -gt 1 ]; then

pandora_server/util/pandora_db.pl

@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.738 PS190913";
+my $version = "7.0NG.738 PS190924";
 
 # 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.738 PS190913";
+my $version = "7.0NG.738 PS190924";
 
 # save program name for logging
 my $progname = basename($0);