tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

2014-03-30 Junichi Satoh <junichi@rworks.jp>

Browse Source 
* include/functions_config.php, include/auth/mysql.php,
	godmode/setup/setup_auth.php: Added the feature to fallback to local
	authentication when remote authentication is failed.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9677 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2014-03-30 11:30:46 +00:00
parent 6c7a54afdd
commit d810617bdd
4 changed files with 199 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2014-03-30 Junichi Satoh <junichi@rworks.jp>
* include/functions_config.php, include/auth/mysql.php,
godmode/setup/setup_auth.php: Added the feature to fallback to local
authentication when remote authentication is failed.
2014-03-28 Miguel de Dios <miguel.dedios@artica.es> 2014-03-28 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php: set the zeroes values in the boolean * include/functions_graph.php: set the zeroes values in the boolean

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

@ -41,49 +41,57 @@ if (enterprise_installed()) {
} }
$table->data[0][1] = html_print_select ($auth_methods, 'auth', $config['auth'], 'show_selected_rows ();', '', 0, true); $table->data[0][1] = html_print_select ($auth_methods, 'auth', $config['auth'], 'show_selected_rows ();', '', 0, true);
$table->data[1][0] = __('Autocreate remote users'); $table->data[1][0] = __('Fallback to local authentication') . ui_print_help_tip(__("Enable this option if you want to fallback to local authentication when remote (ldap etc...) authentication failed."), true);
$table->data[1][1] = __('Yes').'&nbsp;'.html_print_radio_button_extended ('autocreate_remote_users', 1, '', $config['autocreate_remote_users'], false, 'enable_profile_options ();', '', true).'&nbsp;&nbsp;'; $table->data[1][1] = __('Yes').'&nbsp;'.html_print_radio_button ('fallback_local_auth', 1, '', $config['fallback_local_auth'], true).'&nbsp;&nbsp;';
$table->data[1][1] .= __('No').'&nbsp;'.html_print_radio_button_extended ('autocreate_remote_users', 0, '', $config['autocreate_remote_users'], false, 'enable_profile_options ();', '', true); $table->data[1][1] .= __('No').'&nbsp;'.html_print_radio_button ('fallback_local_auth', 0, '', $config['fallback_local_auth'], true);
$table->data[2][0] = __('Autocreate remote users');
$table->data[2][1] = __('Yes').'&nbsp;'.html_print_radio_button_extended ('autocreate_remote_users', 1, '', $config['autocreate_remote_users'], false, 'enable_profile_options ();', '', true).'&nbsp;&nbsp;';
$table->data[2][1] .= __('No').'&nbsp;'.html_print_radio_button_extended ('autocreate_remote_users', 0, '', $config['autocreate_remote_users'], false, 'enable_profile_options ();', '', true);
$table->rowstyle[1] = $config['auth'] != 'mysql' ? '' : 'display: none;'; $table->rowstyle[1] = $config['auth'] != 'mysql' ? '' : 'display: none;';
$table->data[2][0] = __('Autocreate profile'); $table->data[3][0] = __('Autocreate profile');
$profile_list = profile_get_profiles (); $profile_list = profile_get_profiles ();
if ($profile_list === false) { if ($profile_list === false) {
$profile_list = array (); $profile_list = array ();
} }
$table->data[2][1] = html_print_select ($profile_list, 'default_remote_profile', $config['default_remote_profile'], '', '', '', true, false, true, '', $config['autocreate_remote_users'] == 0); $table->data[3][1] = html_print_select ($profile_list, 'default_remote_profile', $config['default_remote_profile'], '', '', '', true, false, true, '', $config['autocreate_remote_users'] == 0);
$table->data[3][0] = __('Autocreate profile group'); $table->data[4][0] = __('Autocreate profile group');
$table->data[3][1] = html_print_select_groups ($config['id_user'], "AR", true, 'default_remote_group', $config['default_remote_group'], '', '', '', true, false, true, '', $config['autocreate_remote_users'] == 0); $table->data[4][1] = html_print_select_groups ($config['id_user'], "AR", true, 'default_remote_group', $config['default_remote_group'], '', '', '', true, false, true, '', $config['autocreate_remote_users'] == 0);
$table->data[4][0] = __('Autocreate blacklist') . ui_print_help_icon ('autocreate_blacklist', true); $table->data[5][0] = __('Autocreate blacklist') . ui_print_help_icon ('autocreate_blacklist', true);
$table->data[4][1] = html_print_input_text ('autocreate_blacklist', $config['autocreate_blacklist'], '', 60, 100, true); $table->data[5][1] = html_print_input_text ('autocreate_blacklist', $config['autocreate_blacklist'], '', 60, 100, true);
for ($i = 1; $i <= 4; $i++) { for ($i = 1; $i <= 4; $i++) {
$table->rowstyle[$i] = $config['auth'] != 'mysql' ? '' : 'display: none;'; $table->rowstyle[$i] = $config['auth'] != 'mysql' ? '' : 'display: none;';
$table->rowclass[$i] = 'remote'; $table->rowclass[$i] = 'remote';
} }
$table->data[5][0] = __('LDAP server'); $table->data[6][0] = __('LDAP server');
$table->data[5][1] = html_print_input_text ('ldap_server', $config['ldap_server'], '', 30, 100, true); $table->data[6][1] = html_print_input_text ('ldap_server', $config['ldap_server'], '', 30, 100, true);
$table->data[6][0] = __('LDAP port'); $table->data[7][0] = __('LDAP port');
$table->data[6][1] = html_print_input_text ('ldap_port', $config['ldap_port'], '', 10, 100, true); $table->data[7][1] = html_print_input_text ('ldap_port', $config['ldap_port'], '', 10, 100, true);
$table->data[7][0] = __('LDAP version'); $table->data[8][0] = __('LDAP version');
$ldap_versions = array (1 => 'LDAPv1', 2 => 'LDAPv2', 3 => 'LDAPv3'); $ldap_versions = array (1 => 'LDAPv1', 2 => 'LDAPv2', 3 => 'LDAPv3');
$table->data[7][1] = html_print_select ($ldap_versions, 'ldap_version', $config['ldap_version'], '', '', 0, true); $table->data[8][1] = html_print_select ($ldap_versions, 'ldap_version', $config['ldap_version'], '', '', 0, true);
$table->data[8][0] = __('Start TLS'); $table->data[9][0] = __('Start TLS');
$table->data[8][1] = __('Yes').'&nbsp;'.html_print_radio_button ('ldap_start_tls', 1, '', $config['ldap_start_tls'], true).'&nbsp;&nbsp;'; $table->data[9][1] = __('Yes').'&nbsp;'.html_print_radio_button ('ldap_start_tls', 1, '', $config['ldap_start_tls'], true).'&nbsp;&nbsp;';
$table->data[8][1] .= __('No').'&nbsp;'.html_print_radio_button ('ldap_start_tls', 0, '', $config['ldap_start_tls'], true); $table->data[9][1] .= __('No').'&nbsp;'.html_print_radio_button ('ldap_start_tls', 0, '', $config['ldap_start_tls'], true);
$table->data[9][0] = __('Base DN'); $table->data[10][0] = __('Base DN');
$table->data[9][1] = html_print_input_text ('ldap_base_dn', $config['ldap_base_dn'], '', 60, 100, true); $table->data[10][1] = html_print_input_text ('ldap_base_dn', $config['ldap_base_dn'], '', 60, 100, true);
$table->data[10][0] = __('Login attribute'); $table->data[11][0] = __('Login attribute');
$table->data[10][1] = html_print_input_text ('ldap_login_attr', $config['ldap_login_attr'], '', 60, 100, true); $table->data[11][1] = html_print_input_text ('ldap_login_attr', $config['ldap_login_attr'], '', 60, 100, true);
// Hide LDAP configuration options // Hide LDAP configuration options
for ($i = 5; $i <= 10; $i++) { for ($i = 2; $i <= 11; $i++) {
$table->rowstyle[$i] = $config['auth'] == 'ldap' ? '' : 'display: none;'; $table->rowstyle[$i] = $config['auth'] == 'ldap' ? '' : 'display: none;';
$table->rowclass[$i] = 'ldap'; $table->rowclass[$i] = 'ldap';
} }
// Hide fallback option when local authentication is selected.
$table->rowstyle[1] = $config['auth'] == 'mysql' ? 'display: none;' : '';
$table->rowclass[1] = 'remote';
// Add enterprise authentication options // Add enterprise authentication options
if (enterprise_installed()) { if (enterprise_installed()) {
add_enterprise_auth_options($table, 11); add_enterprise_auth_options($table, 12);
} }
echo '<form id="form_setup" method="post">'; echo '<form id="form_setup" method="post">';

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

@ -80,6 +80,24 @@ function process_user_login ($login, $pass, $api = false) {
// Always authenticate admins against the local database // Always authenticate admins against the local database
if (strtolower ($config["auth"]) == 'mysql' || is_user_admin ($login)) { if (strtolower ($config["auth"]) == 'mysql' || is_user_admin ($login)) {
return process_user_login_local ($login, $pass, $api);
}
else {
$login_remote = process_user_login_remote ($login, $pass, $api);
if ($login_remote == false && $config['fallback_local_auth'] == '1') {
return process_user_login_local ($login, $pass, $api);
}
else {
return $login_remote;
}
}
return false;
}
function process_user_login_local ($login, $pass, $api = false) {
global $config, $mysql_cache;
// Connect to Database // Connect to Database
switch ($config["dbtype"]) { switch ($config["dbtype"]) {
case "mysql": case "mysql":
@ -150,8 +168,11 @@ function process_user_login ($login, $pass, $api = false) {
} }
return false; return false;
} }
else {
function process_user_login_remote ($login, $pass, $api = false) {
global $config, $mysql_cache;
// Remote authentication // Remote authentication
switch ($config["auth"]) { switch ($config["auth"]) {
// LDAP // LDAP
@ -224,9 +245,6 @@ function process_user_login ($login, $pass, $api = false) {
profile_create_user_profile ($login, $config['default_remote_profile'], $config['default_remote_group']); profile_create_user_profile ($login, $config['default_remote_profile'], $config['default_remote_group']);
return $login; return $login;
}
return false;
} }
/** /**

6
pandora_console/include/functions_config.php
View File

@ -280,6 +280,8 @@ function config_update_config () {
$error_update[] = __('Base DN'); $error_update[] = __('Base DN');
if (!config_update_value ('ldap_login_attr', get_parameter ('ldap_login_attr'))) if (!config_update_value ('ldap_login_attr', get_parameter ('ldap_login_attr')))
$error_update[] = __('Login attribute'); $error_update[] = __('Login attribute');
if (!config_update_value ('fallback_local_auth', get_parameter ('fallback_local_auth')))
$error_update[] = __('Fallback to local authentication');
if (!config_update_value ('rpandora_server', get_parameter ('rpandora_server'))) if (!config_update_value ('rpandora_server', get_parameter ('rpandora_server')))
$error_update[] = __('Pandora FMS host'); $error_update[] = __('Pandora FMS host');
@ -884,6 +886,10 @@ function config_process_config () {
config_update_value ( 'ldap_login_attr', 'uid'); config_update_value ( 'ldap_login_attr', 'uid');
} }
if (!isset ($config['fallback_local_auth'])) {
config_update_value ( 'fallback_local_auth', '0');
}
if (!isset ($config['ad_server'])) { if (!isset ($config['ad_server'])) {
config_update_value ( 'ad_server', 'localhost'); config_update_value ( 'ad_server', 'localhost');
} }