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-7853-errores-con-autenticacion-ldaps' into 'develop' 

Fix ldaps authentication

See merge request artica/pandorafms!4330
This commit is contained in:
Daniel Rodriguez 2021-08-04 07:12:58 +00:00
parent c4e1243f18 8c30ca8c36
commit 6bdc89bb26
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,7 +319,7 @@ function process_user_login_remote($login, $pass, $api=false)
defined('METACONSOLE') defined('METACONSOLE')
); );
if ($return === 'error_permissions') { if ($result === 'error_permissions') {
$config['auth_error'] = __('Problems with configuration permissions. Please contact with Administrator'); $config['auth_error'] = __('Problems with configuration permissions. Please contact with Administrator');
return false; return false;
} }
@ -735,7 +735,14 @@ function ldap_process_user_login($login, $password)
} }
// Connect to the LDAP server // Connect to the LDAP server
$ds = @ldap_connect($config['ldap_server'], $config['ldap_port']); if (stripos($config['ldap_server'], 'ldap://') !== false
|| stripos($config['ldap_server'], 'ldaps://') !== false
|| stripos($config['ldap_server'], 'ldapi://') !== false
) {
$ds = @ldap_connect($config['ldap_server'].':'.$config['ldap_port']);
} else {
$ds = @ldap_connect($config['ldap_server'], $config['ldap_port']);
}
if (!$ds) { if (!$ds) {
$config['auth_error'] = 'Error connecting to LDAP server'; $config['auth_error'] = 'Error connecting to LDAP server';
@ -1393,7 +1400,7 @@ function local_ldap_search($ldap_host, $ldap_port=389, $ldap_version=3, $dn, $ac
} }
if (!empty($ldap_admin_pass)) { if (!empty($ldap_admin_pass)) {
$ldap_admin_pass = ' -w '.$ldap_admin_pass; $ldap_admin_pass = ' -w '.escapeshellarg($ldap_admin_pass);
} }
$dn = " -b '".$dn."'"; $dn = " -b '".$dn."'";