';
echo '| '.html_print_input(
[
'type' => 'select_multiple_modules_filtered',
'uniqId' => 'modules',
'class' => 'flex flex-row',
- 'searchBar' => false,
+ 'searchBar' => true,
+ 'searchBarAgents' => false,
+ 'searchBarModules' => true,
'placeholderAgents' => __('Search agent name'),
]
).' | ';
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 5af45c53c4..8d26c83443 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -1459,7 +1459,7 @@ $class = 'databox filters';
@@ -2318,7 +2318,9 @@ if (is_metaconsole() === true) {
$params['add_none_module'] = true;
$params['use_hidden_input_idagent'] = true;
$params['hidden_input_idagent_id'] = 'hidden-id_agent';
+ $params['size'] = 40;
if ($meta) {
+ $params['size'] = 44;
$params['use_input_id_server'] = true;
$params['input_id_server_id'] = 'hidden-server_id';
$params['metaconsole_enabled'] = true;
@@ -6645,26 +6647,6 @@ function create_custom_graph() {
$("#meta_target_servers").css('display', 'inline');
}
else {
- var hash_data;
- var params1 = [];
- params1.push("get_metaconsole_hash_data=1");
- params1.push("server_name=" + target_server);
- params1.push("page=include/ajax/reporting.ajax");
- jQuery.ajax ({
- data: params1.join ("&"),
- type: 'POST',
- url: action=
-
- + "/ajax.php",
- async: false,
- timeout: 10000,
- success: function (data) {
- hash_data = data;
- }
- });
-
var server_url;
var params1 = [];
params1.push("get_metaconsole_server_url=1");
@@ -6690,7 +6672,7 @@ function create_custom_graph() {
}
});
- window.location.href = server_url + "/index.php?sec=reporting&sec2=godmode/reporting/graph_builder&create=Create graph" + hash_data;
+ redirectNode(server_url + "/index.php?sec=reporting&sec2=godmode/reporting/graph_builder&create=Create graph", "_self");
}
- + "/ajax.php",
- async: false,
- timeout: 10000,
- success: function (data) {
- hash_data = data;
- }
- });
-
var server_url;
var params1 = [];
params1.push("get_metaconsole_server_url=1");
@@ -6769,7 +6726,7 @@ function edit_custom_graph() {
}
});
- window.location.href = server_url + "index.php?sec=reporting&sec2=godmode/reporting/graph_builder&edit_graph=1&id=" + id_element_graph + hash_data;
+ redirectNode(server_url + "index.php?sec=reporting&sec2=godmode/reporting/graph_builder&edit_graph=1&id=" + id_element_graph, "_self");
diff --git a/pandora_console/godmode/reporting/visual_console_builder.data.php b/pandora_console/godmode/reporting/visual_console_builder.data.php
index a1e49d7206..58e20f2874 100644
--- a/pandora_console/godmode/reporting/visual_console_builder.data.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.data.php
@@ -260,9 +260,8 @@ $layoutSizeElements[] = html_print_button(
false,
'',
[
- 'icon' => 'cog',
- 'mode' => 'link',
'value' => 'modsize',
+ 'class' => 'buttonButton mini',
],
true
);
@@ -275,9 +274,8 @@ $layoutSizeElements[] = html_print_button(
false,
'',
[
- 'icon' => 'cog',
- 'mode' => 'link',
'value' => 'modsize',
+ 'class' => 'buttonButton mini',
],
true
);
@@ -287,7 +285,7 @@ $table->data[4][] = html_print_label_input_block(
__('Layout size'),
html_print_div(
[
- 'class' => 'flex flex-items-center',
+ 'class' => 'flex flex-space-around w600px',
'content' => implode('', $layoutSizeElements),
],
true
diff --git a/pandora_console/godmode/setup/file_manager.php b/pandora_console/godmode/setup/file_manager.php
index 8ccddde606..93b83200c9 100644
--- a/pandora_console/godmode/setup/file_manager.php
+++ b/pandora_console/godmode/setup/file_manager.php
@@ -121,6 +121,7 @@ if ($upload_file === true) {
MIME_TYPES['jpg'],
MIME_TYPES['png'],
MIME_TYPES['gif'],
+ MIME_TYPES['svg'],
]
);
}
diff --git a/pandora_console/godmode/setup/os.list.php b/pandora_console/godmode/setup/os.list.php
index 2c722aade0..5ec791baca 100644
--- a/pandora_console/godmode/setup/os.list.php
+++ b/pandora_console/godmode/setup/os.list.php
@@ -219,7 +219,9 @@ echo '';
$('#aux').text('');
} else {
$('#aux').dialog('close');
- location.reload();
+ let url = new URL(window.location.href);
+ url.searchParams.set('message', r.url_message)
+ window.location.href = url.href;
}
},
error: function(e) {
diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php
index df4d75d6aa..e17d13806f 100644
--- a/pandora_console/godmode/setup/setup_auth.php
+++ b/pandora_console/godmode/setup/setup_auth.php
@@ -196,14 +196,20 @@ if (is_ajax() === true) {
$row['name'] = __('Admin LDAP password');
$row['control'] = html_print_input_password(
'ldap_admin_pass',
- io_output_password($config['ldap_admin_pass']),
+ (empty(io_output_password($config['ldap_admin_pass'])) === false) ? '*****' : '',
$alt = '',
60,
100,
true,
false,
false,
- 'w400px-important'
+ 'w400px-important',
+ 'on',
+ false,
+ '',
+ true,
+ false,
+ true
);
$table->data['ldap_admin_pass'] = $row;
diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php
index b77ffabbee..e6bf3e4a2c 100644
--- a/pandora_console/godmode/setup/setup_general.php
+++ b/pandora_console/godmode/setup/setup_general.php
@@ -267,18 +267,6 @@ $table->data[$i][] = html_print_label_input_block(
);
$table->data[$i++][] = html_print_label_input_block(
- __('Auto login (hash) password'),
- html_print_input_password(
- 'loginhash_pwd',
- io_output_password($config['loginhash_pwd']),
- '',
- 15,
- 15,
- true
- )
-);
-
-$table->data[$i][] = html_print_label_input_block(
__('Time source'),
html_print_select(
$sources,
diff --git a/pandora_console/include/ajax/custom_fields.php b/pandora_console/include/ajax/custom_fields.php
index fa01ef7f59..8e4f7d5dbb 100644
--- a/pandora_console/include/ajax/custom_fields.php
+++ b/pandora_console/include/ajax/custom_fields.php
@@ -328,23 +328,6 @@ if (check_login()) {
if (isset($array_nodes) && is_array($array_nodes)) {
$hash_array_nodes = [];
foreach ($array_nodes as $key => $server) {
- $pwd = $server['auth_token'];
- $auth_serialized = json_decode($pwd, true);
-
- if (is_array($auth_serialized)) {
- $pwd = $auth_serialized['auth_token'];
- $api_password = $auth_serialized['api_password'];
- $console_user = $auth_serialized['console_user'];
- $console_password = $auth_serialized['console_password'];
- }
-
- $user = $config['id_user'];
- $user_rot13 = str_rot13($config['id_user']);
- $hashdata = $user.$pwd;
- $hashdata = md5($hashdata);
- $url_hash = '&loginhash=auto&loginhash_data='.$hashdata.'&loginhash_user='.$user_rot13;
-
- $hash_array_nodes[$server['id']]['hashurl'] = $url_hash;
$hash_array_nodes[$server['id']]['server_url'] = $server['server_url'];
}
}
@@ -355,7 +338,7 @@ if (check_login()) {
$image_status = agents_get_image_status($values['status']);
// Link nodes.
if (is_metaconsole() === true) {
- $agent_link = '';
+ $agent_link = '';
$agent_alias = ui_print_truncate_text(
$values['alias'],
'agent_small',
diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index a063ef5c8b..b053d304b6 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -2541,7 +2541,7 @@ if ($drawConsoleSound === true) {
true,
[
'title' => __('No alerts discovered'),
- 'class' => 'invert_filter',
+ 'class' => '',
]
);
$output .= '';
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 37fac4ccac..86ea0cb301 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -55,6 +55,7 @@ if (check_login()) {
$get_id_tag = (bool) get_parameter('get_id_tag', 0);
$get_type = (bool) get_parameter('get_type', 0);
$list_modules = (bool) get_parameter('list_modules', 0);
+ $list_snmp_modules = (bool) get_parameter('list_snmp_modules', 0);
$get_agent_modules_json_by_name = (bool) get_parameter(
'get_agent_modules_json_by_name',
0
@@ -1538,6 +1539,133 @@ if (check_login()) {
unset($table_data);
}
+ if ($list_snmp_modules) {
+ include_once $config['homedir'].'/include/functions_graph.php';
+ $agent = get_parameter('agent');
+ $id_agente = $agent;
+ $paginate_module = false;
+ if (isset($config['paginate_module']) === true) {
+ $paginate_module = (bool) $config['paginate_module'];
+ }
+
+ $network_interfaces_by_agents = agents_get_network_interfaces([$agent], false, $paginate_module, get_parameter('offset', 0));
+ $count_network_incerfaces = agents_get_network_interfaces([$agent], false, false, 0, true);
+ $network_interfaces = [];
+ if (empty($network_interfaces_by_agents) === false && empty($network_interfaces_by_agents[$id_agente]) === false) {
+ $network_interfaces = $network_interfaces_by_agents[$id_agente]['interfaces'];
+ }
+
+ if (empty($network_interfaces) === false) {
+ $table_interface = new stdClass();
+ $table_interface->id = 'agent_interface_info';
+ $table_interface->class = 'info_table';
+ $table_interface->width = '100%';
+ $table_interface->style = [];
+ $table_interface->style['interface_event_graph'] = 'width: 35%;';
+
+ $table_interface->head = [];
+ $options = [
+ 'class' => 'closed',
+ 'style' => 'cursor:pointer;',
+ ];
+ $table_interface->data = [];
+ $event_text_cont = 0;
+
+ foreach ($network_interfaces as $interface_name => $interface) {
+ if (empty($interface['traffic']) === false) {
+ $permission = check_acl_one_of_groups($config['id_user'], $all_groups, 'RR');
+
+ if ($permission) {
+ $params = [
+ 'interface_name' => $interface_name,
+ 'agent_id' => $id_agente,
+ 'traffic_module_in' => $interface['traffic']['in'],
+ 'traffic_module_out' => $interface['traffic']['out'],
+ ];
+ $params_json = json_encode($params);
+ $params_encoded = base64_encode($params_json);
+ $win_handle = dechex(crc32($interface['status_module_id'].$interface_name));
+ $graph_link = "";
+ $graph_link .= html_print_image(
+ 'images/chart.png',
+ true,
+ [
+ 'title' => __('Interface traffic'),
+ 'class' => 'invert_filter',
+ ]
+ ).'';
+ } else {
+ $graph_link = '';
+ }
+ } else {
+ $graph_link = '';
+ }
+
+ $content = [
+ 'id_agent_module' => $interface['status_module_id'],
+ 'id_group' => $id_group,
+ 'period' => SECONDS_1DAY,
+ 'time_from' => '00:00:00',
+ 'time_to' => '00:00:00',
+ 'sizeForTicks' => 250,
+ 'height_graph' => 40,
+ [
+ ['id_agent_module' => $interface['status_module_id']],
+ ]
+ ];
+
+ $e_graph = \reporting_module_histogram_graph(
+ ['datetime' => time()],
+ $content
+ );
+
+ $sqlLast_contact = sprintf(
+ '
+ SELECT timestamp
+ FROM tagente_estado
+ WHERE id_agente_modulo = '.$interface['status_module_id']
+ );
+
+ $last_contact = db_get_all_rows_sql($sqlLast_contact);
+ $last_contact = array_shift($last_contact);
+ $last_contact = array_shift($last_contact);
+
+ $data = [];
+ $data['interface_name'] = ''.$interface_name.'';
+ $data['interface_status'] = $interface['status_image'];
+ $data['interface_graph'] = $graph_link;
+ $data['interface_ip'] = $interface['ip'];
+ $data['interface_mac'] = $interface['mac'];
+ $data['last_contact'] = __('Last contact: ').$last_contact;
+ $data['interface_event_graph'] = $e_graph['chart'];
+
+ $table_interface->data[] = $data;
+ }
+
+ if ($paginate_module === true) {
+ ui_pagination(
+ $count_network_incerfaces,
+ false,
+ 0,
+ 0,
+ false,
+ 'offset',
+ true,
+ '',
+ 'change_page_snmp(offset_param)',
+ [
+ 'count' => '',
+ 'offset' => 'offset_param',
+ ]
+ );
+ }
+
+ html_print_table($table_interface);
+ }
+ }
+
if ($get_type === true) {
$id_module = (int) get_parameter('id_module');
$module = modules_get_agentmodule($id_module);
diff --git a/pandora_console/include/ajax/os.php b/pandora_console/include/ajax/os.php
index 058fe75578..5879a00158 100644
--- a/pandora_console/include/ajax/os.php
+++ b/pandora_console/include/ajax/os.php
@@ -60,7 +60,12 @@ if ($method === 'deleteOS') {
) {
echo json_encode(['deleted' => false]);
} else {
- echo json_encode(['deleted' => true]);
+ echo json_encode(
+ [
+ 'deleted' => true,
+ 'url_message' => 6,
+ ]
+ );
}
}
diff --git a/pandora_console/include/ajax/reporting.ajax.php b/pandora_console/include/ajax/reporting.ajax.php
index 5f83d79b88..e5b42c67cf 100755
--- a/pandora_console/include/ajax/reporting.ajax.php
+++ b/pandora_console/include/ajax/reporting.ajax.php
@@ -37,7 +37,6 @@ $add_sla = get_parameter('add_sla', 0);
$add_general = get_parameter('add_general', 0);
$id = get_parameter('id', 0);
$truncate_text = get_parameter('truncate_text', 0);
-$get_metaconsole_hash_data = get_parameter('get_metaconsole_hash_data', 0);
$get_metaconsole_server_url = get_parameter('get_metaconsole_server_url', 0);
$change_custom_fields_macros_report = (bool) get_parameter(
'change_custom_fields_macros_report',
@@ -186,37 +185,6 @@ if ($truncate_text) {
return ui_print_truncate_text($text, GENERIC_SIZE_TEXT, true, false);
}
-if ($get_metaconsole_hash_data) {
- $server_name = get_parameter('server_name');
-
- enterprise_include_once('include/functions_metaconsole.php');
-
- $server = enterprise_hook('metaconsole_get_connection', [$server_name]);
-
- // Bad data
- if (empty($server)) {
- echo '';
- return;
- }
-
- // Deserialization of auth_token
- $auth_serialized = json_decode($server['auth_token'], true);
-
- $auth_token = '';
-
- if (is_array($auth_serialized)) {
- $auth_token = $auth_serialized['auth_token'];
- $api_password = $auth_serialized['api_password'];
- $console_user = $auth_serialized['console_user'];
- $console_password = $auth_serialized['console_password'];
- }
-
- $url_hash = metaconsole_get_servers_url_hash($server);
-
- echo $url_hash;
- return;
-}
-
if ($get_metaconsole_server_url) {
$server_name = get_parameter('server_name');
diff --git a/pandora_console/include/ajax/token.php b/pandora_console/include/ajax/token.php
index 37914cb417..6d2dd30d6f 100644
--- a/pandora_console/include/ajax/token.php
+++ b/pandora_console/include/ajax/token.php
@@ -26,11 +26,14 @@
* ============================================================================
*/
+global $config;
+require_once $config['homedir'].'/include/class/JWTRepository.class.php';
+
$list_user_tokens = (bool) get_parameter('list_user_tokens');
+$get_jwt_for_login = (bool) get_parameter('get_jwt_for_login', false);
+// Tokens for api 2.0.
if ($list_user_tokens === true) {
- global $config;
-
// Datatables offset, limit and order.
$filter = get_parameter('filter', []);
$page = (int) get_parameter('start', 0);
@@ -162,3 +165,20 @@ if ($list_user_tokens === true) {
return;
}
+
+
+// Token for JWT auth in metaconsole.
+if ($get_jwt_for_login === true) {
+ if (is_metaconsole() === true
+ && ((bool) users_is_admin($config['id_user']) === true || (bool) can_user_access_node() === true)
+ && empty($config['JWT_signature']) === false
+ ) {
+ $jwtRepository = new JWTRepository($config['JWT_signature']);
+ $token = $jwtRepository->create();
+ echo json_encode(['success' => true, 'data' => $token]);
+ } else {
+ echo json_encode(['success' => false, 'error' => 'User does not have permission or is not a metaconsole.']);
+ }
+
+ return;
+}
diff --git a/pandora_console/include/class/JWTRepository.class.php b/pandora_console/include/class/JWTRepository.class.php
new file mode 100644
index 0000000000..f5e9811b62
--- /dev/null
+++ b/pandora_console/include/class/JWTRepository.class.php
@@ -0,0 +1,225 @@
+signature = $_signature;
+ }
+
+
+ /**
+ * Checks if target method is available to be called using AJAX.
+ *
+ * @param string $method Target method.
+ *
+ * @return boolean True allowed, false not.
+ */
+ public function ajaxMethod($method)
+ {
+ // Check access.
+ check_login();
+
+ return in_array($method, $this->AJAXMethods);
+ }
+
+
+ /**
+ * Create token
+ *
+ * @return string
+ */
+ public function create(): string
+ {
+ global $config;
+ try {
+ $sha = new Sha256();
+ $configJWT = Configuration::forSymmetricSigner(
+ $sha,
+ InMemory::plainText($this->signature)
+ );
+
+ $now = new DateTimeImmutable();
+ $token = $configJWT->builder()->issuedAt($now)->canOnlyBeUsedAfter($now)->expiresAt($now->modify('+1 minute'))->withClaim('id_user', $config['id_user'])->getToken($configJWT->signer(), $configJWT->signingKey());
+
+ return $token->toString();
+ } catch (Exception $e) {
+ return '';
+ }
+ }
+
+
+ /**
+ * Validate a JWT, USE FIRST setToken().
+ *
+ * @return boolean
+ */
+ public function validate():bool
+ {
+ try {
+ $sha = new Sha256();
+ $configJWT = Configuration::forSymmetricSigner(
+ $sha,
+ InMemory::plainText($this->signature)
+ );
+ $signed = new SignedWith($sha, InMemory::plainText($this->signature));
+ $now = new DateTimeZone('UTC');
+ $strictValid = new StrictValidAt(SystemClock::fromUTC());
+ $constraints = [
+ $signed,
+ $strictValid,
+ ];
+ return $configJWT->validator()->validate($this->token, ...$constraints);
+ } catch (Exception $e) {
+ return false;
+ }
+ }
+
+
+ /**
+ * Get payload of token.
+ *
+ * @return object
+ */
+ public function payload():object
+ {
+ return $this->token->claims();
+ }
+
+
+ /**
+ * Setting token.
+ *
+ * @param string $tokenString String token to setting.
+ *
+ * @return boolean
+ */
+ public function setToken(string $tokenString):bool
+ {
+ try {
+ $encoder = new JoseEncoder();
+ $parser = new Parser($encoder);
+ $this->token = $parser->parse($tokenString);
+ return true;
+ } catch (Exception $e) {
+ return false;
+ }
+ }
+
+
+ /**
+ * Generate random signature.
+ *
+ * @return string
+ */
+ public static function generateSignature(): string
+ {
+ return bin2hex(random_bytes(32));
+ }
+
+
+ /**
+ * Sync the signature with nodes for jwt.
+ *
+ * @param string|null $signature Signature to send nodes.
+ *
+ * @return void
+ */
+ public static function syncSignatureWithNodes(?string $signature):void
+ {
+ if (function_exists('metaconsole_get_servers') === true
+ && function_exists('metaconsole_push_conf_to_node') === true
+ ) {
+ $sync_server = 0;
+ $servers = metaconsole_get_servers();
+ foreach ($servers as $server) {
+ $ok_sync = metaconsole_push_conf_to_node(
+ $server,
+ [ 'JWT_signature' => $signature],
+ true
+ );
+
+ if ($ok_sync === true) {
+ $sync_server++;
+ }
+ }
+
+ if (is_array($servers) === true
+ && count($servers) === $sync_server
+ && count($servers) > 0
+ ) {
+ config_update_value('JWT_signature', $signature, true);
+ }
+ }
+ }
+
+
+}
diff --git a/pandora_console/include/class/SnmpConsole.class.php b/pandora_console/include/class/SnmpConsole.class.php
index f564b6599d..fefce2e54f 100644
--- a/pandora_console/include/class/SnmpConsole.class.php
+++ b/pandora_console/include/class/SnmpConsole.class.php
@@ -521,7 +521,7 @@ class SnmpConsole extends HTML
$legend .= ' ';
$legend .= html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']).' - '.__('Delete');
$legend .= ' ';
- $legend .= ' | ';
+ $legend .= '