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

Merge branch 'ent-13600-el-item-de-informe-end-of-life-no-filtra-por-so' into 'develop' 

Ent 13600 el item de informe end of life no filtra por so

See merge request artica/pandorafms!7311
This commit is contained in:
Diego Muñoz-Reja 2024-05-09 14:52:17 +00:00
parent 5a218cd4e9 5153b21c57
commit 0dfaa932de
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -1362,12 +1362,12 @@ $class = 'databox filters';
$result_select = [];
foreach ($os as $item) {
foreach ($os_list as $item) {
$result_select[$item['id_os']] = $item['name'];
}
html_print_select(
$os_list,
$result_select,
'os_selector',
$os_selector,
''

13
pandora_console/include/functions_reporting.php
View File

@ -3856,16 +3856,25 @@ function reporting_end_of_life($report, $content)
);
$es_os_version = $external_source['os_version'];
$os_selector_name = db_get_value('name', 'tconfig_os', 'id_os', (int) $external_source['os_selector']);
$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) {
if (empty($agent['os_version']) === true) {
$agent['os_version'] = '.*';
}
// 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');
$result_end_of_life = db_get_value_sql('SELECT end_of_support FROM tconfig_os_version');
$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)) {
if ((preg_match('/'.$es_os_version.'/i', $agent['os_version']) || $es_os_version === '')
&& $os_selector_name === io_safe_output($agent['name'])
&& $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 {