mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4250 from Jimmi08/master

Browse Source 
Alt Auth Support for AbanteCart password salt.
This commit is contained in:
Cameron
2020-12-02 11:12:47 -08:00
committed by GitHub
parent a81a5789e4 f4b8289647
commit 0114aa2650
1 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
e107_plugins/alt_auth/extended_password_handler.php
View File

@@ -77,6 +77,7 @@ class ExtendedPasswordHandler extends UserHandler
const PASSWORD_WORDPRESS_SALT = 8; const PASSWORD_WORDPRESS_SALT = 8;
const PASSWORD_MAGENTO_SALT = 9; const PASSWORD_MAGENTO_SALT = 9;
const PASSWORD_PHPFUSION_SALT = 10; const PASSWORD_PHPFUSION_SALT = 10;
const PASSWORD_ABANTECART_SALT = 11;
const PASSWORD_PHPBB_ID = '$H$'; // PHPBB salted const PASSWORD_PHPBB_ID = '$H$'; // PHPBB salted
const PASSWORD_ORIG_ID = '$P$'; // 'Original' code const PASSWORD_ORIG_ID = '$P$'; // 'Original' code
@@ -227,6 +228,7 @@ class ExtendedPasswordHandler extends UserHandler
'wordpress_salt' => IMPORTDB_LAN_13, 'wordpress_salt' => IMPORTDB_LAN_13,
'magento_salt' => IMPORTDB_LAN_14, 'magento_salt' => IMPORTDB_LAN_14,
'phpfusion_salt' => "PHPFusion", 'phpfusion_salt' => "PHPFusion",
'abantecart_salt' => "AbanteCart Salt",
)); ));
} }
return $vals; return $vals;
@@ -254,6 +256,7 @@ class ExtendedPasswordHandler extends UserHandler
'wordpress_salt' => self::PASSWORD_WORDPRESS_SALT, 'wordpress_salt' => self::PASSWORD_WORDPRESS_SALT,
'magento_salt' => self::PASSWORD_MAGENTO_SALT, 'magento_salt' => self::PASSWORD_MAGENTO_SALT,
'phpfusion_salt' => self::PASSWORD_PHPFUSION_SALT, 'phpfusion_salt' => self::PASSWORD_PHPFUSION_SALT,
'abantecart_salt' => self::PASSWORD_ABANTECART_SALT,
); );
if (isset($maps[$ptype])) return $maps[$ptype]; if (isset($maps[$ptype])) return $maps[$ptype];
return FALSE; return FALSE;
@@ -358,11 +361,34 @@ class ExtendedPasswordHandler extends UserHandler
$pwHash = $pword; $pwHash = $pword;
break; break;
case self::PASSWORD_ABANTECART_SALT :
$hash = $salt = '';
if ((strpos($stored_hash, ':') !== false))
{
list($hash, $salt) = explode(':', $stored_hash);
}
// Magento salted hash - should be 32-character md5 hash, ':', 2-character salt, but could be also only md5 hash
else
{
$hash = $stored_hash;
}
/*
password = SHA1(CONCAT(salt, SHA1(CONCAT(salt, SHA1('".$this->db->escape($password)."')))
*/
//$pwHash = $salt ? md5($salt.$pword) : md5($pword);
$pwHash = sha1($salt.sha1($salt.sha1($pword)));
$stored_hash = $hash;
break;
default : default :
return PASSWORD_INVALID; return PASSWORD_INVALID;
} }
if(deftrue('e_DEBUG')) if(ADMIN_AREA)
{ {
e107::getMessage()->addDebug("Stored Hash: ".$stored_hash); e107::getMessage()->addDebug("Stored Hash: ".$stored_hash);