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-11163-cambiar-la-forma-en-la-que-se-generan-las-graficas-para-la-macro-de-envio-por-correo' into 'develop' 

Ent-11163-cambiar-la-forma-en-la-que-se-generan-las-graficas-para-la-macro-de-envio-por-correo

Closes pandora_enterprise#11163

See merge request artica/pandorafms!6234
This commit is contained in:
Rafael Ameijeiras 2023-07-14 09:20:11 +00:00
parent 92ea46b70e 356a3cc9c3
commit bff3fcd762
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/include/api.php
View File

@ -118,7 +118,7 @@ if ($info === 'version') {
if (empty($apiPassword) === true
|| (empty($apiPassword) === false && $api_password === $apiPassword)
|| $apiTokenValid === true
) {
) {
if (enterprise_hook('metaconsole_validate_origin', [get_parameter('server_auth')]) === true
|| enterprise_hook('console_validate_origin', [get_parameter('server_auth')]) === true
) {
@ -129,7 +129,16 @@ if (empty($apiPassword) === true
// Compat.
$config['id_user'] = 'admin';
$correctLogin = true;
} else if ((bool) isInACL($ipOrigin) === true) {
// Bypass credentials if server-auth and api-pass are correct.
} else if (($config['server_unique_identifier'] === get_parameter('server_auth'))
&& ($api_password === $apiPassword)
&& ((bool) isInACL($ipOrigin) === true)) {
$config['id_usuario'] = 'admin';
$config['id_user'] = 'admin';
$correctLogin = true;
} else if ((bool) isInACL($ipOrigin) === true) {
// External access.
// Token is valid. Bypass the credentials.
if ($apiTokenValid === true) {

9
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -1561,8 +1561,7 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
my $params = {};
$params->{"apipass"} = $pa_config->{"console_api_pass"};
$params->{"user"} ||= $pa_config->{"console_user"};
$params->{"pass"} ||= $pa_config->{"console_pass"};
$params->{"server_auth"} = $pa_config->{"server_unique_identifier"};
$params->{"op"} = "get";
$params->{"op2"} = "module_graph";
$params->{"id"} = $module->{'id_agente_modulo'};
@ -1707,8 +1706,7 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
my $params = {};
$params->{"apipass"} = $pa_config->{"console_api_pass"};
$params->{"user"} ||= $pa_config->{"console_user"};
$params->{"pass"} ||= $pa_config->{"console_pass"};
$params->{"server_auth"} = $pa_config->{"server_unique_identifier"};
$params->{"op"} = "set";
$params->{"op2"} = "send_report";
$params->{"other_mode"} = "url_encode_separator_|;|";
@ -1739,8 +1737,7 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
my $params = {};
$params->{"apipass"} = $pa_config->{"console_api_pass"};
$params->{"user"} ||= $pa_config->{"console_user"};
$params->{"pass"} ||= $pa_config->{"console_pass"};
$params->{"server_auth"} = $pa_config->{"server_unique_identifier"};
$params->{"op"} = "set";
$params->{"op2"} = "send_report";
$params->{"other_mode"} = "url_encode_separator_|;|";