RPJosh
/
authelia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modified regex

pull/316/head
Tedy Stoica 2019-01-08 12:15:20 +02:00
parent 6c4d06b2a8
commit 99bc50f2ff
No known key found for this signature in database
GPG Key ID: D5C8034B0199CAE6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/src/lib/authentication/backends/file/FileUsersDatabase.ts
View File

@ -36,13 +36,13 @@ export class FileUsersDatabase implements IUsersDatabase {
this.queue.next(); this.queue.next();
}); });
}) })
.then((content) => { .then((content) => {
const database = Yaml.parse(content); const database = Yaml.parse(content);
if (!database) { if (!database) {
return Bluebird.reject(new Error("Unable to parse YAML file.")); return Bluebird.reject(new Error("Unable to parse YAML file."));
} }
return Bluebird.resolve(database); return Bluebird.resolve(database);
}); });
} }
/** /**
@ -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."));
@ -153,7 +153,7 @@ export class FileUsersDatabase implements IUsersDatabase {
return { emails: emails, groups: groups }; return { emails: emails, groups: groups };
}); });
}); });
}); });
} }
getEmails(username: string): Bluebird<string[]> { getEmails(username: string): Bluebird<string[]> {