Merge branch 'master' into master

pull/309/head
Clément Michaud 2019-01-08 21:32:28 +01:00 committed by GitHub
commit 84b1194711
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions

View File

@ -68,7 +68,7 @@ export class FileUsersDatabase implements IUsersDatabase {
password: string) password: string)
: Bluebird<void> { : Bluebird<void> {
const storedHash: string = database.users[username].password; const storedHash: string = database.users[username].password;
const matches = storedHash.match(/rounds=([0-9]+)\$([a-zA-z0-9]+)\$/); const matches = storedHash.match(/rounds=([0-9]+)\$([a-zA-z0-9./]+)\$/);
if (!(matches && matches.length == 3)) { if (!(matches && matches.length == 3)) {
return Bluebird.reject(new Error("Unable to detect the hash salt and rounds. " + return Bluebird.reject(new Error("Unable to detect the hash salt and rounds. " +
"Make sure the password is hashed with SSHA512.")); "Make sure the password is hashed with SSHA512."));