Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bug caused by inline salt of Authme

Browse Source
This commit is contained in:
printempw 2016-03-27 12:33:27 +08:00
parent a04d8acefa
commit d37f6659aa
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libraries/Database/AuthmeDatabase.class.php
View File

@ -3,7 +3,7 @@
* @Author: printempw * @Author: printempw
* @Date: 2016-03-13 11:59:32 * @Date: 2016-03-13 11:59:32
* @Last Modified by: printempw * @Last Modified by: printempw
* @Last Modified time: 2016-03-18 17:33:27 * @Last Modified time: 2016-03-27 12:32:25
*/ */
namespace Database; namespace Database;
@ -15,12 +15,29 @@ class AuthmeDatabase extends AdaptedDatabase
/** /**
* Default SHA256 encryption method for Authme * Default SHA256 encryption method for Authme
* *
* http://pastebin.com/1wy9g2HT * @see http://pastebin.com/1wy9g2HT
*/ */
public function encryptPassword($raw_passwd, $username="") { public function encryptPassword($raw_passwd, $username="") {
$hash = hash('sha256', hash('sha256', $raw_passwd).SALT); $salt = $this->getPwdInfo($username)['salt'];
$encrypt = '$SHA$'.SALT.'$'. $hash; $hash = hash('sha256', hash('sha256', $raw_passwd).$salt);
$encrypt = '$SHA$'.$salt.'$'. $hash;
return $encrypt; return $encrypt;
} }
/**
* Parse fucking inline salt
*
* @see https://github.com/Xephi/AuthMeReloaded/blob/master/samples/website_integration/sha256/integration.php
* @param string $username
* @return array
*/
private function getPwdInfo($username) {
$hashed = $this->query("SELECT * FROM ".$this->table_name."
WHERE ".$this->column_uname."='$username'")->fetch_array()['password'];
$parts = explode('$', $hashed);
$pwd_info['password'] = $parts[3];
$pwd_info['salt'] = $parts[2];
return $pwd_info;
}
} }