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

Merge branch 'master' into master

pull/309/head
Clément Michaud 2019-01-08 21:32:28 +01:00 committed by GitHub
parent 17cc93425a e83af9b687
commit 84b1194711
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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();
});
})
.then((content) => {
const database = Yaml.parse(content);
if (!database) {
return Bluebird.reject(new Error("Unable to parse YAML file."));
}
return Bluebird.resolve(database);
});
.then((content) => {
const database = Yaml.parse(content);
if (!database) {
return Bluebird.reject(new Error("Unable to parse YAML file."));
}
return Bluebird.resolve(database);
});
}
/**
@ -68,7 +68,7 @@ export class FileUsersDatabase implements IUsersDatabase {
password: string)
: Bluebird<void> {
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)) {
return Bluebird.reject(new Error("Unable to detect the hash salt and rounds. " +
"Make sure the password is hashed with SSHA512."));
@ -153,7 +153,7 @@ export class FileUsersDatabase implements IUsersDatabase {
return { emails: emails, groups: groups };
});
});
});
});
}
getEmails(username: string): Bluebird<string[]> {