'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/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 '';
-
function get_list_os_icons_dir()
{
global $config;
diff --git a/pandora_console/godmode/setup/os.list.php b/pandora_console/godmode/setup/os.list.php
index 330071353f..1ce9756cc0 100644
--- a/pandora_console/godmode/setup/os.list.php
+++ b/pandora_console/godmode/setup/os.list.php
@@ -45,7 +45,7 @@ if (is_management_allowed() === false) {
$is_management_allowed = false;
if (is_metaconsole() === false) {
$url = ''.__('metaconsole').'';
} else {
$url = __('any node');
@@ -59,115 +59,68 @@ if (is_management_allowed() === false) {
);
}
-$table = new stdClass();
-$table->class = 'info_table';
-$table->head[0] = __('ID');
-$table->head[1] = __('Icon');
-$table->head[2] = __('Name');
-$table->head[3] = __('Description');
-if ($is_management_allowed === true) {
- $table->head[4] = __('Actions');
-}
+// Datatables list.
+try {
+ $columns = [
+ 'id_os',
+ 'icon_img',
+ 'name',
+ 'description',
+ 'options',
+ ];
-if ($is_management_allowed === true) {
- $table->align[4] = 'center';
-}
+ $column_names = [
+ [
+ 'text' => __('ID'),
+ 'class' => 'w50px table_action_buttons',
+ ],
+ [
+ 'text' => __('Icon'),
+ 'class' => 'w10px table_action_buttons',
+ ],
+ __('Name'),
+ __('Description'),
+ [
+ 'text' => __('Options'),
+ 'class' => 'w20px table_action_buttons',
+ ],
+ ];
-$table->size[0] = '5%';
-if ($is_management_allowed === true) {
- $table->size[4] = '20px';
-}
-
-// Prepare pagination.
-$offset = (int) get_parameter('offset');
-$limit = $config['block_size'];
-$count_osList = db_get_value('count(*)', 'tconfig_os');
-
-$osList = db_get_all_rows_filter(
- 'tconfig_os',
- [
- 'offset' => $offset,
- 'limit' => $limit,
- ]
-);
-
-if ($osList === false) {
- $osList = [];
-}
-
-$table->data = [];
-foreach ($osList as $os) {
- $data = [];
- $data[] = $os['id_os'];
- $data[] = ui_print_os_icon($os['id_os'], false, true);
- if ($is_management_allowed === true) {
- if (is_metaconsole() === true) {
- $osNameUrl = 'index.php?sec=advanced&sec2=advanced/component_management&tab=os_manage&action=edit&tab2=builder&id_os='.$os['id_os'];
- } else {
- $osNameUrl = 'index.php?sec=gsetup&sec2=godmode/setup/os&action=edit&tab=builder&id_os='.$os['id_os'];
- }
-
- $data[] = html_print_anchor(
- [
- 'href' => $osNameUrl,
- 'content' => io_safe_output($os['name']),
+ $tableId = 'os_table';
+ // Load datatables user interface.
+ ui_print_datatable(
+ [
+ 'id' => $tableId,
+ 'class' => 'info_table',
+ 'style' => 'width: 100%',
+ 'columns' => $columns,
+ 'column_names' => $column_names,
+ 'ajax_url' => 'include/ajax/os',
+ 'ajax_data' => ['method' => 'drawOSTable'],
+ 'ajax_postprocess' => 'process_datatables_item(item)',
+ 'no_sortable_columns' => [-1, 1],
+ 'order' => [
+ 'field' => 'id',
+ 'direction' => 'asc',
],
- true
- );
- } else {
- $data[] = io_safe_output($os['name']);
- }
-
- $data[] = ui_print_truncate_text(io_safe_output($os['description']), 'description', true, true);
-
- if ($is_management_allowed === true) {
- $table->cellclass[][4] = 'table_action_buttons';
- if ($os['id_os'] > 16) {
- if (is_metaconsole() === true) {
- $hrefDelete = 'index.php?sec=advanced&sec2=advanced/component_management&tab=os_manage&action=delete&tab2=list&id_os='.$os['id_os'];
- } else {
- $hrefDelete = 'index.php?sec=gsetup&sec2=godmode/setup/os&action=delete&tab=list&id_os='.$os['id_os'];
- }
-
- $data[] = html_print_anchor(
- [
- 'href' => $hrefDelete,
- 'content' => html_print_image(
- 'images/delete.svg',
- true,
- [
- 'alt' => __('Delete'),
- 'title' => __('Delete'),
- 'class' => 'main_menu_icon invert_filter',
- ]
- ),
+ 'search_button_class' => 'sub filter float-right',
+ 'form' => [
+ 'inputs' => [
+ [
+ 'label' => __('Free search'),
+ 'type' => 'text',
+ 'class' => 'w25p',
+ 'id' => 'free_search',
+ 'name' => 'free_search',
+ ],
],
- true
- );
- } else {
- // The original icons of pandora don't delete.
- $data[] = '';
- }
- }
-
- $table->data[] = $data;
-}
-
-$tablePagination = '';
-if (isset($data) === true) {
- html_print_table($table);
- $tablePagination = ui_pagination(
- $count_osList,
- ui_get_url_refresh(['message' => false]),
- $offset,
- 0,
- true,
- 'offset',
- false,
- ''
+ ],
+ 'filter_main_class' => 'box-flat white_table_graph fixed_filter_bar',
+ 'dom_elements' => 'lftpB',
+ ]
);
-} else {
- ui_print_info_message(['no_close' => true, 'message' => __('There are no defined operating systems') ]);
+} catch (Exception $e) {
+ echo $e->getMessage();
}
$buttons = '';
@@ -191,3 +144,76 @@ html_print_action_buttons(
'right_content' => $tablePagination,
]
);
+
+echo '';
+
+echo '';
+
+?>
+
diff --git a/pandora_console/godmode/setup/os.php b/pandora_console/godmode/setup/os.php
index 539189f88d..99402ff30a 100644
--- a/pandora_console/godmode/setup/os.php
+++ b/pandora_console/godmode/setup/os.php
@@ -40,24 +40,13 @@ if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user
return;
}
-$action = get_parameter('action', 'new');
+$action = get_parameter('action', '');
$idOS = get_parameter('id_os', 0);
$id_message = get_parameter('message', 0);
if (is_metaconsole() === true) {
$tab = get_parameter('tab2', 'list');
} else {
- $tab = get_parameter('tab', 'list');
-}
-
-if ($idOS) {
- $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);
+ $tab = get_parameter('tab', 'manage_os');
}
$is_management_allowed = true;
@@ -65,150 +54,60 @@ if (is_management_allowed() === false) {
$is_management_allowed = false;
}
-$message = '';
-if ($is_management_allowed === true) {
- switch ($action) {
- case 'edit':
- $actionHidden = 'update';
- $textButton = __('Update');
- $classButton = ['icon' => 'wand'];
- break;
-
- case 'save':
- $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 = 'list';
- $message = 1;
- }
-
- 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 'update':
- $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 = 'list';
- } 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=os_manage&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;
- }
-}
-
$buttons = [];
-$buttons['list'] = [
+
+$buttons['manage_os'] = [
'active' => false,
- 'text' => ''.html_print_image(
- 'images/logs@svg.svg',
+ 'text' => ''.html_print_image(
+ 'images/os@svg.svg',
true,
[
- 'title' => __('List OS'),
+ 'title' => __('Manage OS types'),
+ 'class' => 'invert_filter main_menu_icon',
+ ]
+ ).'',
+];
+
+$buttons['manage_version'] = [
+ 'active' => false,
+ 'text' => ''.html_print_image(
+ 'images/os_version@svg.svg',
+ true,
+ [
+ 'title' => __('Manage version expiration dates'),
'class' => 'invert_filter main_menu_icon',
]
).'',
];
-if ($is_management_allowed === true) {
- $buttons['builder'] = [
- 'active' => false,
- 'text' => ''.html_print_image(
- 'images/edit.svg',
- true,
- [
- 'title' => __('Builder OS'),
- 'class' => 'invert_filter main_menu_icon',
- ]
- ).'',
- ];
-}
$buttons[$tab]['active'] = true;
-$headerTitle = ($tab === 'builder') ? __('Edit OS') : __('List of Operating Systems');
+switch ($tab) {
+ case 'builder':
+ $headerTitle = __('Edit OS');
+ break;
+
+ case 'manage_os':
+ case 'list':
+ if ($action === 'edit') {
+ $headerTitle = __('Edit OS');
+ } else {
+ $headerTitle = __('List of Operating Systems');
+ }
+ break;
+
+ case 'manage_version':
+ if ($action === 'edit') {
+ $headerTitle = __('Edit OS version expiration date');
+ } else {
+ $headerTitle = __('List of version expiration dates');
+ }
+ break;
+
+ default:
+ // Default.
+ break;
+}
if (is_metaconsole() === false) {
// Header.
@@ -262,6 +161,14 @@ if (empty($id_message) === false) {
echo ui_print_error_message(__('Error deleting'), '', true);
break;
+ case 8:
+ echo ui_print_success_message(__('Icon successfuly uploaded'), '', true);
+ break;
+
+ case 9:
+ echo ui_print_error_message(__('File must be of type JPG, JPEG, PNG or SVG'), '', true);
+ break;
+
default:
// Default.
break;
@@ -269,12 +176,21 @@ if (empty($id_message) === false) {
}
switch ($tab) {
+ case 'manage_os':
case 'list':
- include_once $config['homedir'].'/godmode/setup/os.list.php';
+ if (in_array($action, ['edit', 'save', 'update']) && is_management_allowed() === true) {
+ include_once $config['homedir'].'/godmode/setup/os.builder.php';
+ } else {
+ include_once $config['homedir'].'/godmode/setup/os.list.php';
+ }
break;
- case 'builder':
- include_once $config['homedir'].'/godmode/setup/os.builder.php';
+ case 'manage_version':
+ if (in_array($action, ['edit', 'save', 'update']) && is_management_allowed() === true) {
+ include_once $config['homedir'].'/godmode/setup/os_version.builder.php';
+ } else {
+ include_once $config['homedir'].'/godmode/setup/os_version.list.php';
+ }
break;
default:
diff --git a/pandora_console/godmode/setup/os_version.builder.php b/pandora_console/godmode/setup/os_version.builder.php
new file mode 100644
index 0000000000..caf968e5be
--- /dev/null
+++ b/pandora_console/godmode/setup/os_version.builder.php
@@ -0,0 +1,211 @@
+ 0) {
+ $os_version = db_get_row_filter('tconfig_os_version', ['id_os_version' => $idOS]);
+ $product = $os_version['product'];
+ $version = $os_version['version'];
+ $end_of_life_date = $os_version['end_of_support'];
+} else {
+ $product = io_safe_input(strip_tags(io_safe_output((string) get_parameter('product'))));
+ $version = io_safe_input(strip_tags(io_safe_output((string) get_parameter('version'))));
+ $end_of_life_date = get_parameter('end_of_life_date', date("Y/m/d"));
+}
+
+$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':
+ $values = [];
+ // Product and version must be stored with no entities to be able to use REGEXP in queries.
+ // CAREFUL! output of these fields must be encoded to avoid scripting vulnerabilities.
+ $values['product'] = io_safe_output($product);
+ $values['version'] = io_safe_output($version);
+ $values['end_of_support'] = $end_of_life_date;
+
+ $result = db_process_sql_insert('tconfig_os_version', $values);
+
+ if ($result === false) {
+ $message = 2;
+ } else {
+ $message = 1;
+ }
+
+ $tab = 'manage_version';
+
+ header('Location:'.$config['homeurl'].'index.php?sec=gsetup&sec2=godmode/setup/os&tab='.$tab.'&message='.$message);
+ break;
+
+ case 'update':
+ $product = io_safe_output(get_parameter('product'));
+ $version = io_safe_output(get_parameter('version'));
+ $end_of_life_date = get_parameter('end_of_life_date', 0);
+ $values = [];
+ $values['product'] = $product;
+ $values['version'] = $version;
+ $values['end_of_support'] = $end_of_life_date;
+ $result = db_process_sql_update('tconfig_os_version', $values, ['id_os_version' => $idOS]);
+
+ if ($result === false) {
+ $message = 4;
+ } else {
+ $message = 3;
+ }
+
+ $tab = 'manage_version';
+
+ 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;
+ }
+}
+
+echo '';
+
+?>
+
\ No newline at end of file
diff --git a/pandora_console/godmode/setup/os_version.list.php b/pandora_console/godmode/setup/os_version.list.php
new file mode 100644
index 0000000000..3e15725793
--- /dev/null
+++ b/pandora_console/godmode/setup/os_version.list.php
@@ -0,0 +1,198 @@
+ __('Options'),
+ 'class' => 'w100px table_action_buttons',
+ ],
+ ];
+
+ $tableId = 'os_version_table';
+ // Load datatables user interface.
+ ui_print_datatable(
+ [
+ 'id' => $tableId,
+ 'class' => 'info_table',
+ 'style' => 'width: 100%',
+ 'columns' => $columns,
+ 'column_names' => $column_names,
+ 'ajax_url' => 'include/ajax/os',
+ 'ajax_data' => ['method' => 'drawOSVersionTable'],
+ 'ajax_postprocess' => 'process_datatables_item(item)',
+ 'no_sortable_columns' => [-1],
+ 'order' => [
+ 'field' => 'id',
+ 'direction' => 'asc',
+ ],
+ 'search_button_class' => 'sub filter float-right',
+ 'form' => [
+ 'inputs' => [
+ [
+ 'label' => __('Free search'),
+ 'type' => 'text',
+ 'class' => 'w25p',
+ 'id' => 'free_search',
+ 'name' => 'free_search',
+ ],
+ ],
+ ],
+ 'filter_main_class' => 'box-flat white_table_graph fixed_filter_bar',
+ 'dom_elements' => 'lftpB',
+ ]
+ );
+} catch (Exception $e) {
+ echo $e->getMessage();
+}
+
+echo '';
+
+echo '';
+
+echo '';
+
+?>
+
+
\ No newline at end of file
diff --git a/pandora_console/godmode/setup/os_version.php b/pandora_console/godmode/setup/os_version.php
new file mode 100644
index 0000000000..ec5d27beae
--- /dev/null
+++ b/pandora_console/godmode/setup/os_version.php
@@ -0,0 +1,285 @@
+ $id_os_version]);
+ $product = $os_version['product'];
+ $version = $os_version['version'];
+ $end_of_life_date = $os_version['end_of_life_date'];
+} else {
+ $product = io_safe_input(strip_tags(io_safe_output((string) get_parameter('product'))));
+ $version = io_safe_input(strip_tags(io_safe_output((string) get_parameter('version'))));
+ $end_of_life_date = get_parameter('end_of_life_date', 0);
+}
+
+$is_management_allowed = true;
+if (is_management_allowed() === false) {
+ $is_management_allowed = false;
+}
+
+$message = '';
+if ($is_management_allowed === true) {
+ switch ($action) {
+ case 'edit':
+ $action_hidden = 'update';
+ $text_button = __('Update');
+ $class_button = ['icon' => 'wand'];
+ break;
+
+ case 'save':
+ $values = [];
+ $values['product'] = $product;
+ $values['version'] = $version;
+ $values['end_of_life_date'] = $end_of_life_date;
+
+ $result_or_id = false;
+ if ($product !== '') {
+ $result_or_id = db_process_sql_insert('tconfig_os_version', $values);
+ }
+
+ if ($result_or_id === false) {
+ $message = 2;
+ $tab = 'builder';
+ $actionHidden = 'save';
+ $textButton = __('Create');
+ $classButton = ['icon' => 'wand'];
+ } else {
+ $tab = 'list';
+ $message = 1;
+ }
+
+ 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 'update':
+ $product = io_safe_input(strip_tags(io_safe_output((string) get_parameter('product'))));
+ $version = io_safe_input(strip_tags(io_safe_output((string) get_parameter('version'))));
+ $end_of_life_date = get_parameter('end_of_life_date', 0);
+
+ $values = [];
+ $values['product'] = $product;
+ $values['version'] = $version;
+
+ $result = false;
+ $result = db_process_sql_update('tconfig_os_version', $values, ['id_os' => $id_os_version]);
+
+ if ($result !== false) {
+ $message = 3;
+ $tab = 'list';
+ } 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_version&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=os_manage&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;
+ }
+}
+
+$buttons = [];
+$buttons['list'] = [
+ 'active' => false,
+ 'text' => ''.html_print_image(
+ 'images/logs@svg.svg',
+ true,
+ [
+ 'title' => __('List OS'),
+ 'class' => 'invert_filter main_menu_icon',
+ ]
+ ).'',
+];
+if ($is_management_allowed === true) {
+ $buttons['builder'] = [
+ 'active' => false,
+ 'text' => ''.html_print_image(
+ 'images/edit.svg',
+ true,
+ [
+ 'title' => __('Builder OS'),
+ 'class' => 'invert_filter main_menu_icon',
+ ]
+ ).'',
+ ];
+
+ $buttons['version_exp_date_editor'] = [
+ 'active' => false,
+ 'text' => ''.html_print_image(
+ 'images/edit.svg',
+ true,
+ [
+ 'title' => __('Version expiration date editor'),
+ 'class' => 'invert_filter main_menu_icon',
+ ]
+ ).'',
+ ];
+}
+
+$buttons[$tab]['active'] = true;
+
+switch ($tab) {
+ case 'builder':
+ $headerTitle = __('Edit OS');
+ break;
+
+ case 'manage_version':
+ $headerTitle = __('Version expiration date editor');
+ break;
+
+ case 'list':
+ $headerTitle = __('List of Operating Systems');
+ break;
+
+ default:
+ // Default.
+ break;
+}
+
+if (is_metaconsole() === false) {
+ // Header.
+ ui_print_standard_header(
+ $headerTitle,
+ '',
+ false,
+ '',
+ true,
+ $buttons,
+ [
+ [
+ 'link' => '',
+ 'label' => __('Servers'),
+ ],
+ [
+ 'link' => '',
+ 'label' => __('Edit OS'),
+ ],
+ ]
+ );
+}
+
+if (empty($id_message) === false) {
+ switch ($id_message) {
+ case 1:
+ echo ui_print_success_message(__('Success creating OS'), '', true);
+ break;
+
+ case 2:
+ echo ui_print_error_message(__('Fail creating OS'), '', true);
+ break;
+
+ case 3:
+ echo ui_print_success_message(__('Success updating OS'), '', true);
+ break;
+
+ case 4:
+ echo ui_print_error_message(__('Error updating OS'), '', true);
+ break;
+
+ case 5:
+ echo ui_print_error_message(__('There are agents with this OS.'), '', true);
+ break;
+
+ case 6:
+ echo ui_print_success_message(__('Success deleting'), '', true);
+ break;
+
+ case 7:
+ echo ui_print_error_message(__('Error deleting'), '', true);
+ break;
+
+ default:
+ // Default.
+ break;
+ }
+}
+
+include_once $config['homedir'].'/godmode/setup/os_version.list.php';
diff --git a/pandora_console/images/os@svg.svg b/pandora_console/images/os@svg.svg
new file mode 100644
index 0000000000..80f8caf194
--- /dev/null
+++ b/pandora_console/images/os@svg.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/pandora_console/images/os_version@svg.svg b/pandora_console/images/os_version@svg.svg
new file mode 100644
index 0000000000..1274ccc3f8
--- /dev/null
+++ b/pandora_console/images/os_version@svg.svg
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/pandora_console/include/ajax/os.php b/pandora_console/include/ajax/os.php
new file mode 100644
index 0000000000..058fe75578
--- /dev/null
+++ b/pandora_console/include/ajax/os.php
@@ -0,0 +1,376 @@
+ false]);
+ return;
+ }
+
+ if (db_process_sql_delete(
+ 'tconfig_os',
+ ['id_os' => $id_os]
+ ) === false
+ ) {
+ echo json_encode(['deleted' => false]);
+ } else {
+ echo json_encode(['deleted' => true]);
+ }
+}
+
+if ($method === 'deleteOSVersion') {
+ global $config;
+
+ $id_os_version = get_parameter('id_os_version', null);
+
+ if (empty($id_os_version) === true || $id_os_version < 1) {
+ echo json_encode(['deleted' => false]);
+ }
+
+ if (db_process_sql_delete(
+ 'tconfig_os_version',
+ ['id_os_version' => $id_os_version]
+ ) === false
+ ) {
+ echo json_encode(['deleted' => false]);
+ } else {
+ echo json_encode(['deleted' => true]);
+ }
+}
+
+if ($method === 'drawOSTable') {
+ // Datatables offset, limit and order.
+ $filter = get_parameter('filter', []);
+ $start = get_parameter('start', 0);
+ $length = get_parameter('length', $config['block_size']);
+ $orderBy = get_datatable_order(true);
+
+ $sort_field = $orderBy['field'];
+ $order = $orderBy['direction'];
+
+ $pagination = '';
+
+ $pagination = sprintf(
+ ' LIMIT %d OFFSET %d ',
+ $length,
+ $start
+ );
+
+ try {
+ ob_start();
+
+ $fields = ['*'];
+ $sql_filters = [];
+
+ if (isset($filter['free_search']) === true
+ && empty($filter['free_search']) === false
+ ) {
+ $sql_filters[] = sprintf(
+ ' AND (`name` like "%%%s%%" OR `description` like "%%%s%%") ',
+ $filter['free_search'],
+ $filter['free_search']
+ );
+ }
+
+ if (isset($order) === true) {
+ $dir = 'asc';
+ if ($order == 'desc') {
+ $dir = 'desc';
+ };
+
+ if (in_array(
+ $sort_field,
+ [
+ 'id_os',
+ 'name',
+ 'description',
+ ]
+ ) === true
+ ) {
+ $order_by = sprintf(
+ 'ORDER BY `%s` %s',
+ $sort_field,
+ $dir
+ );
+ }
+ }
+
+ // Retrieve data.
+ $sql = sprintf(
+ 'SELECT %s
+ FROM tconfig_os
+ WHERE 1=1
+ %s
+ %s
+ %s',
+ join(',', $fields),
+ join(' ', $sql_filters),
+ $order_by,
+ $pagination
+ );
+
+ $count_sql = sprintf(
+ 'SELECT id_os
+ FROM tconfig_os
+ WHERE 1=1
+ %s',
+ join(' ', $sql_filters)
+ );
+
+ $return = db_get_all_rows_sql($sql);
+ if ($return === false) {
+ $data = [];
+ } else {
+ $data = $return;
+ }
+
+ $data = array_map(
+ function ($item) {
+ $item['icon_img'] = ui_print_os_icon($item['id_os'], false, true);
+
+ if (is_management_allowed() === true) {
+ if (is_metaconsole() === true) {
+ $osNameUrl = 'index.php?sec=advanced&sec2=advanced/component_management&tab=os_manage&action=edit&tab2=list&id_os='.$item['id_os'];
+ } else {
+ $osNameUrl = 'index.php?sec=gsetup&sec2=godmode/setup/os&action=edit&tab=manage_os&id_os='.$item['id_os'];
+ }
+
+ $item['name'] = html_print_anchor(
+ [
+ 'href' => $osNameUrl,
+ 'content' => $item['name'],
+ ],
+ true
+ );
+ } else {
+ $item['name'] = $item['name'];
+ }
+
+ $item['description'] = ui_print_truncate_text(
+ $item['description'],
+ 'description',
+ true,
+ true
+ );
+
+ if (is_management_allowed() === true) {
+ $item['enable_delete'] = false;
+
+ if ($item['id_os'] > 16) {
+ $item['enable_delete'] = true;
+ }
+ }
+
+ return $item;
+ },
+ $data
+ );
+
+ // Retrieve counter.
+ $count = db_get_value('count(*)', '('.$count_sql.') t');
+
+ // Datatables format: RecordsTotal && recordsfiltered.
+ echo json_encode(
+ [
+ 'data' => $data,
+ 'recordsTotal' => $count,
+ 'recordsFiltered' => $count,
+ ]
+ );
+ // Capture output.
+ $response = ob_get_clean();
+ } catch (Exception $e) {
+ echo json_encode(['error' => $e->getMessage()]);
+ exit;
+ }
+
+ // If not valid, show error with issue.
+ json_decode($response);
+ if (json_last_error() == JSON_ERROR_NONE) {
+ // If valid dump.
+ echo $response;
+ } else {
+ echo json_encode(
+ ['error' => $response]
+ );
+ }
+
+ exit;
+}
+
+if ($method === 'drawOSVersionTable') {
+ // Datatables offset, limit and order.
+ $filter = get_parameter('filter', []);
+ $start = get_parameter('start', 0);
+ $length = get_parameter('length', $config['block_size']);
+ $orderBy = get_datatable_order(true);
+
+ $sort_field = $orderBy['field'];
+ $order = $orderBy['direction'];
+
+ $pagination = '';
+
+ $pagination = sprintf(
+ ' LIMIT %d OFFSET %d ',
+ $length,
+ $start
+ );
+
+ try {
+ ob_start();
+
+ $fields = ['*'];
+ $sql_filters = [];
+
+ if (isset($filter['free_search']) === true
+ && empty($filter['free_search']) === false
+ ) {
+ $sql_filters[] = sprintf(
+ ' AND (`product` like "%%%s%%" OR `version` like "%%%s%%") ',
+ $filter['free_search'],
+ $filter['free_search']
+ );
+ }
+
+ if (isset($order) === true) {
+ $dir = 'asc';
+ if ($order == 'desc') {
+ $dir = 'desc';
+ };
+
+ if (in_array(
+ $sort_field,
+ [
+ 'product',
+ 'version',
+ 'end_of_support',
+ ]
+ ) === true
+ ) {
+ $order_by = sprintf(
+ 'ORDER BY `%s` %s',
+ $sort_field,
+ $dir
+ );
+ }
+ }
+
+ // Retrieve data.
+ $sql = sprintf(
+ 'SELECT %s
+ FROM tconfig_os_version
+ WHERE 1=1
+ %s
+ %s
+ %s',
+ join(',', $fields),
+ join(' ', $sql_filters),
+ $order_by,
+ $pagination
+ );
+
+ $count_sql = sprintf(
+ 'SELECT id_os_version
+ FROM tconfig_os_version
+ WHERE 1=1
+ %s',
+ join(' ', $sql_filters)
+ );
+
+ $return = db_get_all_rows_sql($sql);
+
+ if ($return === false) {
+ $data = [];
+ } else {
+ // Format end of life date.
+ $return = array_map(
+ function ($item) {
+ $date_string = date_w_fixed_tz($item['end_of_support']);
+ $timestamp = strtotime($date_string);
+ $date_without_time = date('F j, Y', $timestamp);
+ $item['end_of_support'] = $date_without_time;
+ return $item;
+ },
+ $return
+ );
+
+ $data = $return;
+ }
+
+ // Retrieve counter.
+ $count = db_get_value('count(*)', '('.$count_sql.') t');
+
+ // Datatables format: RecordsTotal && recordsfiltered.
+ echo json_encode(
+ [
+ 'data' => $data,
+ 'recordsTotal' => $count,
+ 'recordsFiltered' => $count,
+ ]
+ );
+ // Capture output.
+ $response = ob_get_clean();
+ } catch (Exception $e) {
+ echo json_encode(['error' => $e->getMessage()]);
+ exit;
+ }
+
+ // If not valid, show error with issue.
+ json_decode($response);
+ if (json_last_error() == JSON_ERROR_NONE) {
+ // If valid dump.
+ echo $response;
+ } else {
+ echo json_encode(
+ ['error' => $response]
+ );
+ }
+
+ exit;
+}
diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index f1cb4e1f0e..720b0e6e55 100644
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@@ -497,7 +497,8 @@ function agents_get_agents(
],
$return=false,
$disabled_agent=0,
- $use_meta_table=false
+ $use_meta_table=false,
+ $join_os_table=false
) {
global $config;
@@ -710,6 +711,18 @@ function agents_get_agents(
ON tpolicy_agents.id_agent=tagente.id_agente';
}
+ if ($join_os_table === true) {
+ $os_version_join = '
+ INNER JOIN tconfig_os
+ ON tagente.id_os = tconfig_os.id_os
+ INNER JOIN tconfig_os_version
+ ON tconfig_os.name REGEXP tconfig_os_version.product
+ ';
+ unset($filter['os_version_end_of_life']);
+ } else {
+ $os_version_join = '';
+ }
+
if ($extra) {
$where = sprintf(
'(%s OR (%s)) AND (%s) AND (%s) %s AND %s %s %s %s',
@@ -744,11 +757,12 @@ function agents_get_agents(
FROM `%s` tagente
LEFT JOIN tagent_secondary_group
ON tagent_secondary_group.id_agent=tagente.id_agente
- %s
+ %s %s
WHERE %s %s',
implode(',', $fields),
$table_name,
$policy_join,
+ $os_version_join,
$where,
$order
);
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 9dfe1c0801..f6d1674022 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -1528,6 +1528,7 @@ function api_set_update_agent($id_agent, $thrash2, $other, $thrash3)
$learningMode = $other['data'][10];
$disabled = $other['data'][11];
$description = $other['data'][12];
+ $osVersion = $other['data'][13];
// Check parameters.
if ($idGroup == 0) {
@@ -1623,6 +1624,7 @@ function api_set_update_agent($id_agent, $thrash2, $other, $thrash3)
'server_name' => $nameServer,
'id_parent' => $idParent,
'custom_id' => $customId,
+ 'os_version' => $osVersion,
],
['id_agente' => $id_agent]
);
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 0dd7808092..2552fbcdc1 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -4867,7 +4867,7 @@ function html_print_header_logo_image(bool $menuCollapsed, bool $return=false)
* Key disabled: Whether to disable the input or not.
* Key class: HTML class
*/
-function html_print_input_file($name, $return=false, $options=false)
+function html_print_input_file($name, $return=false, $options=false, $inline_upload_anchor_to_form='')
{
$output = '';
// Start to build the input.
@@ -4914,11 +4914,45 @@ function html_print_input_file($name, $return=false, $options=false)
$output .= ($options['caption'] ?? __('Select a file'));
$output .= '';
+
+ if ($inline_upload_anchor_to_form !== '') {
+ // Add script to submit targeted form.
+ $output .= '';
+ $output .= '';
+ }
+
$output .= ' ';
+
+ if ($inline_upload_anchor_to_form !== '') {
+ $output .= ' ';
+ $output .= html_print_button(
+ __('Upload'),
+ 'upload-icon-btn',
+ false,
+ sprintf(
+ 'javascript:submitForm("%s")',
+ $inline_upload_anchor_to_form
+ ),
+ [
+ 'mode' => 'link',
+ 'style' => 'min-width: initial;',
+ ],
+ true,
+ );
+ $output .= ' ';
+ $output .= ' |