From 3f09d13941d4e565862fd68585a3603164d51d09 Mon Sep 17 00:00:00 2001 From: manuel Date: Tue, 24 Dec 2019 10:25:32 +0100 Subject: [PATCH 1/6] Fixed visual bug in grouped report item --- .../godmode/reporting/reporting_builder.item_editor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 98ee756b7b..3e216679d6 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -3318,7 +3318,7 @@ function print_General_list($width, $action, $idItem=null, $type='general') case 'new': ?> - + From 3d0b71d953352569560ae2c318ae50d0c360a7c6 Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Tue, 21 Jan 2020 11:05:49 +0100 Subject: [PATCH 2/6] Added enconding to POST variables --- pandora_console/extensions/realtime_graphs/ajax.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/extensions/realtime_graphs/ajax.php b/pandora_console/extensions/realtime_graphs/ajax.php index 73d3c20748..dea94a5753 100644 --- a/pandora_console/extensions/realtime_graphs/ajax.php +++ b/pandora_console/extensions/realtime_graphs/ajax.php @@ -109,6 +109,6 @@ if (empty($data)) { } echo '{ - "label": "'.$graph_title.'", - "data": [["'.time().'", '.$data.']] + "label": "'.htmlspecialchars($graph_title, ENT_QUOTES).'", + "data": [["'.time().'", '.htmlspecialchars($data, ENT_QUOTES).']] }'; From 475517afd7ed17891e43ef50b9d16f48ecee3066 Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 22 Jan 2020 00:01:19 +0100 Subject: [PATCH 3/6] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 92b58d2093..6b18e02935 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.742-200121 +Version: 7.0NG.742-200122 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 7949890c7d..ae2d8c8588 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.742-200121" +pandora_version="7.0NG.742-200122" 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 d8f1f76c61..e96e6fc5ea 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.742'; -use constant AGENT_BUILD => '200121'; +use constant AGENT_BUILD => '200122'; # 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 0d9d6acdf9..999ee63bc7 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.742 -%define release 200121 +%define release 200122 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 d480d10feb..8347c67a70 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.742 -%define release 200121 +%define release 200122 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 ddfdeb96e1..4058d11690 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.742" -PI_BUILD="200121" +PI_BUILD="200122" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 9066521f04..3d4b2368ac 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200121} +{200122} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 8fa204494b..253f64cd89 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.742(Build 200121)") +#define PANDORA_VERSION ("7.0NG.742(Build 200122)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 2bef7af712..abd4f2fd1e 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.742(Build 200121))" + VALUE "ProductVersion", "(7.0NG.742(Build 200122))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index adce843c8e..7a61edb807 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.742-200121 +Version: 7.0NG.742-200122 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 140f9a248a..fba1f194e0 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.742-200121" +pandora_version="7.0NG.742-200122" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 8927bde5e3..4dea2961f4 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC200121'; +$build_version = 'PC200122'; $pandora_version = 'v7.0NG.742'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 365acaad65..d595b64387 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index d21404f52f..2a11f694e8 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.742 -%define release 200121 +%define release 200122 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 8f58d7492c..c05ae55ec1 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.742 -%define release 200121 +%define release 200122 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index a4dfa0b388..54212a3afd 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.742" -PI_BUILD="200121" +PI_BUILD="200122" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 9b18efac75..1c80e260e5 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -34,7 +34,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.742 PS200121"; +my $version = "7.0NG.742 PS200122"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index aa85d0129f..145072230e 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.742 PS200121"; +my $version = "7.0NG.742 PS200122"; # save program name for logging my $progname = basename($0); From ca35bb64cc9143fa2c142afa5c0704fd7e44bbde Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Wed, 22 Jan 2020 10:17:35 +0100 Subject: [PATCH 4/6] Prepend folder to image to avoid Phar injection --- pandora_console/include/graphs/fgraph.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php index 40c79bbf51..11f4db2f43 100644 --- a/pandora_console/include/graphs/fgraph.php +++ b/pandora_console/include/graphs/fgraph.php @@ -57,6 +57,9 @@ switch ($graph_type) { $out_of_lim_str = io_safe_output(get_parameter('out_of_lim_str', false)); $out_of_lim_image = get_parameter('out_of_lim_image', false); + // Add relative path to avoid phar object injection. + $out_of_lim_image = '../graphs/'.$out_of_lim_image; + $title = get_parameter('title'); $mode = get_parameter('mode', 1); From 32b28bea0c7c708ed60c2d6bf9034ccb1a0a0173 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Wed, 22 Jan 2020 11:10:02 +0100 Subject: [PATCH 5/6] Added warning in update manager offline --- .../update_manager/update_manager.offline.php | 11 +++- .../include/javascript/update_manager.js | 50 +++++++++++++++++-- 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/pandora_console/godmode/update_manager/update_manager.offline.php b/pandora_console/godmode/update_manager/update_manager.offline.php index 8eff08d996..8fb4447772 100644 --- a/pandora_console/godmode/update_manager/update_manager.offline.php +++ b/pandora_console/godmode/update_manager/update_manager.offline.php @@ -46,6 +46,13 @@ if (! check_acl($config['id_user'], 0, 'PM') $baseurl = ui_get_full_url(false, false, false, false); +$current_package = db_get_value( + 'value', + 'tconfig', + 'token', + 'current_package_enterprise' +); + ?> var text1_package_file = "\n"; var text2_package_file = "\n"; + var text1_warning = "\n"; + var text2_warning = "\n"; var applying_mr = "\n"; var cancel_button = "\n"; var ok_button = "\n"; @@ -109,5 +118,5 @@ is not working on the metaconsole and there is no time to fix it --> diff --git a/pandora_console/include/javascript/update_manager.js b/pandora_console/include/javascript/update_manager.js index 0cc385fb95..6f0aeda5c6 100644 --- a/pandora_console/include/javascript/update_manager.js +++ b/pandora_console/include/javascript/update_manager.js @@ -4,7 +4,7 @@ var correct_install_progress = true; -function form_upload(homeurl) { +function form_upload(homeurl, current_package) { var home_url = typeof homeurl !== "undefined" ? homeurl + "/" : ""; //Thanks to: http://tutorialzine.com/2013/05/mini-ajax-file-upload-form/ @@ -164,7 +164,7 @@ function form_upload(homeurl) { .change(); // Begin the installation - install_package(res.package, homeurl); + install_package(res.package, homeurl, current_package); }); } else { // Something has gone wrong! @@ -214,7 +214,7 @@ function formatFileSize(bytes) { return (bytes / 1000).toFixed(2) + " KB"; } -function install_package(package, homeurl) { +function install_package(package, homeurl, current_package) { var home_url = typeof homeurl !== "undefined" ? homeurl + "/" : ""; $( @@ -1235,6 +1235,50 @@ function install_package(package, homeurl) { $("#pkg_apply_dialog").html(dialog_text); $("#pkg_apply_dialog").dialog("open"); + + const number_update = package.match(/package_(\d+).oum/); + + if (number_update === null || number_update[1] != current_package - 0 + 1) { + $( + "
" + ).dialog({ + resizable: true, + draggable: true, + modal: true, + overlay: { + opacity: 0.5, + background: "black" + }, + width: 600, + height: 250, + buttons: [ + { + text: ok_button, + click: function() { + $(this).dialog("close"); + } + } + ] + }); + + var dialog_warning = "
"; + dialog_warning = + dialog_warning + + "

" + + text1_warning + + "

"; + dialog_warning = dialog_warning + "

" + text2_warning + "

"; + dialog_warning = + dialog_warning + + "
"; + dialog_warning = dialog_warning + "
"; + + $("#warning_pkg").html(dialog_warning); + } } function check_install_package(package, homeurl) { From 18a3a747bd71dc3e45980b028f5072718e51fb2f Mon Sep 17 00:00:00 2001 From: marcos Date: Wed, 22 Jan 2020 12:24:15 +0100 Subject: [PATCH 6/6] add wiki url alerts correlation --- pandora_console/include/functions.php | 39 +++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 3be9676a28..89c53802b4 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -5480,6 +5480,45 @@ function get_help_info($section_name) } else { $result .= 'Discovery&printable=yes'; } + + case 'alert_configure': + if ($es) { + $result .= 'Alerts#Correlation_alert_creation'; + } else { + $result .= 'Alerts#Correlation_alert_creation'; + } + break; + + case 'alert_correlation': + if ($es) { + $result .= 'Alerts#Alert_correlation:_event_and_log_alerts'; + } else { + $result .= 'Alerts#Alert_correlation:_event_and_log_alerts'; + } + break; + + case 'alert_rules': + if ($es) { + $result .= 'Alerts#Rules_within_a_correlation_alert'; + } else { + $result .= 'Alerts#Rules_within_a_correlation_alert'; + } + break; + + case 'alert_fields': + if ($es) { + $result .= 'Alerts#Step_3:_Advanced_fields'; + } else { + $result .= 'Alerts#Step_3:_Advanced_fields'; + } + break; + + case 'alert_triggering': + if ($es) { + $result .= 'Alerts#Configuring_an_alert_template'; + } else { + $result .= 'Alerts#Configuring_an_alert_template'; + } break; }