From e7d730ba0d82ee1094a762b5ea6ebf6a554d8f5e Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Tue, 19 Oct 2021 19:19:55 +0200
Subject: [PATCH] fix bug with ldap login in metaconsole
---
pandora_console/include/auth/mysql.php | 2 +-
pandora_console/include/functions.php | 10 +++++-----
pandora_console/operation/users/user_edit.php | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php
index 4e8f7caa61..bc3bf9916e 100644
--- a/pandora_console/include/auth/mysql.php
+++ b/pandora_console/include/auth/mysql.php
@@ -387,7 +387,7 @@ function process_user_login_remote($login, $pass, $api=false)
$pass,
$user_info,
$permissions,
- is_metaconsole()
+ is_metaconsole() && is_centralized() === false
);
}
} else {
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index fe79e1420f..934ca95f8e 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -1732,9 +1732,9 @@ function is_management_allowed($hkey='')
$nodes = (int) $nodes;
}
- return ( (is_metaconsole() && (is_centrallised() || $nodes === 0))
- || (!is_metaconsole() && !is_centrallised())
- || (!is_metaconsole() && is_centrallised()) && $hkey == generate_hash_to_api());
+ return ( (is_metaconsole() && (is_centralized() || $nodes === 0))
+ || (!is_metaconsole() && !is_centralized())
+ || (!is_metaconsole() && is_centralized()) && $hkey == generate_hash_to_api());
}
@@ -1743,7 +1743,7 @@ function is_management_allowed($hkey='')
*
* @return boolean
*/
-function is_centrallised()
+function is_centralized()
{
global $config;
@@ -1763,7 +1763,7 @@ function is_centrallised()
*/
function is_central_policies()
{
- return is_metaconsole() && is_centrallised();
+ return is_metaconsole() && is_centralized();
}
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index c18c8a103e..af2bee4325 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -452,7 +452,7 @@ if (check_acl($config['id_user'], 0, 'ER')) {
$autorefresh_list_out = [];
-if (is_metaconsole() === false || is_centrallised() === true) {
+if (is_metaconsole() === false || is_centralized() === true) {
$autorefresh_list_out['operation/agentes/estado_agente'] = 'Agent detail';
$autorefresh_list_out['operation/agentes/alerts_status'] = 'Alert detail';
$autorefresh_list_out['enterprise/operation/cluster/cluster'] = 'Cluster view';