tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add select profile, group and tags when autocreate user in few options. And add metaconsole replication users in node

This commit is contained in:
m-lopez-f 2017-01-17 15:09:23 +01:00
parent d16aa71c53
commit 24c0c8c12b
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/setup/setup_auth.php
View File

@ -58,6 +58,10 @@ if (is_ajax ()) {
$row['control'] = __('Yes').' '.html_print_radio_button_extended('autocreate_remote_users', 1, '', $config['autocreate_remote_users'], false, '', '', true).'  '; $row['control'] = __('Yes').' '.html_print_radio_button_extended('autocreate_remote_users', 1, '', $config['autocreate_remote_users'], false, '', '', true).'  ';
$row['control'] .= __('No').' '.html_print_radio_button_extended('autocreate_remote_users', 0, '', $config['autocreate_remote_users'], false, '', '', true); $row['control'] .= __('No').' '.html_print_radio_button_extended('autocreate_remote_users', 0, '', $config['autocreate_remote_users'], false, '', '', true);
$table->data['autocreate_remote_users'] = $row; $table->data['autocreate_remote_users'] = $row;
if (enterprise_installed()) {
add_enterprise_auth_autocreate_profiles($table, $type_auth);
}
} }
switch ($type_auth) { switch ($type_auth) {

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

@ -268,7 +268,7 @@ function process_user_login_remote ($login, $pass, $api = false) {
return false; return false;
} }
if (isset($config['ad_advanced_config']) && $config['ad_advanced_config']) { if ($config["auth"] === 'ad' && (isset($config['ad_advanced_config']) && $config['ad_advanced_config'])) {
if ( defined('METACONSOLE') ) { if ( defined('METACONSOLE') ) {
@ -313,10 +313,40 @@ function process_user_login_remote ($login, $pass, $api = false) {
return false; return false;
} }
//TODO: Check the creation in the nodes
profile_create_user_profile ($login, $config['default_remote_profile'], profile_create_user_profile ($login, $config['default_remote_profile'],
$config['default_remote_group'], false, $config['default_assign_tags']); $config['default_remote_group'], false, $config['default_assign_tags']);
//TODO: Check the creation in the nodes
if ( is_metaconsole() ) {
enterprise_include_once('include/functions_metaconsole.php');
enterprise_include_once ('meta/include/functions_groups_meta.php');
$return = groups_meta_synchronizing();
if ($return["group_create_err"] > 0 || $return["group_update_err"] > 0) {
$config["auth_error"] = __('Fail the group synchronizing');
return false;
}
$return = meta_tags_synchronizing();
if ($return['tag_create_err'] > 0 || $return['tag_update_err'] > 0) {
$config["auth_error"] = __('Fail the tag synchronizing');
return false;
}
$servers = metaconsole_get_servers();
foreach ($servers as $server) {
if (metaconsole_connect($server) == NOERR ) {
if (create_user ($login, $pass,
array ('fullname' => $login,
'comments' => 'Imported from ' . $config['auth'])
) === false)
continue;
profile_create_user_profile ($login, $config['default_remote_profile'],
$config['default_remote_group'], false, $config['default_assign_tags']);
}
metaconsole_restore_db();
}
}
} }
return $login; return $login;