diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index b4fa1960c3..a6cfb78ab3 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.739-191018 +Version: 7.0NG.739-191024 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 735441fb69..6c012fd600 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.739-191018" +pandora_version="7.0NG.739-191024" 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 97e955d535..bcd51d6013 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.739'; -use constant AGENT_BUILD => '191018'; +use constant AGENT_BUILD => '191024'; # 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 c4b83f2e5a..ef5283a029 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.739 -%define release 191018 +%define release 191024 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 74271d6a79..0a28f9939a 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.739 -%define release 191018 +%define release 191024 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 bba886c827..1d8df16224 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.739" -PI_BUILD="191018" +PI_BUILD="191024" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 12a5d562d0..4fb46791ac 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{191018} +{191024} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 3d1accb3ed..42dfb8c19f 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.739(Build 191018)") +#define PANDORA_VERSION ("7.0NG.739(Build 191024)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index ccf0e2861d..39087d93aa 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.739(Build 191018))" + VALUE "ProductVersion", "(7.0NG.739(Build 191024))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index c046dfce46..ee51ddd7f1 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.739-191018 +Version: 7.0NG.739-191024 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 bde6a64dab..f5e82f20e0 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.739-191018" +pandora_version="7.0NG.739-191024" package_pear=0 package_pandora=1 diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 6ad5267c0e..b7b1d296ec 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -842,7 +842,9 @@ foreach ($modules as $module) { $module['str_warning'], $module['max_critical'], $module['min_critical'], - $module['str_critical'] + $module['str_critical'], + $module['warning_inverse'], + $module['critical_inverse'] ); } else { $data[7] = ''; diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index ccdb829f9c..b59dbc2ee5 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -240,7 +240,7 @@ switch ($action) { $hide_notinit_agents = $style['hide_notinit_agents']; $dyn_height = $style['dyn_height']; $type = $item['type']; - $name = $item['name']; + $name = $style['name_label']; switch ($type) { case 'event_report_log': diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php index 4eaeeed45b..1b7d3b4df6 100755 --- a/pandora_console/godmode/reporting/reporting_builder.list_items.php +++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php @@ -1,18 +1,34 @@ data[0][1] .= html_print_select($modules, 'module_filter', $moduleFilter, '', __('All'), 0, true); $table->data[0][2] = __('Type'); $table->data[0][2] .= html_print_select($types, 'type_filter', $typeFilter, '', __('All'), 0, true); - // $table->data[1][2] = $table->data[1][3] = ''; $form = '
'; $form .= html_print_table($table, true); $form .= '
'; @@ -265,13 +291,6 @@ if ($moduleFilter != 0) { $where .= ' AND id_agent_module = '.$moduleFilter; } -// Filter report items created from metaconsole in normal console list and the opposite -if (defined('METACONSOLE') and $config['metaconsole'] == 1) { - $where .= ' AND ((server_name IS NOT NULL AND length(server_name) != 0) '.'OR '.$type_escaped.' IN (\'general\', \'SLA\', \'exception\', \'availability\', \'availability_graph\', \'top_n\',\'SLA_monthly\',\'SLA_weekly\',\'SLA_hourly\',\'text\'))'; -} else { - $where .= ' AND ((server_name IS NULL OR length(server_name) = 0) '.'OR '.$type_escaped.' IN (\'general\', \'SLA\', \'exception\', \'availability\', \'top_n\'))'; -} - switch ($config['dbtype']) { case 'mysql': $items = db_get_all_rows_sql( @@ -306,13 +325,17 @@ switch ($config['dbtype']) { 'AND', false ); - // Delete rnum row generated by oracle_recode_query() function + // Delete rnum row generated by oracle_recode_query() function. if ($items !== false) { for ($i = 0; $i < count($items); $i++) { unset($items[$i]['rnum']); } } break; + + default: + // Default. + break; } $countItems = db_get_sql( @@ -421,29 +444,30 @@ foreach ($items as $item) { $row[1] = get_report_name($item['type']); - if ($item['type'] == 'custom_graph') { - $custom_graph_name = db_get_row_sql('select name from tgraph where id_graph = '.$item['id_gs']); - $row[1] = get_report_name($item['type']).' ('.$custom_graph_name['name'].')'; - } - $server_name = $item['server_name']; - if (($config['metaconsole'] == 1) && ($server_name != '') && defined('METACONSOLE')) { + if (is_metaconsole()) { $connection = metaconsole_get_connection($server_name); if (metaconsole_load_external_db($connection) != NOERR) { // ui_print_error_message ("Error connecting to ".$server_name); } } + if ($item['type'] == 'custom_graph') { + $custom_graph_name = db_get_row_sql('SELECT name FROM tgraph WHERE id_graph = '.$item['id_gs']); + $row[1] = get_report_name($item['type']).' ('.$custom_graph_name['name'].')'; + } + + if ($item['id_agent'] == 0) { $is_inventory_item = $item['type'] == 'inventory' || $item['type'] == 'inventory_changes'; - // Due to SLA or top N or general report items + // Due to SLA or top N or general report items. if (!$is_inventory_item && ($item['id_agent_module'] == '' || $item['id_agent_module'] == 0)) { $row[2] = ''; $row[3] = ''; } else { - // The inventory items have the agents and modules in json format in the field external_source + // The inventory items have the agents and modules in json format in the field external_source. if ($is_inventory_item) { $external_source = json_decode($item['external_source'], true); $agents = $external_source['id_agents']; @@ -522,7 +546,7 @@ foreach ($items as $item) { $table->data[] = $row; $count++; - // Restore db connection + // Restore db connection. if (($config['metaconsole'] == 1) && ($server_name != '') && defined('METACONSOLE')) { metaconsole_restore_db(); } diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 1322095990..40ce45b5bb 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -3144,7 +3144,7 @@ if ($enterpriseEnable && defined('METACONSOLE')) { break; } - if ($action !== 'update') { + if ($action !== 'update' && !is_metaconsole()) { ui_print_page_header( $textReportName, 'images/op_reporting.png', @@ -3184,17 +3184,19 @@ if ($resultOperationDB !== null) { $activeTab = 'list_items'; $buttons[$activeTab]['active'] = true; - ui_print_page_header( - $textReportName, - 'images/op_reporting.png', - false, - $helpers, - false, - $buttons, - false, - '', - 60 - ); + if (!is_metaconsole()) { + ui_print_page_header( + $textReportName, + 'images/op_reporting.png', + false, + $helpers, + false, + $buttons, + false, + '', + 60 + ); + } } } diff --git a/pandora_console/godmode/users/configure_profile.php b/pandora_console/godmode/users/configure_profile.php index 418add8aa8..8c69c0e0a9 100644 --- a/pandora_console/godmode/users/configure_profile.php +++ b/pandora_console/godmode/users/configure_profile.php @@ -18,7 +18,7 @@ check_login(); enterprise_hook('open_meta_frame'); -if (! check_acl($config['id_user'], 0, 'PM')) { +if (! check_acl($config['id_user'], 0, 'UM')) { db_pandora_audit( 'ACL Violation', 'Trying to access Profile Management' @@ -320,24 +320,29 @@ if ($id_profile || $new_profile) { $table->data['IM'] = $row; $table->data[] = '
'; + $disable_option = 'javascript: return false;'; + if (check_acl($config['id_user'], 0, 'PM') || users_is_admin()) { + $disable_option = ''; + } + // Users $row = []; $row['name'] = __('Manage users'); - $row['input'] = html_print_checkbox('user_management', 1, $user_management, true); + $row['input'] = html_print_checkbox('user_management', 1, $user_management, true, false, $disable_option); $table->data['UM'] = $row; $table->data[] = '
'; // DB $row = []; $row['name'] = __('Manage database'); - $row['input'] = html_print_checkbox('db_management', 1, $db_management, true); + $row['input'] = html_print_checkbox('db_management', 1, $db_management, true, false, $disable_option); $table->data['DM'] = $row; $table->data[] = '
'; // Pandora $row = []; $row['name'] = __('%s management', get_product_name()); - $row['input'] = html_print_checkbox('pandora_management', 1, $pandora_management, true); + $row['input'] = html_print_checkbox('pandora_management', 1, $pandora_management, true, false, $disable_option); $table->data['PM'] = $row; $table->data[] = '
'; @@ -359,3 +364,18 @@ if ($id_profile || $new_profile) { } enterprise_hook('close_meta_frame'); + +?> + + diff --git a/pandora_console/godmode/users/profile_list.php b/pandora_console/godmode/users/profile_list.php index da77dffd9f..a87323f0f8 100644 --- a/pandora_console/godmode/users/profile_list.php +++ b/pandora_console/godmode/users/profile_list.php @@ -362,7 +362,10 @@ foreach ($profiles as $profile) { $data['PM'] = ($profile['pandora_management'] ? $img : ''); $table->cellclass[]['operations'] = 'action_buttons'; $data['operations'] = ''.html_print_image('images/config.png', true, ['title' => __('Edit')]).''; - $data['operations'] .= ''.html_print_image('images/cross.png', true).''; + if (check_acl($config['id_user'], 0, 'PM') || users_is_admin()) { + $data['operations'] .= ''.html_print_image('images/cross.png', true).''; + } + array_push($table->data, $data); } diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php index 4e8cfbb2c1..6a02f4bb57 100644 --- a/pandora_console/godmode/users/user_list.php +++ b/pandora_console/godmode/users/user_list.php @@ -420,7 +420,9 @@ else { $u = get_user_info($key); $g = users_get_groups($key, 'AR', $u['is_admin']); $result = array_intersect($g, $own_groups); - if (!$usr['is_admin'] && !empty($result)) { + + // Show users without profile too. + if (!$usr['is_admin'] && !empty($result) || (!$usr['is_admin'] && db_get_all_rows_field_filter('tusuario_perfil', 'id_usuario', $usr['id_user']) === false)) { $info[$key] = $usr; } diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index e34d287da5..bf528cbaca 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -1113,7 +1113,7 @@ if (check_login()) { } if ($module['id_tipo_modulo'] != 25) { - $data[6] = ui_print_module_warn_value($module['max_warning'], $module['min_warning'], $module['str_warning'], $module['max_critical'], $module['min_critical'], $module['str_critical']); + $data[6] = ui_print_module_warn_value($module['max_warning'], $module['min_warning'], $module['str_warning'], $module['max_critical'], $module['min_critical'], $module['str_critical'], $module['warning_inverse'], $module['critical_inverse']); } else { $data[6] = ''; } diff --git a/pandora_console/include/api.php b/pandora_console/include/api.php index e4977bb614..f263350685 100644 --- a/pandora_console/include/api.php +++ b/pandora_console/include/api.php @@ -1,15 +1,32 @@ 'api_password'])); +$apiPassword = io_output_password( + db_get_value_filter( + 'value', + 'tconfig', + ['token' => 'api_password'] + ) +); $correctLogin = false; $no_login_msg = ''; -// Clean unwanted output +// Clean unwanted output. ob_clean(); // READ THIS: // Special call without checks to retrieve version and build of the Pandora FMS // This info is avalable from the web console without login -// Don't change the format, it is parsed by applications -switch ($info) { - case 'version': - if (!$config['MR']) { - $config['MR'] = 0; - } - - echo 'Pandora FMS '.$pandora_version.' - '.$build_version.' MR'.$config['MR']; +// Don't change the format, it is parsed by applications. +if ($info == 'version') { + if (!$config['MR']) { + $config['MR'] = 0; + } + echo 'Pandora FMS '.$pandora_version.' - '.$build_version.' MR'.$config['MR']; exit; } @@ -68,14 +89,19 @@ if (isInACL($ipOrigin)) { if (empty($apiPassword) || (!empty($apiPassword) && $api_password === $apiPassword)) { $user_in_db = process_user_login($user, $password, true); if ($user_in_db !== false) { + $config['id_usuario'] = $user_in_db; + // Compat. $config['id_user'] = $user_in_db; $correctLogin = true; if (session_status() === PHP_SESSION_NONE) { session_start(); + $_SESSION = []; } $_SESSION['id_usuario'] = $user; + + config_prepare_session(); session_write_close(); } else { $no_login_msg = 'Incorrect user credentials'; @@ -84,7 +110,7 @@ if (isInACL($ipOrigin)) { $no_login_msg = 'Incorrect given API password'; } } else { - $no_login_msg = "IP $ipOrigin is not in ACL list"; + $no_login_msg = 'IP '.$ipOrigin.' is not in ACL list'; } if ($correctLogin) { @@ -93,11 +119,14 @@ if ($correctLogin) { } else { $function_name = ''; - // Check if is an extension function and get the function name + // Check if is an extension function and get the function name. if ($op2 == 'extension') { - $extension_api_url = $config['homedir'].'/'.EXTENSIONS_DIR."/$ext_name/$ext_name.api.php"; - // The extension API file must exist and the extension must be enabled - if (file_exists($extension_api_url) && !in_array($ext_name, extensions_get_disabled_extensions())) { + $extension_api_url = $config['homedir'].'/'.EXTENSIONS_DIR.'/'.$ext_name.'/'.$ext_name.'.api.php'; + // The extension API file must exist and the extension must be + // enabled. + if (file_exists($extension_api_url) + && !in_array($ext_name, extensions_get_disabled_extensions()) + ) { include_once $extension_api_url; $function_name = 'apiextension_'.$op.'_'.$ext_function; } @@ -107,16 +136,19 @@ if ($correctLogin) { if ($op == 'set' && $id) { switch ($op2) { case 'update_agent': - case 'add_module_in_conf': case 'update_module_in_conf': case 'delete_module_in_conf': - - $id_os = db_get_value_sql('select id_os from tagente where id_agente = '.$id); - - if ($id_os == 100) { - returnError('not_allowed_operation_cluster', $returnType); - return false; + $agent = agents_locate_agent($id); + if ($agent !== false) { + $id_os = $agent['id_os']; + if ($id_os == 100) { + returnError( + 'not_allowed_operation_cluster', + $returnType + ); + return false; + } } break; @@ -127,12 +159,16 @@ if ($correctLogin) { case 'create_snmp_module': case 'delete_module': case 'delete_agent': - - $id_os = db_get_value_sql('select id_os from tagente where nombre = "'.$id.'"'); - - if ($id_os == 100) { - returnError('not_allowed_operation_cluster', $returnType); - return false; + $agent = agents_locate_agent($id); + if ($agent !== false) { + $id_os = $agent['id_os']; + if ($id_os == 100) { + returnError( + 'not_allowed_operation_cluster', + $returnType + ); + return false; + } } break; @@ -141,60 +177,98 @@ if ($correctLogin) { case 'update_data_module': case 'update_snmp_module': - $id_os = db_get_value_sql('select id_os from tagente where id_agente = (select id_agente from tagente_modulo where id_agente_modulo ='.$id.')'); + $id_os = db_get_value_sql( + sprintf( + 'SELECT id_os + FROM tagente + WHERE id_agente = ( + SELECT id_agente + FROM tagente_modulo + WHERE id_agente_modulo = %d + )', + $id + ) + ); + if ($id_os == 100) { - returnError('not_allowed_operation_cluster', $returnType); + returnError( + 'not_allowed_operation_cluster', + $returnType + ); return false; } break; case 'delete_user_permission': - if ($user_db === '') { - returnError(__('User or group not specified'), __('User, group not specified')); + returnError( + __('User or group not specified'), + __('User, group not specified') + ); return; } - $id_os = api_set_delete_user_profiles($thrash1, $thrash2, $other, $returnType); + $id_os = api_set_delete_user_profiles( + $thrash1, + $thrash2, + $other, + $returnType + ); if ($id_os != 100) { return; } if ($id_os == false) { - returnError('not_allowed_operation_cluster', $returnType); + returnError( + 'not_allowed_operation_cluster', + $returnType + ); return false; } break; case 'add_permission_user_to_group': - - if ($user_db == null || $group_db == null || $id_up == null) { - returnError(__('User, group or profile not specified'), __('User, group or profile status not specified')); + if ($user_db == null + || $group_db == null + || $id_up == null + ) { + returnError( + __('User, group or profile not specified'), + __('User, group or profile status not specified') + ); return; } - $id_os = api_set_add_permission_user_to_group($thrash1, $thrash2, $other, $returnType); + $id_os = api_set_add_permission_user_to_group( + $thrash1, + $thrash2, + $other, + $returnType + ); if ($id_os != 100) { return; } if ($id_os == false) { - returnError('not_allowed_operation_cluster', $returnType); + returnError( + 'not_allowed_operation_cluster', + $returnType + ); return false; } break; default: - - // break; + // Ignore. + break; } } } - // Check if the function exists + // Check if the function exists. if (function_exists($function_name)) { if (!DEBUG) { error_reporting(0); @@ -205,18 +279,37 @@ if ($correctLogin) { ini_set('display_errors', 1); } - call_user_func($function_name, $id, $id2, $other, $returnType, $user_in_db); + call_user_func( + $function_name, + $id, + $id2, + $other, + $returnType, + $user_in_db + ); } else { returnError('no_exist_operation', $returnType); } } } else { - // TODO: Implement a new switch in config to enable / disable - // ACL auth failure: if enabled and have lots of traffic can produce millions - // of records and a considerable OVERHEAD in the system :( - // db_pandora_audit("API access Failed", $no_login_msg, $user, $ipOrigin); + /* + * //TODO: Implement a new switch in config to enable / disable + * ACL auth failure: if enabled and have lots of traffic can produce + * millions of records and a considerable OVERHEAD in the system :( + * db_pandora_audit("API access Failed", $no_login_msg, $user, $ipOrigin); + */ + sleep(15); - // Protection on DoS attacks + // Protection on DoS attacks. echo 'auth error'; } + +// Logout. +if (session_status() === PHP_SESSION_ACTIVE) { + $_SESSION = []; + // Could give a warning if no session file is created. Ignore. + @session_destroy(); + header_remove('Set-Cookie'); + setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/'); +} diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php index 2ae768d4fe..cdd1b88460 100644 --- a/pandora_console/include/chart_generator.php +++ b/pandora_console/include/chart_generator.php @@ -11,12 +11,13 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // Global & session manageme -session_id($_REQUEST['session_id']); - require_once 'config.php'; -require_once $config['homedir'].'/include/auth/mysql.php'; -require_once $config['homedir'].'/include/functions.php'; -require_once $config['homedir'].'/include/functions_db.php'; + +require_once __DIR__.'/config.php'; +require_once __DIR__.'/functions.php'; +require_once __DIR__.'/functions_db.php'; +require_once __DIR__.'/auth/mysql.php'; +require_once $config['homedir'].'/include/lib/User.php'; require_once $config['homedir'].'/include/functions_reporting.php'; require_once $config['homedir'].'/include/functions_graph.php'; require_once $config['homedir'].'/include/functions_custom_graphs.php'; @@ -24,18 +25,56 @@ require_once $config['homedir'].'/include/functions_modules.php'; require_once $config['homedir'].'/include/functions_agents.php'; require_once $config['homedir'].'/include/functions_tags.php'; -check_login(); +// Initialize session. global $config; -// get_parameter(array)('data', ''); + +// Try to initialize session using existing php session id. +$user = new PandoraFMS\User(['phpsessionid' => $_REQUEST['session_id']]); +if (check_login(false) === false) { + // Error handler. + ?> + + + + + Access denied + + + + + + + + +

Access is not granted

+ + + + + '; echo ''; @@ -48,8 +87,9 @@ if ($config['metaconsole'] && !empty($server_id)) { $user_language = get_user_language($config['id_user']); -if (file_exists('languages/'.$user_language.'.mo')) { - $l10n = new gettext_reader(new CachedFileReader('languages/'.$user_language.'.mo')); +if (file_exists('languages/'.$user_language.'.mo') === true) { + $cfr = new CachedFileReader('languages/'.$user_language.'.mo'); + $l10n = new gettext_reader($cfr); $l10n->load_tables(); } @@ -208,7 +248,7 @@ if (file_exists('languages/'.$user_language.'.mo')) { break; default: - // code... + // Code... break; } diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 299f5786a8..ac31e192e9 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 = 'PC191018'; +$build_version = 'PC191024'; $pandora_version = 'v7.0NG.739'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 359eedbe10..cddd447673 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -3595,7 +3595,32 @@ function graph_custom_sql_graph( $SQL_GRAPH_MAX_LABEL_SIZE = 20; + if (is_metaconsole()) { + $server = metaconsole_get_connection_names(); + $connection = metaconsole_get_connection($server); + metaconsole_connect($connection); + } + $report_content = db_get_row('treport_content', 'id_rc', $id); + + if ($report_content == false || $report_content == '') { + $report_content = db_get_row('treport_content_template', 'id_rc', $id); + } + + if ($report_content == false || $report_content == '') { + enterprise_hook('metaconsole_restore_db'); + $report_content = db_get_row('treport_content', 'id_rc', $id); + if ($report_content == false || $report_content == '') { + $report_content = db_get_row('treport_content_template', 'id_rc', $id); + } + + if (is_metaconsole()) { + $server = metaconsole_get_connection_names(); + $connection = metaconsole_get_connection($server); + metaconsole_connect($connection); + } + } + if ($id != null) { $historical_db = db_get_value_sql('SELECT historical_db from treport_content where id_rc ='.$id); } else { @@ -3609,22 +3634,9 @@ function graph_custom_sql_graph( $sql = io_safe_output($sql['sql']); } - if (($config['metaconsole'] == 1) && defined('METACONSOLE') && $report_content['server_name'] != '' && $report_content['server_name'] != '0') { - $metaconsole_connection = enterprise_hook('metaconsole_get_connection', [$report_content['server_name']]); - - if ($metaconsole_connection === false) { - return false; - } - - if (enterprise_hook('metaconsole_load_external_db', [$metaconsole_connection]) != NOERR) { - // ui_print_error_message ("Error connecting to ".$server_name); - return false; - } - } - $data_result = db_get_all_rows_sql($sql, $historical_db); - if (($config['metaconsole'] == 1) && defined('METACONSOLE') && $report_content['server_name'] != '' && $report_content['server_name'] != '0') { + if (is_metaconsole()) { enterprise_hook('metaconsole_restore_db'); } diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index a54bce17de..1d0355cf97 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -282,6 +282,15 @@ function reporting_make_reporting_data( $agents_to_macro = $content['id_agent']; } + // Metaconsole connection. + if (is_metaconsole()) { + $server = metaconsole_get_connection_names(); + $connection = metaconsole_get_connection($server); + if (metaconsole_connect($connection) != NOERR) { + continue; + } + } + if (isset($content['style']['name_label'])) { // Add macros name. $items_label = []; @@ -294,14 +303,6 @@ function reporting_make_reporting_data( $metaconsole_on = is_metaconsole(); $server_name = $content['server_name']; - // Metaconsole connection. - if ($metaconsole_on && $server_name != '') { - $connection = metaconsole_get_connection($server_name); - if (!metaconsole_load_external_db($connection)) { - continue; - } - } - $items_label['agent_description'] = agents_get_description( $content['id_agent'] ); @@ -2824,13 +2825,12 @@ function reporting_group_report($report, $content) $content['name'] = __('Group Report'); } - if ($config['metaconsole']) { - $id_meta = metaconsole_get_id_server($content['server_name']); - - $server = metaconsole_get_connection_by_id($id_meta); - metaconsole_connect($server); + if (is_metaconsole()) { + $server = metaconsole_get_connection_names(); + $connection = metaconsole_get_connection($server); } + $return['server_name'] = $server[0]; $return['title'] = $content['name']; $return['subtitle'] = groups_get_name($content['id_group'], true); $return['description'] = $content['description']; @@ -3488,7 +3488,7 @@ function reporting_network_interfaces_report($report, $content, $type='dinamic', $return['failed'] = null; $return['data'] = []; - if ($config['metaconsole']) { + if (is_metaconsole()) { $server_names = metaconsole_get_connection_names(); if (isset($server_names) && is_array($server_names)) { foreach ($server_names as $key => $value) { @@ -3505,7 +3505,8 @@ function reporting_network_interfaces_report($report, $content, $type='dinamic', $content, $report, $fullscale, - $pdf + $pdf, + $id_meta ); metaconsole_restore_db(); } @@ -4190,10 +4191,22 @@ function reporting_sql_graph( $return['description'] = $content['description']; $return['date'] = reporting_get_date_text(); + $module_source = db_get_all_rows_sql( + 'SELECT id_agent_module + FROM tgraph_source + WHERE id_graph = '.$content['id_gs'] + ); + + if (isset($module_source) && is_array($module_source)) { + $modules = []; + foreach ($module_source as $key => $value) { + $modules[$key] = $value['id_agent_module']; + } + } + switch ($type) { case 'dinamic': case 'static': - case 'data': $return['chart'] = graph_custom_sql_graph( $content['id_rc'], $width, @@ -4205,6 +4218,19 @@ function reporting_sql_graph( $content['top_n_value'] ); break; + + case 'data': + $data = []; + foreach ($modules as $key => $value) { + $data[$value] = modules_get_agentmodule_data( + $value, + $content['period'], + $report['datetime'] + ); + } + + $return['chart'] = $data; + break; } return reporting_check_structure_content($return); @@ -7560,10 +7586,19 @@ function reporting_custom_graph( $content['name'] = __('Simple graph'); } - $id_agent = agents_get_module_id( - $content['id_agent_module'] + $module_source = db_get_all_rows_sql( + 'SELECT id_agent_module + FROM tgraph_source + WHERE id_graph = '.$content['id_gs'] ); - $id_agent_module = $content['id_agent_module']; + + if (isset($module_source) && is_array($module_source)) { + $modules = []; + foreach ($module_source as $key => $value) { + $modules[$key] = $value['id_agent_module']; + } + } + $agent_description = agents_get_description($id_agent); $agent_group = agents_get_agent_group($id_agent); $agent_address = agents_get_address($id_agent); @@ -7593,7 +7628,6 @@ function reporting_custom_graph( switch ($type) { case 'dinamic': case 'static': - case 'data': $params = [ 'period' => $content['period'], 'width' => $width, @@ -7624,6 +7658,19 @@ function reporting_custom_graph( ); break; + + case 'data': + $data = []; + foreach ($modules as $key => $value) { + $data[$value] = modules_get_agentmodule_data( + $value, + $content['period'], + $report['datetime'] + ); + } + + $return['chart'] = $data; + break; } if ($type_report == 'custom_graph') { diff --git a/pandora_console/include/functions_reports.php b/pandora_console/include/functions_reports.php index e63348850b..319690946e 100755 --- a/pandora_console/include/functions_reports.php +++ b/pandora_console/include/functions_reports.php @@ -769,10 +769,20 @@ function reports_get_report_types($template=false, $not_editor=false) 'optgroup' => __('Grouped'), 'name' => __('General'), ]; - $types['group_report'] = [ - 'optgroup' => __('Grouped'), - 'name' => __('Group report'), - ]; + if (is_metaconsole()) { + if ($template === false) { + $types['group_report'] = [ + 'optgroup' => __('Grouped'), + 'name' => __('Group report'), + ]; + } + } else { + $types['group_report'] = [ + 'optgroup' => __('Grouped'), + 'name' => __('Group report'), + ]; + } + $types['exception'] = [ 'optgroup' => __('Grouped'), 'name' => __('Exception'), @@ -880,7 +890,7 @@ function reports_get_report_types($template=false, $not_editor=false) ]; } - if ($config['enterprise_installed']) { + if ($config['enterprise_installed'] && $template === false) { $types['event_report_log'] = [ 'optgroup' => __('Log'), 'name' => __('Log report'), diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 8d12e57448..493cbd1156 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -2527,9 +2527,22 @@ function ui_print_module_warn_value( $str_warning, $max_critical, $min_critical, - $str_critical + $str_critical, + $warning_inverse=0, + $critical_inverse=0 ) { - $data = ""; + $war_inv = ''; + $crit_inv = ''; + + if ($warning_inverse == 1) { + $war_inv = ' (inv)'; + } + + if ($critical_inverse == 1) { + $crit_inv = ' (inv)'; + } + + $data = ""; if ($max_warning != $min_warning) { $data .= format_for_graph($max_warning).'/'.format_for_graph($min_warning); diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php index d8012c15dd..40c79bbf51 100644 --- a/pandora_console/include/graphs/fgraph.php +++ b/pandora_console/include/graphs/fgraph.php @@ -170,17 +170,7 @@ function vbar_graph( setup_watermark($water_mark, $water_mark_file, $water_mark_url); if (empty($chart_data)) { - return html_print_image( - $no_data_image, - true, - [ - 'width' => $width, - 'height' => $height, - 'title' => __('No data to show'), - ], - false, - true - ); + return graph_nodata_image($width, $height, 'vbar'); } if ($ttl == 2) { @@ -357,17 +347,7 @@ function hbar_graph( setup_watermark($water_mark, $water_mark_file, $water_mark_url); if (empty($chart_data)) { - return html_print_image( - $no_data_image, - true, - [ - 'width' => $width, - 'height' => $height, - 'title' => __('No data to show'), - ], - false, - true - ); + return graph_nodata_image($width, $height, 'hbar'); } if ($ttl == 2) { diff --git a/pandora_console/include/javascript/openlayers.pandora.js b/pandora_console/include/javascript/openlayers.pandora.js index ae06463d95..bc4a7b99bf 100755 --- a/pandora_console/include/javascript/openlayers.pandora.js +++ b/pandora_console/include/javascript/openlayers.pandora.js @@ -87,9 +87,9 @@ function js_refreshParentLines(layerName) { { strokeWidth: 2, fillOpacity: 0.2, - fillColor: "red", + fillColor: "black", strokeDashstyle: "dash", - strokeColor: "red" + strokeColor: "black" } ); diff --git a/pandora_console/include/lib/User.php b/pandora_console/include/lib/User.php new file mode 100644 index 0000000000..4eb5853676 --- /dev/null +++ b/pandora_console/include/lib/User.php @@ -0,0 +1,116 @@ +sessions[$data['phpsessionid']] = 1; + $info = \db_get_row_filter( + 'tsessions_php', + ['id_session' => $data['phpsessionid']] + ); + + if ($info !== false) { + // Process. + $session_data = session_decode($info['data']); + $this->idUser = $_SESSION['id_usuario']; + + // Valid session. + return $this; + } + + return null; + } + + if (isset($data['id_usuario']) === true + && isset($data['password']) === true + ) { + $user_in_db = process_user_login($user, $password, true); + if ($user_in_db !== false) { + $config['id_usuario'] = $user_in_db; + $correctLogin = true; + + // Originally at api.php. + if (session_status() === PHP_SESSION_NONE) { + session_start(); + } + + $_SESSION['id_usuario'] = $user; + session_write_close(); + + $this->idUser = $data['id_usuario']; + // Valid session. + return $this; + } + } + } + + return null; + + } + + +} diff --git a/pandora_console/include/load_session.php b/pandora_console/include/load_session.php index 39e0973287..80fb8643ef 100644 --- a/pandora_console/include/load_session.php +++ b/pandora_console/include/load_session.php @@ -91,11 +91,6 @@ function pandora_session_write($session_id, $data) { $session_id = addslashes($session_id); - // If it's an api call, the session must not be created. - if (get_parameter('op', false) && get_parameter('op2', false)) { - return true; - } - if (is_ajax()) { // Avoid session upadte while processing ajax responses - notifications. if (get_parameter('check_new_notifications', false)) { diff --git a/pandora_console/include/styles/wux.css b/pandora_console/include/styles/wux.css new file mode 100644 index 0000000000..cd9e3f61e2 --- /dev/null +++ b/pandora_console/include/styles/wux.css @@ -0,0 +1,10 @@ +/* + * Wux style + */ + +.wux_execution_result_transaction { + width: auto; + height: auto; + float: right; + margin-right: 200px; +} diff --git a/pandora_console/include/web2image.js b/pandora_console/include/web2image.js index 09f840e45e..29bac30e76 100644 --- a/pandora_console/include/web2image.js +++ b/pandora_console/include/web2image.js @@ -1,5 +1,7 @@ var system = require("system"); +/* global phantom */ + if (system.args.length < 3 || system.args.length > 11) { phantom.exit(1); } @@ -14,6 +16,7 @@ var viewport_width = system.args[7]; var viewport_height = system.args[8]; var session_id = system.args[9]; var base_64 = system.args[10]; +var post_data = ""; if (!viewport_width) { viewport_width = 750; @@ -64,7 +67,7 @@ page.onError = function(msg) { phantom.exit(); }; -page.onCallback = function(st) { +page.onCallback = function() { if (!base_64) { page.render(output_filename, { format: "png" }); } else { diff --git a/pandora_console/install.php b/pandora_console/install.php index 12c0341942..8ca6d894f8 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
graph_type == 'boolean') { + $fullscale = 1; + } else { + $fullscale = 0; + } + } + ob_start(); switch ($this->graph_type) { case 'boolean': @@ -188,6 +201,7 @@ class ModuleGraph 'menu' => false, 'type_graph' => $config['type_module_charts'], 'vconsole' => true, + 'fullscale' => $fullscale, ]; $graph = grafico_modulo_sparse($params); diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index 0f7257663a..783c389269 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -1541,7 +1541,9 @@ if (!empty($result)) { $row['str_warning'], $row['max_critical'], $row['min_critical'], - $row['str_critical'] + $row['str_critical'], + $row['warning_inverse'], + $row['critical_inverse'] ); if (is_numeric($row['datos']) && !modules_is_string_type($row['module_type'])) { diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec index a03bd789c1..6a4d0e0e9e 100644 --- a/pandora_console/pandora_console.redhat.spec +++ b/pandora_console/pandora_console.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 7.0NG.739 -%define release 191018 +%define release 191024 # User and Group under which Apache is running %define httpd_name httpd diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec index dcce8e0022..222237edb1 100644 --- a/pandora_console/pandora_console.rhel7.spec +++ b/pandora_console/pandora_console.rhel7.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 7.0NG.739 -%define release 191018 +%define release 191024 # User and Group under which Apache is running %define httpd_name httpd diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec index 0bac6e90ba..3b8d1202b3 100644 --- a/pandora_console/pandora_console.spec +++ b/pandora_console/pandora_console.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 7.0NG.739 -%define release 191018 +%define release 191024 %define httpd_name httpd # User and Group under which Apache is running %define httpd_name apache2 diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control index 87fb4a374a..26d6467a7f 100644 --- a/pandora_server/DEBIAN/control +++ b/pandora_server/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-server -Version: 7.0NG.739-191018 +Version: 7.0NG.739-191024 Architecture: all Priority: optional Section: admin diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh index 186aa93f3f..9f1fb090ca 100644 --- a/pandora_server/DEBIAN/make_deb_package.sh +++ b/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.739-191018" +pandora_version="7.0NG.739-191024" package_cpan=0 package_pandora=1 diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index bedb8b7e70..f4ac078204 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/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.739"; -my $pandora_build = "191018"; +my $pandora_build = "191024"; our $VERSION = $pandora_version." ".$pandora_build; # Setup hash diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm index 19c6c5cc0a..221e75e190 100644 --- a/pandora_server/lib/PandoraFMS/PluginTools.pm +++ b/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.739"; -my $pandora_build = "191018"; +my $pandora_build = "191024"; our $VERSION = $pandora_version." ".$pandora_build; our %EXPORT_TAGS = ( 'all' => [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index c87690f138..c1b3616ccc 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.739 -%define release 191018 +%define release 191024 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 548925092f..7c5381632a 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.739 -%define release 191018 +%define release 191024 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 6642b40c95..1513b5ccf6 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.739" -PI_BUILD="191018" +PI_BUILD="191024" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 4b4cfe543b..8dec6ff60f 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.739 PS191018"; +my $version = "7.0NG.739 PS191024"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index a3c3f84f25..33a16dabd6 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.739 PS191018"; +my $version = "7.0NG.739 PS191024"; # save program name for logging my $progname = basename($0);