|
'form_action']);
echo '';
echo '';
+ui_require_css_file('datepicker');
+ui_require_jquery_file('ui.datepicker-'.get_user_language(), 'include/javascript/i18n/');
ui_include_time_picker();
ui_require_javascript_file('pandora');
@@ -5216,6 +5310,8 @@ $(document).ready (function () {
chooseType();
chooseSQLquery();
+ $("#text-end_of_life_date").datepicker({dateFormat: "", showButtonPanel: true});
+
$("#id_agents").change(agent_changed_by_multiple_agents);
// Load selected modules by default
@@ -6529,7 +6625,11 @@ function addGeneralRow() {
function loadGeneralAgents(agent_group) {
var params = [];
- var group = ;
+ var group = ;
+ if (group < 0) {
+ return;
+ }
+
group = agent_group || group;
params.push("get_agents=1");
@@ -6796,6 +6896,9 @@ function chooseType() {
$("#row_group_by").hide();
$("#row_type_show").hide();
$("#row_use_prefix_notation").hide();
+ $("#row_os_selector").hide();
+ $("#row_os_version_regexp").hide();
+ $("#row_os_end_of_life").hide();
$("#row_cat_security_hardening").hide();
$("#row_ignore_skipped").hide();
$("#row_status_check").hide();
@@ -7379,6 +7482,13 @@ function chooseType() {
});
break;
+ case 'end_of_life':
+ $("#row_os_selector").show();
+ $("#row_os_version_regexp").show();
+ $("#row_group").show();
+ $("#row_os_end_of_life").show();
+ break;
+
case 'inventory_changes':
$("#row_description").show();
$("#row_period").show();
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index a294a7b939..095f79b14a 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -1759,6 +1759,17 @@ switch ($action) {
$good_format = true;
break;
+ case 'end_of_life':
+ $es['end_of_life_date'] = get_parameter('end_of_life_date');
+ $es['os_selector'] = get_parameter('os_selector');
+ $es['os_version'] = get_parameter('text_os_version', '');
+ $es['group'] = get_parameter('combo_group', '');
+ $es['recursion'] = get_parameter('recursion', 0);
+
+ $values['external_source'] = json_encode($es);
+ $good_format = true;
+ break;
+
case 'alert_report_actions':
$alert_templates_to_report = get_parameter('alert_templates');
$alert_actions_to_report = get_parameter('alert_actions');
@@ -2747,6 +2758,17 @@ switch ($action) {
$good_format = true;
break;
+ case 'end_of_life':
+ $es['end_of_life_date'] = get_parameter('end_of_life_date');
+ $es['os_selector'] = get_parameter('os_selector');
+ $es['os_version'] = get_parameter('text_os_version', '');
+ $es['group'] = get_parameter('combo_group', '');
+ $es['recursion'] = get_parameter('recursion', 0);
+
+ $values['external_source'] = json_encode($es);
+ $good_format = true;
+ break;
+
case 'alert_report_actions':
$alert_templates_to_report = get_parameter('alert_templates');
$alert_actions_to_report = get_parameter('alert_actions');
diff --git a/pandora_console/godmode/setup/gis_step_2.php b/pandora_console/godmode/setup/gis_step_2.php
index f2dac0bf20..f2e9182a07 100644
--- a/pandora_console/godmode/setup/gis_step_2.php
+++ b/pandora_console/godmode/setup/gis_step_2.php
@@ -312,7 +312,7 @@ if ($mapConnectionData != null) {
$mapConnectionDataUrl,
'',
45,
- 90,
+ false,
true
).' |
';
diff --git a/pandora_console/godmode/setup/os.builder.php b/pandora_console/godmode/setup/os.builder.php
index afe3982d8c..d8a2f47d00 100644
--- a/pandora_console/godmode/setup/os.builder.php
+++ b/pandora_console/godmode/setup/os.builder.php
@@ -40,6 +40,191 @@ if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user
return;
}
+if ($idOS > 0) {
+ $os = db_get_row_filter('tconfig_os', ['id_os' => $idOS]);
+ $name = $os['name'];
+ $description = $os['description'];
+ $icon = $os['icon_name'];
+} else {
+ $name = io_safe_input(strip_tags(io_safe_output((string) get_parameter('name'))));
+ $description = io_safe_input(strip_tags(io_safe_output((string) get_parameter('description'))));
+ $icon = get_parameter('icon', 0);
+}
+
+$icon_upload = get_parameter('icon_upload', null);
+
+$message = '';
+if ($is_management_allowed === true) {
+ switch ($action) {
+ case 'edit':
+ if ($idOS > 0) {
+ $actionHidden = 'update';
+ $textButton = __('Update');
+ $classButton = ['icon' => 'wand'];
+ } else {
+ $actionHidden = 'save';
+ $textButton = __('Create');
+ $classButton = ['icon' => 'next'];
+ }
+ break;
+
+ case 'save':
+ if ($icon_upload !== null && $icon_upload['name'] !== '') {
+ if (isset($_FILES['icon_upload']) === true) {
+ $file_name = $_FILES['icon_upload']['name'];
+ $file_tmp = $_FILES['icon_upload']['tmp_name'];
+ $file_type = $_FILES['icon_upload']['type'];
+ $file_ext = strtolower(end(explode('.', $_FILES['icon_upload']['name'])));
+
+ $allowed_extensions = [
+ 'jpeg',
+ 'jpg',
+ 'png',
+ 'svg',
+ ];
+
+ $tab = 'manage_os';
+
+ if (in_array($file_ext, $allowed_extensions) === false) {
+ $message = 9;
+ } else {
+ $message = 8;
+ move_uploaded_file($file_tmp, $config['homedir'].'/images/os_icons/'.$file_name);
+ }
+ }
+ } else {
+ $values = [];
+ $values['name'] = $name;
+ $values['description'] = $description;
+
+ if (($icon !== 0) && ($icon != '')) {
+ $values['icon_name'] = $icon;
+ }
+
+ $resultOrId = false;
+ if ($name != '') {
+ $resultOrId = db_process_sql_insert('tconfig_os', $values);
+ }
+
+ if ($resultOrId === false) {
+ $message = 2;
+ $tab = 'builder';
+ $actionHidden = 'save';
+ $textButton = __('Create');
+ $classButton = ['icon' => 'wand'];
+ } else {
+ $tab = 'manage_os';
+ $message = 1;
+ }
+ }
+
+ if (is_metaconsole() === true) {
+ header('Location:'.$config['homeurl'].'index.php?sec=advanced&sec2=advanced/component_management&tab=os_manage&tab2=list&message='.$message);
+ } else {
+ header('Location:'.$config['homeurl'].'index.php?sec=gsetup&sec2=godmode/setup/os&tab='.$tab.'&message='.$message);
+ }
+ break;
+
+ case 'update':
+ if ($icon_upload !== null && $icon_upload['name'] !== '') {
+ if (isset($_FILES['icon_upload']) === true) {
+ $file_name = $_FILES['icon_upload']['name'];
+ $file_tmp = $_FILES['icon_upload']['tmp_name'];
+ $file_type = $_FILES['icon_upload']['type'];
+ $file_ext = strtolower(end(explode('.', $_FILES['icon_upload']['name'])));
+
+ $allowed_extensions = [
+ 'jpeg',
+ 'jpg',
+ 'png',
+ 'svg',
+ ];
+
+ $tab = 'manage_os';
+
+ if (in_array($file_ext, $allowed_extensions) === false) {
+ $message = 9;
+ } else {
+ $message = 8;
+ move_uploaded_file($file_tmp, $config['homedir'].'/images/os_icons/'.$file_name);
+ }
+ }
+ } else {
+ $name = io_safe_input(strip_tags(io_safe_output((string) get_parameter('name'))));
+ $description = io_safe_input(strip_tags(io_safe_output((string) get_parameter('description'))));
+ $icon = get_parameter('icon', 0);
+
+ $values = [];
+ $values['name'] = $name;
+ $values['description'] = $description;
+ // Only for Metaconsole. Save the previous name for synchronizing.
+ if (is_metaconsole() === true) {
+ $values['previous_name'] = db_get_value('name', 'tconfig_os', 'id_os', $idOS);
+ }
+
+ if (($icon !== 0) && ($icon != '')) {
+ $values['icon_name'] = $icon;
+ }
+
+ $result = false;
+ if ($name != '') {
+ $result = db_process_sql_update('tconfig_os', $values, ['id_os' => $idOS]);
+ }
+
+ if ($result !== false) {
+ $message = 3;
+ $tab = 'manage_os';
+ } else {
+ $message = 4;
+ $tab = 'builder';
+ $os = db_get_row_filter('tconfig_os', ['id_os' => $idOS]);
+ $name = $os['name'];
+ }
+
+ $actionHidden = 'update';
+ $textButton = __('Update');
+ $classButton = ['icon' => 'wand'];
+ }
+
+ if (is_metaconsole() === true) {
+ header('Location:'.$config['homeurl'].'index.php?sec=advanced&sec2=advanced/component_management&tab=os_manage&tab2='.$tab.'&message='.$message);
+ } else {
+ header('Location:'.$config['homeurl'].'index.php?sec=gsetup&sec2=godmode/setup/os&tab='.$tab.'&message='.$message);
+ }
+ break;
+
+ case 'delete':
+ $sql = 'SELECT COUNT(id_os) AS count FROM tagente WHERE id_os = '.$idOS;
+ $count = db_get_all_rows_sql($sql);
+ $count = $count[0]['count'];
+
+ if ($count > 0) {
+ $message = 5;
+ } else {
+ $result = (bool) db_process_sql_delete('tconfig_os', ['id_os' => $idOS]);
+ if ($result) {
+ $message = 6;
+ } else {
+ $message = 7;
+ }
+ }
+
+ if (is_metaconsole() === true) {
+ header('Location:'.$config['homeurl'].'index.php?sec=advanced&sec2=advanced/component_management&tab=list&tab2='.$tab.'&message='.$message);
+ } else {
+ header('Location:'.$config['homeurl'].'index.php?sec=gsetup&sec2=godmode/setup/os&tab='.$tab.'&message='.$message);
+ }
+ break;
+
+ default:
+ case 'new':
+ $actionHidden = 'save';
+ $textButton = __('Create');
+ $classButton = ['icon' => 'next'];
+ break;
+ }
+}
+
$icons = get_list_os_icons_dir();
$iconData = [];
@@ -62,12 +247,11 @@ $iconData[] = html_print_div(
true
);
-echo '';
@@ -7611,5 +7647,4 @@ function html_print_wizard_diagnosis(
} else {
echo $output;
}
-
-}
\ No newline at end of file
+}
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index eab4e761d3..ce15b4b626 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -778,6 +778,13 @@ function reporting_make_reporting_data(
);
break;
+ case 'end_of_life':
+ $report['contents'][] = reporting_end_of_life(
+ $report,
+ $content
+ );
+ break;
+
case 'alert_report_actions':
$report['contents'][] = reporting_alert_report_actions(
$report,
@@ -3618,6 +3625,112 @@ function reporting_agent_module_status($report, $content)
}
+/**
+ * OS Version End of Life
+ *
+ * @param array $report Info Report.
+ * @param array $content Info content.
+ *
+ * @return array
+ */
+function reporting_end_of_life($report, $content)
+{
+ global $config;
+
+ $return['type'] = 'end_of_life';
+
+ if (empty($content['name'])) {
+ $content['name'] = __('End of life');
+ }
+
+ $return['title'] = io_safe_output($content['name']);
+ $return['landscape'] = $content['landscape'];
+ $return['pagebreak'] = $content['pagebreak'];
+ $return['subtitle'] = __('End of life report');
+ $return['description'] = io_safe_output($content['description']);
+ $return['date'] = reporting_get_date_text($report, $content);
+ $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+
+ $return['data'] = [];
+
+ $external_source = json_decode(
+ $content['external_source'],
+ true
+ );
+
+ $servers_ids = [0];
+
+ if (is_metaconsole() === true) {
+ $servers_ids = array_column(metaconsole_get_servers(), 'id');
+ }
+
+ foreach ($servers_ids as $server_id) {
+ if (is_metaconsole() === true) {
+ $connection = metaconsole_get_connection_by_id($server_id);
+ if (metaconsole_connect($connection) != NOERR) {
+ continue;
+ }
+ }
+
+ $agents = agents_get_agents(
+ [],
+ [
+ 'alias',
+ 'direccion',
+ 'name',
+ 'os_version',
+ ],
+ 'AR',
+ [
+ 'field' => 'nombre',
+ 'order' => 'ASC',
+ ],
+ false,
+ 0,
+ false,
+ true
+ );
+
+ $es_os_version = $external_source['os_version'];
+
+ $es_limit_eol_datetime = DateTime::createFromFormat('Y/m/d', $external_source['end_of_life_date']);
+
+ // Post-process returned agents to filter agents using correctly formatted fields.
+ foreach ($agents as $idx => $agent) {
+ // Must perform this query and subsequent operations in each iteration (note this is costly) since OS version field may contain HTML entities in BD and decoding can't be fully handled with mysql methods when doing a REGEXP.
+ $result_end_of_life = db_get_value_sql('SELECT end_of_support FROM tconfig_os_version WHERE "'.io_safe_output($agent['os_version']).'" REGEXP version AND "'.io_safe_output($agent['name']).'" REGEXP product');
+ $agent_eol_datetime = DateTime::createFromFormat('Y/m/d', $result_end_of_life);
+
+ if ((preg_match('/'.$es_os_version.'/i', $agent['os_version']) || $es_os_version === '') && $result_end_of_life !== false && ($es_limit_eol_datetime === false || $es_limit_eol_datetime >= $agent_eol_datetime)) {
+ // Agent matches an existing OS version.
+ $agents[$idx]['end_of_life'] = $result_end_of_life;
+ } else {
+ // Set agent to be filtered out.
+ $agents[$idx] = null;
+ }
+ }
+
+ if ($agents !== false) {
+ $agents = array_filter($agents);
+ }
+
+ if (is_metaconsole() === true) {
+ $res[$connection['server_name']] = $agents;
+
+ metaconsole_restore_db();
+ }
+ }
+
+ if (is_metaconsole() === true) {
+ $return['data'] = $res;
+ } else {
+ $return['data'] = $agents;
+ }
+
+ return reporting_check_structure_content($return);
+}
+
+
function reporting_exception(
$report,
$content,
diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index 0715b2f3f2..99f3af63ad 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -403,6 +403,10 @@ function reporting_html_print_report($report, $mini=false, $report_info=1, $cust
reporting_html_agent_module_status($table, $item);
break;
+ case 'end_of_life':
+ reporting_html_end_of_life($table, $item);
+ break;
+
case 'alert_report_actions':
reporting_html_alert_report_actions($table, $item);
break;
@@ -2754,6 +2758,123 @@ function reporting_html_agent_module_status($table, $item, $pdf=0)
}
+/**
+ * Html report end of life.
+ *
+ * @param object $table Head table or false if it comes from pdf.
+ * @param array $item Items data.
+ * @param integer $pdf Pdf output.
+ *
+ * @return mixed
+ */
+function reporting_html_end_of_life($table, $item, $pdf=0)
+{
+ global $config;
+
+ $return_pdf = '';
+
+ if (empty($item['data']) === true) {
+ if ($pdf !== 0) {
+ $return_pdf .= __('No items');
+ } else {
+ $table->colspan['group_report']['cell'] = 3;
+ $table->cellstyle['group_report']['cell'] = 'text-align: center;';
+ $table->data['group_report']['cell'] = __('No items');
+ }
+ } else {
+ $table_info = new stdClass();
+ $table_info->width = '99%';
+
+ $table_info->align = [];
+
+ if (is_metaconsole() === true) {
+ $table_info->align['server'] = 'left';
+ }
+
+ $table_info->align['agent_alias'] = 'left';
+ $table_info->align['ip'] = 'left';
+ $table_info->align['os_type'] = 'left';
+ $table_info->align['os_version'] = 'left';
+ $table_info->align['end_of_life'] = 'left';
+
+ $table_info->headstyle = [];
+
+ if (is_metaconsole() === true) {
+ $table_info->headstyle['server'] = 'text-align: left';
+ }
+
+ $table_info->headstyle['agent_alias'] = 'text-align: left';
+ $table_info->headstyle['ip'] = 'text-align: left';
+ $table_info->headstyle['os_type'] = 'text-align: left';
+ $table_info->headstyle['os_version'] = 'text-align: left';
+ $table_info->headstyle['end_of_life'] = 'text-align: left';
+
+ $table_info->head = [];
+ if (is_metaconsole() === true) {
+ $table_info->head['server'] = __('Server');
+ }
+
+ $table_info->head['agent_alias'] = __('Agent alias');
+ $table_info->head['ip'] = __('IP');
+ $table_info->head['os_type'] = __('OS Type');
+ $table_info->head['os_version'] = __('OS Version');
+ $table_info->head['end_of_life'] = __('End of life');
+
+ $table_info->data = [];
+
+ if (is_metaconsole() === true) {
+ foreach ($item['data'] as $server_name => $agents_per_server) {
+ foreach ($agents_per_server as $agent) {
+ $row = [];
+
+ $row['server'] = $server_name;
+ $row['agent_alias'] = $agent['alias'];
+ $row['ip'] = $agent['direccion'];
+ $row['os_type'] = $agent['name'];
+ $row['os_version'] = $agent['os_version'];
+ $date_string = date_w_fixed_tz($agent['end_of_life']);
+ $timestamp = strtotime($date_string);
+ $date_without_time = date('F j, Y', $timestamp);
+ $row['end_of_life'] = $date_without_time;
+
+ $table_info->data[] = $row;
+ }
+ }
+ } else {
+ foreach ($item['data'] as $data) {
+ $row = [];
+
+ $row['agent_alias'] = $data['alias'];
+ $row['ip'] = $data['direccion'];
+ $row['os_type'] = $data['name'];
+ $row['os_version'] = $data['os_version'];
+ $date_string = date_w_fixed_tz($data['end_of_life']);
+ $timestamp = strtotime($date_string);
+ $date_without_time = date('F j, Y', $timestamp);
+ $row['end_of_life'] = $date_without_time;
+
+ $table_info->data[] = $row;
+ }
+ }
+
+ if ($pdf !== 0) {
+ $table_info->title = $item['title'];
+ $table_info->titleclass = 'title_table_pdf';
+ $table_info->titlestyle = 'text-align:left;';
+ $return_pdf .= html_print_table($table_info, true);
+ } else {
+ $table->colspan['data']['cell'] = 3;
+ $table->cellstyle['data']['cell'] = 'text-align: center;';
+ $table->data['data']['cell'] = html_print_table($table_info, true);
+ }
+ }
+
+ if ($pdf !== 0) {
+ return $return_pdf;
+ }
+}
+
+
/**
* Function to print to HTML Exception report.
*
diff --git a/pandora_console/include/functions_reports.php b/pandora_console/include/functions_reports.php
index 1fe85aa92b..3da9993933 100755
--- a/pandora_console/include/functions_reports.php
+++ b/pandora_console/include/functions_reports.php
@@ -814,6 +814,11 @@ function reports_get_report_types($template=false, $not_editor=false)
'name' => __('Agents/Modules status'),
];
+ $types['end_of_life'] = [
+ 'optgroup' => __('Grouped'),
+ 'name' => __('End of life'),
+ ];
+
// Only pandora managers have access to the whole database.
if (check_acl($config['id_user'], 0, 'PM')) {
$types['sql'] = [
diff --git a/pandora_console/install.php b/pandora_console/install.php
index ae0f024382..335e6374e2 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
0) {
$user_groups_fl = users_get_groups(
$config['id_user'],
@@ -402,6 +408,18 @@ $table->data[1][0] = html_print_label_input_block(
html_print_select($fields, 'os', $os, '', 'All', 0, true)
);
+$table->data[1][1] = html_print_label_input_block(
+ __('Operating System version').ui_print_help_tip(__('Case insensitive regular expression, e.g. Rocky.* will match the following OS version: Rocky Linux 8.7'), true),
+ html_print_input_text(
+ 'os_version_regex',
+ $os_version_regex,
+ '',
+ 35,
+ 255,
+ true
+ )
+);
+
if (function_exists('policies_get_policies') === true) {
$pre_fields = policies_get_policies(false, ['id', 'name']);
$fields = [];
@@ -410,7 +428,7 @@ if (function_exists('policies_get_policies') === true) {
}
}
-$table->data[1][1] = html_print_label_input_block(
+$table->data[2][0] = html_print_label_input_block(
__('Policies'),
html_print_select($fields, 'policies[]', $policies, '', 'All', 0, true, true)
);
@@ -452,8 +470,8 @@ foreach ($custom_fields as $custom_field) {
$div_custom_fields .= '