tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into ent-11291-problemas-deteccion-os-a-partir-del-ticket-10744

This commit is contained in:
Calvo 2023-05-30 12:16:09 +02:00
parent 6fc9b71a04 617201acc2
commit aaddb519c0
40 changed files with 143 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 7.0NG.771-230526
Version: 7.0NG.771-230530
Architecture: all
Priority: optional
Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.771-230526"
pandora_version="7.0NG.771-230530"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

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

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_agent_linux
%define version 7.0NG.771
%define release 230526
%define release 230530
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_agent_linux
%define version 7.0NG.771
%define release 230526
%define release 230530
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# **********************************************************************
PI_VERSION="7.0NG.771"
PI_BUILD="230526"
PI_BUILD="230530"
OS_NAME=`uname -s`
FORCE=0

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{230526}
{230530}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.771 Build 230526")
#define PANDORA_VERSION ("7.0NG.771 Build 230530")
string pandora_path;
string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.771(Build 230526))"
VALUE "ProductVersion", "(7.0NG.771(Build 230530))"
VALUE "FileVersion", "1.0.0.0"
END
END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 7.0NG.771-230526
Version: 7.0NG.771-230530
Architecture: all
Priority: optional
Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.771-230526"
pandora_version="7.0NG.771-230530"
package_pear=0
package_pandora=1

79
pandora_console/godmode/agentes/agent_manager.php
View File

@ -295,25 +295,25 @@ if (enterprise_installed() === true) {
$cps_val = $cps;
}
}
}
// Parent agents.
$paramsParentAgent = [];
$paramsParentAgent['return'] = true;
$paramsParentAgent['show_helptip'] = false;
$paramsParentAgent['input_name'] = 'id_parent';
$paramsParentAgent['print_hidden_input_idagent'] = true;
$paramsParentAgent['hidden_input_idagent_name'] = 'id_agent_parent';
$paramsParentAgent['hidden_input_idagent_value'] = $id_parent;
$paramsParentAgent['value'] = db_get_value('alias', 'tagente', 'id_agente', $id_parent);
$paramsParentAgent['selectbox_id'] = 'cascade_protection_module';
$paramsParentAgent['javascript_is_function_select'] = true;
$paramsParentAgent['cascade_protection'] = true;
$paramsParentAgent['input_style'] = 'width: 100%;';
// Parent agents.
$paramsParentAgent = [];
$paramsParentAgent['return'] = true;
$paramsParentAgent['show_helptip'] = false;
$paramsParentAgent['input_name'] = 'id_parent';
$paramsParentAgent['print_hidden_input_idagent'] = true;
$paramsParentAgent['hidden_input_idagent_name'] = 'id_agent_parent';
$paramsParentAgent['hidden_input_idagent_value'] = $id_parent;
$paramsParentAgent['value'] = db_get_value('alias', 'tagente', 'id_agente', $id_parent);
$paramsParentAgent['selectbox_id'] = 'cascade_protection_module';
$paramsParentAgent['javascript_is_function_select'] = true;
$paramsParentAgent['cascade_protection'] = true;
$paramsParentAgent['input_style'] = 'width: 100%;';
if ($id_agente !== 0) {
// Deletes the agent's offspring.
$paramsParentAgent['delete_offspring_agents'] = $id_agente;
}
if ($id_agente !== 0) {
// Deletes the agent's offspring.
$paramsParentAgent['delete_offspring_agents'] = $id_agente;
}
$listIcons = gis_get_array_list_icons();
@ -631,15 +631,18 @@ $tableAdvancedAgent->style = [];
$tableAdvancedAgent->cellclass = [];
$tableAdvancedAgent->colspan = [];
$tableAdvancedAgent->rowspan = [];
// Secondary groups.
$tableAdvancedAgent->data['secondary_groups'][] = html_print_label_input_block(
__('Secondary groups'),
html_print_select_agent_secondary(
$agent,
$id_agente,
['selected_post' => $secondary_groups]
)
);
if (enterprise_installed() === true) {
// Secondary groups.
$tableAdvancedAgent->data['secondary_groups'][] = html_print_label_input_block(
__('Secondary groups'),
html_print_select_agent_secondary(
$agent,
$id_agente,
['selected_post' => $secondary_groups]
)
);
}
// Parent agent.
$tableAdvancedAgent->data['parent_agent'][] = html_print_label_input_block(
@ -795,8 +798,6 @@ if (enterprise_installed() === true) {
'',
'w540px',
'',
// Autocomplete.
'new-password'
);
} else {
$urlAddressInput = html_print_input_text(
@ -903,18 +904,16 @@ $tableAdvancedAgent->data['safe_operation'][] = html_print_label_input_block(
)
);
if (enterprise_installed() === true) {
ui_toggle(
html_print_table($tableAdvancedAgent, true),
'<span class="subsection_header_title">'.__('Advanced options').'</span>',
'',
'',
true,
false,
'white_box_content',
'no-border white_table_graph'
);
}
ui_toggle(
html_print_table($tableAdvancedAgent, true),
'<span class="subsection_header_title">'.__('Advanced options').'</span>',
'',
'',
true,
false,
'white_box_content',
'no-border white_table_graph'
);
// Custom fields.
$customOutputData = '';

8
pandora_console/godmode/massive/massive_add_profiles.php
View File

@ -109,7 +109,7 @@ if ($create_profiles) {
} else {
foreach ($profiles_id as $profile) {
// Check profiles permissions for non admin user.
if (is_user_admin($config['user_id']) === false) {
if (is_user_admin($config['id_user']) === false) {
$user_profiles = profile_get_profiles(
[
'pandora_management' => '<> 1',
@ -122,7 +122,7 @@ if ($create_profiles) {
AUDIT_LOG_ACL_VIOLATION,
'Trying to add administrator profile whith standar user for user '.io_safe_input($user)
);
exit;
continue;
}
}
@ -132,7 +132,7 @@ if ($create_profiles) {
AUDIT_LOG_ACL_VIOLATION,
'Trying to add profile group without permission for user '.io_safe_input($user)
);
exit;
continue;
}
foreach ($users_id as $user) {
@ -141,7 +141,7 @@ if ($create_profiles) {
AUDIT_LOG_ACL_VIOLATION,
'Trying to edit user without permission for user '.io_safe_input($user)
);
exit;
continue;
}
$profile_data = db_get_row_filter('tusuario_perfil', ['id_usuario' => $user, 'id_perfil' => $profile, 'id_grupo' => $group]);

2
pandora_console/godmode/modules/manage_network_components_form_common.php
View File

@ -327,7 +327,7 @@ $table->data[10][2] = __('Discard unknown events');
$table->data[10][3] = html_print_checkbox(
'throw_unknown_events',
1,
network_components_is_disable_type_event($id, EVENTS_GOING_UNKNOWN),
network_components_is_disable_type_event(($id === 0) ? false : $id, EVENTS_GOING_UNKNOWN),
true
);

5
pandora_console/include/chart_generator.php
View File

@ -46,6 +46,8 @@ if (json_last_error() === JSON_ERROR_NONE) {
$session_id = $data_decoded['session_id'];
$type_graph_pdf = $data_decoded['type_graph_pdf'];
$id_user = $data_decoded['id_user'];
$slicebar = $data_decoded['slicebar'];
$slicebar_value = $data_decoded['slicebar_value'];
$data_combined = [];
if (isset($data_decoded['data_combined']) === true) {
@ -64,6 +66,9 @@ global $config;
// Care whit this!!! check_login not working if you remove this.
$config['id_user'] = $id_user;
$_SESSION['id_usuario'] = $id_user;
if (!isset($config[$slicebar])) {
$config[$slicebar] = $slicebar_value;
}
// Try to initialize session using existing php session id.
$user = new PandoraFMS\User(['phpsessionid' => $session_id]);

2
pandora_console/include/config_process.php
View File

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

46
pandora_console/include/db/mysql.php
View File

@ -1190,30 +1190,32 @@ function mysql_db_format_array_to_update_sql($values)
$fields = [];
foreach ($values as $field => $value) {
if (is_numeric($field)) {
array_push($fields, $value);
continue;
} else if ($field[0] == '`') {
$field = str_replace('`', '', $field);
}
if ($value === null) {
$sql = sprintf('`%s` = NULL', $field);
} else if (is_int($value) || is_bool($value)) {
$sql = sprintf('`%s` = %d', $field, $value);
} else if (is_float($value) || is_double($value)) {
$sql = sprintf('`%s` = %f', $field, $value);
} else {
// String
if (isset($value[0]) && $value[0] == '`') {
// Don't round with quotes if it references a field
$sql = sprintf('`%s` = %s', $field, $value);
} else {
$sql = sprintf("`%s` = '%s'", $field, $value);
if (is_object($value) === false) {
if (is_numeric($field)) {
array_push($fields, $value);
continue;
} else if ($field[0] == '`') {
$field = str_replace('`', '', $field);
}
}
array_push($fields, $sql);
if ($value === null) {
$sql = sprintf('`%s` = NULL', $field);
} else if (is_int($value) || is_bool($value)) {
$sql = sprintf('`%s` = %d', $field, $value);
} else if (is_float($value) || is_double($value)) {
$sql = sprintf('`%s` = %f', $field, $value);
} else {
// String
if (isset($value[0]) && $value[0] == '`') {
// Don't round with quotes if it references a field
$sql = sprintf('`%s` = %s', $field, $value);
} else {
$sql = sprintf("`%s` = '%s'", $field, $value);
}
}
array_push($fields, $sql);
}
}
return implode(', ', $fields);

23
pandora_console/include/functions.php
View File

@ -3548,6 +3548,25 @@ function update_config_token($cfgtoken, $cfgvalue)
}
function update_check_config_token($cfgtoken, $cfgvalue)
{
global $config;
db_process_sql('START TRANSACTION');
if (isset($config[$cfgtoken])) {
delete_config_token($cfgtoken);
}
$insert = db_process_sql(sprintf("INSERT INTO tconfig (token, value) VALUES ('%s', '%s')", $cfgtoken, $cfgvalue));
db_process_sql('COMMIT');
if ($insert) {
$config[$cfgtoken] = $cfgvalue;
return true;
} else {
return false;
}
}
function delete_config_token($cfgtoken)
{
$delete = db_process_sql(sprintf('DELETE FROM tconfig WHERE token = "%s"', $cfgtoken));
@ -4284,6 +4303,8 @@ function generator_chart_to_pdf(
'data_module_list' => $module_list,
'data_combined' => $params_combined,
'id_user' => $config['id_user'],
'slicebar' => $_SESSION['slicebar'],
'slicebar_value' => $config[$_SESSION['slicebar']],
];
} else {
$data = [
@ -4291,6 +4312,8 @@ function generator_chart_to_pdf(
'session_id' => $session_id,
'type_graph_pdf' => $type_graph_pdf,
'id_user' => $config['id_user'],
'slicebar' => $_SESSION['slicebar'],
'slicebar_value' => $config[$_SESSION['slicebar']],
];
}

14
pandora_console/include/functions_inventory.php
View File

@ -818,9 +818,16 @@ function inventory_get_datatable(
function get_data_basic_info_sql($params, $count=false)
{
$table = 'tagente';
if (is_metaconsole() === true) {
$table = 'tmetaconsole_agent';
}
$where = 'WHERE 1=1 ';
if ($params['id_agent'] > 0) {
if ($params['id_agent'] > 0 && $count === true) {
$where .= sprintf(' AND id_agente = %d', $params['id_agent']);
} else if ($params['id_agent'] > 0 && $count === false) {
$where .= sprintf(' AND %s.id_agente = %d', $table, $params['id_agent']);
}
if ($params['id_group'] > 0) {
@ -897,11 +904,6 @@ function get_data_basic_info_sql($params, $count=false)
$innerjoin = '';
$groupby = '';
$table = 'tagente';
if (is_metaconsole() === true) {
$table = 'tmetaconsole_agent';
}
if ($count !== true) {
$fields = '*';
$innerjoin = 'LEFT JOIN tagente_estado ON '.$table.'.id_agente = tagente_estado.id_agente ';

2
pandora_console/include/functions_network_components.php
View File

@ -31,7 +31,7 @@ function network_components_is_disable_type_event($id=false, $type_event=false)
if ($id === false) {
switch ($type_event) {
case EVENTS_GOING_UNKNOWN:
return true;
return false;
break;
case EVENTS_UNKNOWN:

2
pandora_console/include/functions_reporting.php
View File

@ -9123,7 +9123,7 @@ function reporting_availability($report, $content, $date=false, $time=false)
modules_get_agentmodule_agent($item['id_agent_module'])
);
if (empty($text)) {
if (empty($row['data']['availability_item'])) {
$row['data']['availability_item'] = __('No Address');
}
} else {

5
pandora_console/include/graphs/functions_flot.php
View File

@ -756,8 +756,9 @@ function flot_slicesbar_graph(
'server_id' => $server_id,
];
// TO-DO Cambiar esto para que se pase por POST, NO SE PUEDE PASAR POR GET.
update_config_token($tokem_config, json_encode($graph_data));
update_check_config_token($tokem_config, json_encode($graph_data));
$_SESSION['slicebar'] = $tokem_config;
$_SESSION['slicebar_value'] = json_encode($graph_data);
$graph = '<img src="data:image/png;base64,';
$graph .= generator_chart_to_pdf('slicebar', $params);
$graph .= '" />';

3
pandora_console/include/javascript/pandora_modules.js
View File

@ -1548,10 +1548,7 @@ function changePlugin() {
var pluginDescription = pluginAllData.description;
var pluginMacros = pluginAllData.macros;
console.log(pluginAllData.macrosElement);
var pluginMacrosElement = JSON.parse(atob(pluginAllData.macrosElement));
console.log(pluginMacrosElement);
var displayShow = "none";
if (executionType == EXECUTION_TYPE_NETWORK) {
displayShow = "none";

2
pandora_console/install.php
View File

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

2
pandora_console/operation/inventory/inventory.php
View File

@ -1041,9 +1041,9 @@ if ($inventory_module !== 'basic') {
<?php
if ($order_by_agent === true) {
foreach ($rows as $agent_rows) {
$data = [];
$modules = '';
foreach ($agent_rows['row'] as $key_row => $row) {
$data = [];
$columns = explode(';', io_safe_output($row['data_format']));
array_push($columns, 'Timestamp');

6
pandora_console/operation/reporting/graph_viewer.php
View File

@ -344,7 +344,7 @@ if ($view_graph) {
$searchForm .= "<td class='datos w30p'>";
$searchForm .= html_print_label_input_block(
__('Time range'),
html_print_extended_select_for_time('period', $period, '', '', '0', 10, true, 'width:100%')
html_print_extended_select_for_time('period', (string) $period, '', '', 0, 10, true, 'width:100%')
);
$searchForm .= '</td>';
$searchForm .= '</tr><tr>';
@ -376,9 +376,9 @@ if ($view_graph) {
false,
'',
false
)
),
['div_id' => 'thresholdDiv']
);
$searchForm .= '</div>';
$searchForm .= '</td>';
$searchForm .= "<td class='datos w30p'>";

2
pandora_console/pandora_console.redhat.spec
View File

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

2
pandora_console/pandora_console.rhel7.spec
View File

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

2
pandora_console/pandora_console.spec
View File

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

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 7.0NG.771-230526
Version: 7.0NG.771-230530
Architecture: all
Priority: optional
Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.771-230526"
pandora_version="7.0NG.771-230530"
package_cpan=0
package_pandora=1

2
pandora_server/lib/PandoraFMS/Config.pm
View File

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

6
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -6707,6 +6707,9 @@ sub pandora_get_os ($$) {
if ($os =~ m/Apple/i || $os =~ m/Darwin/i) {
return 8;
}
if ($os =~ m/android/i) {
return 15;
}
if ($os =~ m/Linux/i) {
return 1;
}
@ -6719,9 +6722,6 @@ sub pandora_get_os ($$) {
if ($os =~ m/embedded/i) {
return 14;
}
if ($os =~ m/android/i) {
return 15;
}
if ($os =~ m/BSD/i) {
return 4;
}

4
pandora_server/lib/PandoraFMS/DiscoveryServer.pm
View File

@ -432,8 +432,8 @@ sub PandoraFMS::Recon::Base::guess_os($$;$) {
my $return = `"$self->{pa_config}->{nmap}" -sSU -T5 -F -O --osscan-limit $device 2>$DEVNULL`;
return OS_OTHER if ($? != 0);
my $str_os;
if ($return =~ /Aggressive OS guesses:\s*(.*)|OS details:\s(.*)/) {
if($1 ne "") {
if ($return =~ /Aggressive OS guesses:(.*?)(?>\(\d+%\),)|^OS details:(.*?)\(.*\)*$/mi) {
if(defined($1) && $1 ne "") {
$str_os = $1;
} else {
$str_os = $2;

2
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

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

2
pandora_server/pandora_server.redhat.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_server
%define version 7.0NG.771
%define release 230526
%define release 230530
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_server
%define version 7.0NG.771
%define release 230526
%define release 230530
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server_installer
View File

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

2
pandora_server/util/pandora_db.pl
View File

@ -35,7 +35,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
my $version = "7.0NG.771 Build 230526";
my $version = "7.0NG.771 Build 230530";
# Pandora server configuration
my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
my $version = "7.0NG.771 Build 230526";
my $version = "7.0NG.771 Build 230530";
# save program name for logging
my $progname = basename($0);