forked from GithubBackups/vichan
auth.php: use secure salt source, use a cryptographically secure hashing algorithm for login tokens
This commit is contained in:
parent
3ea2fb4cd4
commit
d91ae6e3e5
@ -5,7 +5,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
use Vichan\Context;
|
use Vichan\Context;
|
||||||
use Vichan\Functions\Net;
|
use Vichan\Functions\{Hide, Net};
|
||||||
|
|
||||||
defined('TINYBOARD') or exit;
|
defined('TINYBOARD') or exit;
|
||||||
|
|
||||||
@ -14,27 +14,28 @@ function mkhash(string $username, ?string $password, mixed $salt = false): array
|
|||||||
global $config;
|
global $config;
|
||||||
|
|
||||||
if (!$salt) {
|
if (!$salt) {
|
||||||
// create some sort of salt for the hash
|
// Create some salt for the hash.
|
||||||
$salt = substr(base64_encode(sha1(rand() . time(), true) . $config['cookies']['salt']), 0, 15);
|
$salt = \bin2hex(\random_bytes(15)); // 20 characters.
|
||||||
|
|
||||||
$generated_salt = true;
|
$generated_salt = true;
|
||||||
|
} else {
|
||||||
|
$generated_salt = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// generate hash (method is not important as long as it's strong)
|
// generate hash (method is not important as long as it's strong)
|
||||||
$hash = substr(
|
$hash = \substr(
|
||||||
base64_encode(
|
Hide\secure_hash(
|
||||||
md5(
|
$username . $config['cookies']['salt'] . Hide\secure_hash(
|
||||||
$username . $config['cookies']['salt'] . sha1(
|
|
||||||
$username . $password . $salt . (
|
$username . $password . $salt . (
|
||||||
$config['mod']['lock_ip'] ? $_SERVER['REMOTE_ADDR'] : ''
|
$config['mod']['lock_ip'] ? $_SERVER['REMOTE_ADDR'] : ''
|
||||||
), true
|
), true
|
||||||
) . sha1($config['password_crypt_version']) // Log out users being logged in with older password encryption schema
|
) . Hide\secure_hash($config['password_crypt_version'], true), // Log out users being logged in with older password encryption schema
|
||||||
, true
|
false
|
||||||
)
|
),
|
||||||
), 0, 20
|
0,
|
||||||
|
40
|
||||||
);
|
);
|
||||||
|
|
||||||
if (isset($generated_salt)) {
|
if ($generated_salt) {
|
||||||
return [ $hash, $salt ];
|
return [ $hash, $salt ];
|
||||||
} else {
|
} else {
|
||||||
return $hash;
|
return $hash;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user