From 5429ebb8de615545df169ab8d5af9ff8f3d4e94f Mon Sep 17 00:00:00 2001 From: fermin831 Date: Wed, 25 Apr 2018 19:04:52 +0200 Subject: [PATCH 01/10] Removed unreachable host from events responses --- pandora_console/include/javascript/pandora_events.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js index bd9b6cfcb6..16d2ad4e0c 100644 --- a/pandora_console/include/javascript/pandora_events.js +++ b/pandora_console/include/javascript/pandora_events.js @@ -361,13 +361,8 @@ function perform_response(target, response_id) { timeout: 10000, dataType: 'html', success: function (data) { - if (data == '') { - $('#response_out').html('Unreachable host'); - } - else { - var out = data.replace(/[\n|\r]/g, "
"); - $('#response_out').html(out); - } + var out = data.replace(/[\n|\r]/g, "
"); + $('#response_out').html(out); $('#response_loading_command').hide(); $('#re_exec_command').show(); } From fe124bff5fe04c8889752acf397a688fd6cf4324 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Mon, 14 May 2018 14:41:11 +0200 Subject: [PATCH 02/10] Fixed rss events due to secondary groups --- pandora_console/operation/events/events_rss.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandora_console/operation/events/events_rss.php b/pandora_console/operation/events/events_rss.php index bb81462dbe..9a8bf2af51 100644 --- a/pandora_console/operation/events/events_rss.php +++ b/pandora_console/operation/events/events_rss.php @@ -138,7 +138,8 @@ require('events.build_query.php'); //////////////////////////////////////////////////////////////////////// $sql = "SELECT * - FROM tevento + FROM tevento te LEFT JOIN tagent_secondary_group tasg + ON te.id_grupo = tasg.id_group WHERE 1=1 " . $sql_post . " ORDER BY utimestamp DESC"; From 2e96c2bbd158a0c7e2859d5176fb8f19697e5df0 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Mon, 21 May 2018 15:19:25 +0200 Subject: [PATCH 03/10] Fixed a SQL injection vulnerability --- .../mobile/include/system.class.php | 20 ++++--------------- pandora_console/mobile/include/user.class.php | 2 +- pandora_console/mobile/operation/tactical.php | 2 ++ 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/pandora_console/mobile/include/system.class.php b/pandora_console/mobile/include/system.class.php index 4c98ee9f63..3e4c56930a 100644 --- a/pandora_console/mobile/include/system.class.php +++ b/pandora_console/mobile/include/system.class.php @@ -32,6 +32,9 @@ class System { } $this->session = $_SESSION; session_write_close(); + + require_once($this->getConfig('homedir') . '/include/functions.php'); + require_once($this->getConfig('homedir') . '/include/functions_io.php'); } public static function getInstance() { @@ -51,29 +54,14 @@ class System { } public function getRequest($name, $default = null) { - $return = $default; - - if (isset($_POST[$name])) { - $return = $_POST[$name]; - } - else { - if (isset($_GET[$name])) { - $return = $_GET[$name]; - } - } - - return $return; + return get_parameter($name, $default); } public function safeOutput($value) { - require_once($this->getConfig('homedir') . '/include/functions_io.php'); - return io_safe_output($value); } public function safeInput($value) { - require_once($this->getConfig('homedir') . '/include/functions_io.php'); - return io_safe_input($value); } diff --git a/pandora_console/mobile/include/user.class.php b/pandora_console/mobile/include/user.class.php index 2c22a355e7..cf5dcfea11 100644 --- a/pandora_console/mobile/include/user.class.php +++ b/pandora_console/mobile/include/user.class.php @@ -74,7 +74,6 @@ class User { if (($user == null) && ($password == null)) { $user = $system->getRequest('user', null); - $user = $system->safeInput($user); $password = $system->getRequest('password', null); } @@ -141,6 +140,7 @@ class User { } if (empty($code)) { $code = $system->getRequest('auth_code', null); + $code = $system->safeOutput($code); } if (!empty($user) && !empty($code)) { diff --git a/pandora_console/mobile/operation/tactical.php b/pandora_console/mobile/operation/tactical.php index e1e6118ea4..d622642112 100755 --- a/pandora_console/mobile/operation/tactical.php +++ b/pandora_console/mobile/operation/tactical.php @@ -49,7 +49,9 @@ class Tactical { switch ($parameter2) { case 'render_status_pie': $links = $system->getRequest('links', ''); + $links = $system->safeOutput($links); $data = $system->getRequest('data', ''); + $data = $system->safeOutput($data); $data = str_replace('\\','',$data); $links = str_replace('\\','',$links); $width = $system->getRequest('width', 230); From 447958144e56ee67ee5d7b2b2c5e662c9dbc53f7 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Mon, 21 May 2018 16:00:54 +0200 Subject: [PATCH 04/10] Error fix --- pandora_console/godmode/admin_access_logs.php | 4 ++-- pandora_console/godmode/audit_log_csv.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pandora_console/godmode/admin_access_logs.php b/pandora_console/godmode/admin_access_logs.php index abdb916b80..c3352d9ac2 100644 --- a/pandora_console/godmode/admin_access_logs.php +++ b/pandora_console/godmode/admin_access_logs.php @@ -108,11 +108,11 @@ if (!empty($filter_user)) { } if (!empty($filter_text)) { - $filter .= " AND (accion LIKE '%'" . $filter_text . "'%' OR descripcion LIKE '%'" . $filter_text . "'%')"; + $filter .= sprintf(" AND (accion LIKE '%%%s%%' OR descripcion LIKE '%%%s%%')", $filter_text, $filter_text); } if (!empty($filter_ip)) { - $filter .= sprintf(" AND ip_origen LIKE '%'", $filter_ip); + $filter .= sprintf(" AND ip_origen LIKE '%%%s%%'", $filter_ip); } if (!empty($filter_period)) { diff --git a/pandora_console/godmode/audit_log_csv.php b/pandora_console/godmode/audit_log_csv.php index 13f7ca384f..b09b90f827 100644 --- a/pandora_console/godmode/audit_log_csv.php +++ b/pandora_console/godmode/audit_log_csv.php @@ -59,11 +59,11 @@ if (!empty($filter_user)) { } if (!empty($filter_text)) { - $filter .= " AND (accion LIKE '%'" . $filter_text . "'%' OR descripcion LIKE '%'" . $filter_text . "'%')"; + $filter .= sprintf(" AND (accion LIKE '%%%s%%' OR descripcion LIKE '%%%s%%')", $filter_text, $filter_text); } if (!empty($filter_ip)) { - $filter .= sprintf(" AND ip_origen LIKE '%'", $filter_ip); + $filter .= sprintf(" AND ip_origen LIKE '%%%s%%'", $filter_ip); } if (!empty($filter_period)) { From f0f331be4ea181e07d11ae59ca88e2c6a54aa647 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Mon, 21 May 2018 16:22:38 +0200 Subject: [PATCH 05/10] Moved a button --- pandora_console/godmode/admin_access_logs.php | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pandora_console/godmode/admin_access_logs.php b/pandora_console/godmode/admin_access_logs.php index c3352d9ac2..5bfdfb4fcf 100644 --- a/pandora_console/godmode/admin_access_logs.php +++ b/pandora_console/godmode/admin_access_logs.php @@ -29,8 +29,6 @@ if (! check_acl($config['id_user'], 0, "PM")) { exit; } -ui_print_page_header(__('Pandora audit') . " » " . __('Review Logs'), "images/gm_log.png", false, "", true); - $offset = (int) get_parameter("offset"); $filter_type = (string) get_parameter("filter_type"); $filter_user = (string) get_parameter("filter_user"); @@ -45,6 +43,19 @@ $filter_query = "&filter_type=" . $filter_type . "&filter_period=" . $filter_period . "&filter_ip=" . $filter_ip; +$csv_url = ui_get_full_url(false, false, false, false) + . 'index.php?sec=gextensions&sec2=godmode/audit_log_csv' + . $filter_query; +$csv_img = html_print_image("images/csv_mc.png", true, array ("title" => __('Export to CSV'))); +$header_buttons = array( + 'csv' => array( + 'active' => false, + 'text' => '' . $csv_img . '' + ) +); + +ui_print_page_header(__('Pandora audit') . " » " . __('Review Logs'), "images/gm_log.png", false, "", true, $header_buttons); + $table = new stdClass(); $table->class = "databox filters"; $table->cellstyle = array(); @@ -239,13 +250,6 @@ foreach ($result as $row) { html_print_table($table); -echo '
'; -$csv_url = ui_get_full_url(false, false, false, false) . 'index.php?sec=gextensions&sec2=godmode/audit_log_csv' . $filter_query; -echo '' - . html_print_button(__("Export to CSV"), "export_csv", false, "", "class=sub upd", true, false) - . ''; -echo '
'; - if ($enterprise_include !== ENTERPRISE_NOT_HOOK) { enterprise_hook('enterpriseAuditFooter'); } From 4b197ab61a3ee07c02bf41ab9d18fa36d87d0851 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 22 May 2018 00:01:31 +0200 Subject: [PATCH 06/10] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 87623e933d..aa45b0b23c 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.722-180521 +Version: 7.0NG.722-180522 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index e0533d03ec..a891688f34 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.722-180521" +pandora_version="7.0NG.722-180522" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 45519926a9..b5e245dc96 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -42,7 +42,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.722'; -use constant AGENT_BUILD => '180521'; +use constant AGENT_BUILD => '180522'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index ba39aa4522..c86087f9c7 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.722 -%define release 180521 +%define release 180522 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index d9a44b8540..e9706ca567 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.722 -%define release 180521 +%define release 180522 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index dfa501e422..545cccc233 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.722" -PI_BUILD="180521" +PI_BUILD="180522" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 730c2a9f03..4d5d20319a 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180521} +{180522} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 0af512761e..978947be91 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0NG.722(Build 180521)") +#define PANDORA_VERSION ("7.0NG.722(Build 180522)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 541a181e17..e695181758 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.722(Build 180521))" + VALUE "ProductVersion", "(7.0NG.722(Build 180522))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 5de8f02622..6ab6811d54 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.722-180521 +Version: 7.0NG.722-180522 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index bf9e38b318..53eae0dffd 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.722-180521" +pandora_version="7.0NG.722-180522" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 3e381b02be..c0dd651384 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180521'; +$build_version = 'PC180522'; $pandora_version = 'v7.0NG.722'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index c68ccbd3bb..a2111071f1 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index eda106aea9..7990759321 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.722 -%define release 180521 +%define release 180522 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 31b8df335e..fbed5583ab 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.722 -%define release 180521 +%define release 180522 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index e1d8d26668..e4b7efcf58 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.722" -PI_BUILD="180521" +PI_BUILD="180522" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 6f5e0b890a..b86cab69a4 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.722 PS180521"; +my $version = "7.0NG.722 PS180522"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index b67fa81bc9..099841098a 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.722 PS180521"; +my $version = "7.0NG.722 PS180522"; # save program name for logging my $progname = basename($0); From 3accc313729ec88d46d7253796c610bffb8302cc Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 22 May 2018 15:57:36 +0200 Subject: [PATCH 07/10] add zoom graphs xy --- .../include/graphs/flot/pandora.flot.js | 47 +++++++++++++------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index c1abf15186..0ab870c20c 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -1546,7 +1546,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, shadowSize: 0.1 }, crosshair: { mode: 'xy' }, - selection: { mode: 'x', color: '#777' }, + selection: { mode: 'xy', color: '#777' }, export: { export_data: true, labels_long: labels_long, @@ -1640,7 +1640,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, color: '' } ], yaxis: {ticks: [], autoscaleMargin: 0.1 }, - selection: {mode: 'x', color: '#777' }, + selection: {mode: 'xy', color: '#777' }, legend: {show: false}, crosshair: {mode: 'x'} }); @@ -1652,6 +1652,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, if (menu == 0) { return; } + dataInSelection = ranges.xaxis.to - ranges.xaxis.from; dataInPlot = plot.getData()[0].data.length; @@ -1660,18 +1661,36 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, new_steps = parseInt(factor * steps); plot = $.plot($('#' + graph_id), data_base, - $.extend(true, {}, options, { - xaxis: { min: ranges.xaxis.from, max: ranges.xaxis.to}, - xaxes: [ { - tickFormatter: xFormatter, - minTickSize: new_steps, - color: '' - } ], - legend: { show: false } - })); + $.extend(true, {}, options, { + yaxis: { + min: ranges.yaxis.from, + max: ranges.yaxis.to + }, + yaxes: [{ + tickFormatter: yFormatter, + color: '', + alignTicksWithAxis: 1, + labelWidth: 30, + position: 'left', + font: font, + reserveSpace: true, + min: ranges.yaxis.from + }], + xaxis: { + min: ranges.xaxis.from, + max: ranges.xaxis.to + }, + xaxes: [ { + tickFormatter: xFormatter, + minTickSize: new_steps, + color: '' + } ], + legend: { show: false } + })); + if (thresholded) { var zoom_data_threshold = new Array (); - + var y_recal = axis_thresholded(threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max, red_threshold, extremes, red_up); plot = $.plot($('#' + graph_id), data_base, @@ -1690,7 +1709,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, plot.setData(zoom_data_threshold); plot.draw(); } - + $('#menu_cancelzoom_' + graph_id) .attr('src', homeurl + '/images/zoom_cross_grey.png'); @@ -1760,7 +1779,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, } else if (y < -1000) { how_bigger = "K"; - y = y / 1000; + y = y / 1000; } if (currentRanges == null || (currentRanges.xaxis.from < j && j < currentRanges.xaxis.to)) { From 37f19dc9fd99afd712dc5024fb4fa6b2d12e3a35 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Tue, 22 May 2018 16:17:08 +0200 Subject: [PATCH 08/10] Fixed a column name --- pandora_console/include/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 27dd557c24..038b05bcf7 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -2368,7 +2368,7 @@ function print_audit_csv ($data) { echo __('User') . ';' . __('Action') . ';' . __('Date') . ';' . - __('Source ID') . ';' . + __('Source IP') . ';' . __('Comments') ."\n"; foreach ($data as $line) { echo io_safe_output($line['id_usuario']) . ';' . io_safe_output($line['accion']) . ';' . $line['fecha'] . ';' . $line['ip_origen'] . ';'. io_safe_output($line['descripcion']). "\n"; From 9d558fb7cb0b6fdf0f9e960aebd6b1cdd718b2d3 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Tue, 22 May 2018 16:30:33 +0200 Subject: [PATCH 09/10] Removed some duplicated html entities --- pandora_console/godmode/agentes/configurar_agente.php | 3 ++- pandora_console/godmode/alerts/alert_list.php | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 5cf8e8a03d..0b4b32d819 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -284,8 +284,9 @@ if ($create_agent) { "Url description":"' . $url_description .'", "Quiet":"' . (int)$quiet.'"}'; + $unsafe_alias = io_safe_output($alias); db_pandora_audit("Agent management", - "Created agent $alias", false, true, $info); + "Created agent $unsafe_alias", false, true, $info); } else { $id_agente = 0; diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php index 335766606b..a65b925a44 100644 --- a/pandora_console/godmode/alerts/alert_list.php +++ b/pandora_console/godmode/alerts/alert_list.php @@ -90,14 +90,17 @@ if ($create_alert) { "tagente_modulo","id_agente_modulo", $id_agent_module)); // Audit the creation only when the alert creation is correct + $unsafe_alert_template_name = io_safe_output($alert_template_name); + $unsafe_module_name = io_safe_output($module_name); + $unsafe_agent_alias = io_safe_output($agent_alias); if ($id) { db_pandora_audit("Alert management", - "Added alert '$alert_template_name' for module '$module_name' in agent '$agent_alias'", + "Added alert '$unsafe_alert_template_name' for module '$unsafe_module_name' in agent '$unsafe_agent_alias'", false, false, 'ID: ' . $id); } else { db_pandora_audit("Alert management", - "Fail Added alert '$alert_template_name' for module '$module_name' in agent '$agent_alias'"); + "Fail Added alert '$unsafe_alert_template_name' for module '$unsafe_module_name' in agent '$unsafe_agent_alias'"); } $messageAction = ui_print_result_message ($id, From e015354a99ff75443024e9e272bc319cafc3d625 Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 23 May 2018 00:01:24 +0200 Subject: [PATCH 10/10] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index aa45b0b23c..1949c24f0c 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.722-180522 +Version: 7.0NG.722-180523 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index a891688f34..70747174ed 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.722-180522" +pandora_version="7.0NG.722-180523" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index b5e245dc96..218a50fc32 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -42,7 +42,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.722'; -use constant AGENT_BUILD => '180522'; +use constant AGENT_BUILD => '180523'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index c86087f9c7..27a0919bbd 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.722 -%define release 180522 +%define release 180523 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index e9706ca567..eb75470502 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.722 -%define release 180522 +%define release 180523 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 545cccc233..313b8a9695 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.722" -PI_BUILD="180522" +PI_BUILD="180523" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 4d5d20319a..1acc9af3b7 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180522} +{180523} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 978947be91..ca79433773 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0NG.722(Build 180522)") +#define PANDORA_VERSION ("7.0NG.722(Build 180523)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index e695181758..596622603d 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.722(Build 180522))" + VALUE "ProductVersion", "(7.0NG.722(Build 180523))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 6ab6811d54..c1489b58f9 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.722-180522 +Version: 7.0NG.722-180523 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 53eae0dffd..762e1fe921 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.722-180522" +pandora_version="7.0NG.722-180523" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index c0dd651384..a814960f00 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180522'; +$build_version = 'PC180523'; $pandora_version = 'v7.0NG.722'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index a2111071f1..0e06bbb36c 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 7990759321..72ef3130fd 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.722 -%define release 180522 +%define release 180523 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index fbed5583ab..2ff23e0686 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.722 -%define release 180522 +%define release 180523 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index e4b7efcf58..fb51e346a4 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.722" -PI_BUILD="180522" +PI_BUILD="180523" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index b86cab69a4..6fc4b5760c 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.722 PS180522"; +my $version = "7.0NG.722 PS180523"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 099841098a..58e94208e2 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.722 PS180522"; +my $version = "7.0NG.722 PS180523"; # save program name for logging my $progname = basename($0);