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-7951-Bloqueo-auto-creacion-usuarios-desde-nodo-en-entornos-centralizado' into 'develop' 

Ent 7951 bloqueo auto creacion usuarios desde nodo en entornos centralizado

See merge request artica/pandorafms!4487
This commit is contained in:
Daniel Rodriguez 2021-11-03 09:34:49 +00:00
parent 0be9abcdca b4c21cfdca
commit 56ae68a034
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/users/configure_user.php
View File

@ -1321,6 +1321,8 @@ if (isset($double_authentication)) {
if ($meta) {
enterprise_include_once('include/functions_metaconsole.php');
$access_node = db_get_value('metaconsole_access_node', 'tusuario', 'id_user', $id);
$metaconsole_agents_manager = '<div class="label_select_simple" id="metaconsole_agents_manager_div"><p class="edit_user_labels">'.__('Enable agents managment').'</p>';
$metaconsole_agents_manager .= html_print_checkbox_switch(
'metaconsole_agents_manager',
@ -1342,7 +1344,7 @@ if ($meta) {
$metaconsole_access_node .= html_print_checkbox(
'metaconsole_access_node',
1,
$user_info['metaconsole_access_node'],
$access_node,
true
).'</div>';
}

22
pandora_console/include/auth/mysql.php
View File

@ -349,18 +349,24 @@ function process_user_login_remote($login, $pass, $api=false)
return false;
}
$user_info = [
'fullname' => $login,
'comments' => 'Imported from '.$config['auth'],
];
if (is_metaconsole() === true) {
$user_info['metaconsole_access_node'] = $config['ad_adv_user_node'];
}
// Create the user.
if (enterprise_hook(
'prepare_permissions_groups_of_user_ad',
[
$login,
$pass,
[
'fullname' => $login,
'comments' => 'Imported from '.$config['auth'],
],
$user_info,
false,
defined('METACONSOLE'),
defined('METACONSOLE') && is_centralized() === false,
]
) === false
) {
@ -373,6 +379,10 @@ function process_user_login_remote($login, $pass, $api=false)
return false;
}
if (is_metaconsole() === true) {
$user_info['metaconsole_access_node'] = $config['ldap_adv_user_node'];
}
$permissions = fill_permissions_ldap($sr);
if (empty($permissions) === true) {
$config['auth_error'] = __('User not found in database or incorrect password');
@ -387,7 +397,7 @@ function process_user_login_remote($login, $pass, $api=false)
$pass,
$user_info,
$permissions,
is_metaconsole()
is_metaconsole() && is_centralized() === false
);
}
} else {

10
pandora_console/include/functions.php
View File

@ -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();
}

2
pandora_console/operation/users/user_edit.php
View File

@ -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';