zydronium/enigma-bbs
1
0
Fork 0
mirror of https://github.com/NuSkooler/enigma-bbs.git synced 2025-08-01 15:34:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use authInfo obj vs weird params. auth factor 1: factor 2 for 2FA, etc.

Browse source
This commit is contained in:
Bryan Ashby 2019-02-22 22:51:12 -07:00
parent 57938e761e
commit 23779c3abe
No known key found for this signature in database
GPG key ID: B49EB437951D2542
4 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
core/user.js
View file

@ -178,17 +178,20 @@ module.exports = class User {
});
}
authenticate(username, password, options, cb) {
if(!cb && _.isFunction(options)) {
cb = options;
options = {};
}
static get AuthFactor1Types() {
return {
PubKey : 'pubKey',
Password : 'password',
};
}
authenticateFactor1(authInfo, cb) {
const username = authInfo.username;
const self = this;
const tempAuthInfo = {};
const validatePassword = (props, callback) => {
User.generatePasswordDerivedKey(password, props[UserProps.PassPbkdf2Salt], (err, dk) => {
User.generatePasswordDerivedKey(authInfo.password, props[UserProps.PassPbkdf2Salt], (err, dk) => {
if(err) {
return callback(err);
}
@ -212,8 +215,8 @@ module.exports = class User {
return callback(Errors.AccessDenied('Invalid public key'));
}
if(options.ctx.key.algo != pubKeyActual.type ||
!crypto.timingSafeEqual(options.ctx.key.data, pubKeyActual.getPublicSSH()))
if(authInfo.pubKey.key.algo != pubKeyActual.type ||
!crypto.timingSafeEqual(authInfo.pubKey.key.data, pubKeyActual.getPublicSSH()))
{
return callback(Errors.AccessDenied('Invalid public key'));
}
@ -234,12 +237,12 @@ module.exports = class User {
},
function getRequiredAuthProperties(callback) {
// fetch properties required for authentication
User.loadProperties( tempAuthInfo.userId, { names : User.StandardPropertyGroups.auth }, (err, props) => {
User.loadProperties(tempAuthInfo.userId, { names : User.StandardPropertyGroups.auth }, (err, props) => {
return callback(err, props);
});
},
function validatePassOrPubKey(props, callback) {
if('pubKey' === options.authType) {
if(User.AuthFactor1Types.PubKey === authInfo.type) {
return validatePubKey(props, callback);
}
return validatePassword(props, callback);