deon/phpldapadmin
1
0
Fork 0
Code Issues 36 Pull Requests Packages Projects Releases Wiki Activity

SF Feature #3509651 - Add support for SHA512 with OpenLDAP

Browse Source
This commit is contained in:
Jean-Philippe Ghibaudo 2012-09-01 11:31:38 +10:00 committed by Deon George
parent 3690ad16f0
commit 21959715c3
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/functions.php
View File

@ -1471,10 +1471,10 @@ function get_next_number($base,$attr,$increment=false,$filter=false,$startmin=nu
for ($i=0;$i<count($autonum);$i++) { for ($i=0;$i<count($autonum);$i++) {
$num = $autonum[$i] < $minNumber ? $minNumber : $autonum[$i]; $num = $autonum[$i] < $minNumber ? $minNumber : $autonum[$i];
/* If we're at the end of the list, or we've found a gap between this number and the /* If we're at the end of the list, or we've found a gap between this number and the
following, use the next available number in the gap. */ following, use the next available number in the gap. */
if ($i+1 == count($autonum) || $autonum[$i+1] > $num+1) if ($i+1 == count($autonum) || $autonum[$i+1] > $num+1)
return $autonum[$i] >= $num ? $num+1 : $num; return $autonum[$i] >= $num ? $num+1 : $num;
} }
# If we didnt find a suitable gap and are all above the minNumber, we'll just return the $minNumber # If we didnt find a suitable gap and are all above the minNumber, we'll just return the $minNumber
@ -2114,7 +2114,8 @@ function password_types() {
'md5crypt'=>'md5crypt', 'md5crypt'=>'md5crypt',
'sha'=>'sha', 'sha'=>'sha',
'smd5'=>'smd5', 'smd5'=>'smd5',
'ssha'=>'ssha' 'ssha'=>'ssha',
'sha512'=>'sha512',
); );
} }
@ -2123,7 +2124,7 @@ function password_types() {
* *
* @param string The password to hash in clear text. * @param string The password to hash in clear text.
* @param string Standard LDAP encryption type which must be one of * @param string Standard LDAP encryption type which must be one of
* crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, or clear. * crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, sha512, or clear.
* @return string The hashed password. * @return string The hashed password.
*/ */
function password_hash($password_clear,$enc_type) { function password_hash($password_clear,$enc_type) {
@ -2216,6 +2217,16 @@ function password_hash($password_clear,$enc_type) {
break; break;
case 'sha512':
if (function_exists('openssl_digest') && function_exists('base64_encode')) {
$new_value = sprintf('{SHA512}%s', base64_encode(openssl_digest($password_clear, 'sha512', true)));
} else {
error(_('Your PHP install doest not have the openssl_digest() or base64_encode() function. Cannot do SHA512 hashes. '),'error','index.php');
}
break;
case 'clear': case 'clear':
default: default:
$new_value = $password_clear; $new_value = $password_clear;
@ -2379,6 +2390,15 @@ function password_check($cryptedpassword,$plainpassword,$attribute='userpassword
break; break;
# SHA512 crypted passwords
case 'sha512':
if (strcasecmp(password_hash($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0)
return true;
else
return false;
break;
# No crypt is given assume plaintext passwords are used # No crypt is given assume plaintext passwords are used
default: default:
if ($plainpassword == $cryptedpassword) if ($plainpassword == $cryptedpassword)
@ -2782,7 +2802,7 @@ function draw_formatted_dn($server,$entry) {
$formats = $_SESSION[APPCONFIG]->getValue('appearance','tree_display_format'); $formats = $_SESSION[APPCONFIG]->getValue('appearance','tree_display_format');
foreach ($formats as $format) { foreach ($formats as $format) {
$has_none = false; $has_none = false;
preg_match_all('/%[a-zA-Z_0-9]+/',$format,$tokens); preg_match_all('/%[a-zA-Z_0-9]+/',$format,$tokens);
$tokens = $tokens[0]; $tokens = $tokens[0];