spacefreak/user_sql
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #22 from Nullcaller/master

Browse Source 
Add options for Courier authlib authentication
This commit is contained in:
Marcin Łojewski
2018-02-11 18:33:32 +01:00
committed by GitHub
parent 6a9349c02a f194c35503
commit e17f521a04
2 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/user_sql.php
View File

@@ -353,6 +353,22 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend,
elseif($this -> settings['set_crypt_type'] === 'password_hash') elseif($this -> settings['set_crypt_type'] === 'password_hash')
{ {
$enc_password = $this->pw_hash($password); $enc_password = $this->pw_hash($password);
}
elseif($this -> settings['set_crypt_type'] === 'courier_md5')
{
$enc_password = '{MD5}'.OC_USER_SQL::hex_to_base64(md5($password));
}
elseif($this -> settings['set_crypt_type'] === 'courier_md5raw')
{
$enc_password = '{MD5RAW}'.md5($password);
}
elseif($this -> settings['set_crypt_type'] === 'courier_sha1')
{
$enc_password = '{SHA}'.OC_USER_SQL::hex_to_base64(sha1($password));
}
elseif($this -> settings['set_crypt_type'] === 'courier_sha256')
{
$enc_password = '{SHA256}'.OC_USER_SQL::hex_to_base64(hash('sha256', $password, false));
} }
else else
{ {
@@ -426,6 +442,22 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend,
elseif($this -> settings['set_crypt_type'] == 'sha1') elseif($this -> settings['set_crypt_type'] == 'sha1')
{ {
$ret = $this->hash_equals(sha1($password) , $db_pass); $ret = $this->hash_equals(sha1($password) , $db_pass);
}
elseif($this -> settings['set_crypt_type'] === 'courier_md5')
{
$ret = '{MD5}'.OC_USER_SQL::hex_to_base64(md5($password)) === $db_pass;
}
elseif($this -> settings['set_crypt_type'] === 'courier_md5raw')
{
$ret = '{MD5RAW}'.md5($password) === $db_pass;
}
elseif($this -> settings['set_crypt_type'] === 'courier_sha1')
{
$ret = '{SHA}'.OC_USER_SQL::hex_to_base64(sha1($password)) === $db_pass;
}
elseif($this -> settings['set_crypt_type'] === 'courier_sha256')
{
$ret = '{SHA256}'.OC_USER_SQL::hex_to_base64(hash('sha256', $password, false)) === $db_pass;
} else } else
{ {
@@ -974,7 +1006,16 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend,
} }
return $result === 0; return $result === 0;
} }
private static function hex_to_base64($hex)
{
$hex_chr = '';
foreach(str_split($hex, 2) as $hexpair)
{
$hex_chr .= chr(hexdec($hexpair));
}
return base64_encode($hex_chr);
}
} }

2
templates/admin.php
View File

@@ -70,7 +70,7 @@ $cfgClass = 'section';
<p><label for="col_displayname"><?php p($l -> t('Real Name Column')); ?></label><input type="text" id="col_displayname" name="col_displayname" value="<?php p($_['col_displayname']); ?>" /></p> <p><label for="col_displayname"><?php p($l -> t('Real Name Column')); ?></label><input type="text" id="col_displayname" name="col_displayname" value="<?php p($_['col_displayname']); ?>" /></p>
<p><label for="set_crypt_type"><?php p($l -> t('Encryption Type')); ?></label> <p><label for="set_crypt_type"><?php p($l -> t('Encryption Type')); ?></label>
<?php $crypt_types = array('md5' => 'MD5', 'md5crypt' => 'MD5 Crypt', 'cleartext' => 'Cleartext', 'mysql_encrypt' => 'mySQL ENCRYPT()', 'system' => 'System (crypt)', 'password_hash' => 'password_hash','mysql_password' => 'mySQL PASSWORD()', 'joomla' => 'Joomla MD5 Encryption', 'joomla2' => 'Joomla > 2.5.18 phpass', 'ssha256' => 'Salted SSHA256', 'redmine' => 'Redmine', 'sha1' => 'SHA1'); ?> <?php $crypt_types = array('md5' => 'MD5', 'md5crypt' => 'MD5 Crypt', 'cleartext' => 'Cleartext', 'mysql_encrypt' => 'mySQL ENCRYPT()', 'system' => 'System (crypt)', 'password_hash' => 'password_hash','mysql_password' => 'mySQL PASSWORD()', 'joomla' => 'Joomla MD5 Encryption', 'joomla2' => 'Joomla > 2.5.18 phpass', 'ssha256' => 'Salted SSHA256', 'redmine' => 'Redmine', 'sha1' => 'SHA1', 'courier_md5' => 'Courier base64-encoded MD5', 'courier_md5raw' => 'Courier hexadecimal MD5', 'courier_sha1' => 'Courier base64-encoded SHA1', 'courier_sha256' => 'Courier base64-encoded SHA256'); ?>
<select id="set_crypt_type" name="set_crypt_type"> <select id="set_crypt_type" name="set_crypt_type">
<?php <?php
foreach ($crypt_types as $driver => $name): foreach ($crypt_types as $driver => $name):