moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Some code cleanup in user.js 

* More work around user/groups
This commit is contained in:
Bryan Ashby 2015-05-12 16:34:11 -06:00
parent a7f9e3846e
commit 58746ca9a9
3 changed files with 54 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

230
core/user.js
View File

@ -12,15 +12,14 @@ var _ = require('lodash');
exports.User = User; exports.User = User;
exports.getUserIdAndName = getUserIdAndName; exports.getUserIdAndName = getUserIdAndName;
exports.createNew = createNew;
exports.persistAll = persistAll;
function User() { function User() {
var self = this; var self = this;
this.userId = 0; this.userId = 0;
this.username = ''; this.username = '';
this.properties = {}; this.properties = {}; // name:value
this.groups = {}; // id:name
this.isValid = function() { this.isValid = function() {
if(self.userId <= 0 || self.username.length < 2) { if(self.userId <= 0 || self.username.length < 2) {
@ -45,6 +44,10 @@ function User() {
this.isSysOp = this.isRoot; // alias this.isSysOp = this.isRoot; // alias
this.isGroupMember = function(groupIdOrName) {
return _.isString(self.groups[groupIdOrName]);
}
} }
User.PBKDF2 = { User.PBKDF2 = {
@ -112,7 +115,7 @@ User.prototype.authenticate = function(username, password, cb) {
callback(0 === c ? null : new Error('Invalid password')); callback(0 === c ? null : new Error('Invalid password'));
}, },
function initProps(callback) { function initProps(callback) {
loadProperties({ userId : cachedInfo.userId }, function onProps(err, allProps) { loadProperties( { userId : cachedInfo.userId }, function onProps(err, allProps) {
if(!err) { if(!err) {
cachedInfo.properties = allProps; cachedInfo.properties = allProps;
} }
@ -144,26 +147,6 @@ User.prototype.authenticate = function(username, password, cb) {
); );
}; };
function getUserIdAndName(username, cb) {
userDb.get(
'SELECT id, user_name ' +
'FROM user ' +
'WHERE user_name LIKE ?;',
[ username ],
function onResults(err, row) {
if(err) {
cb(err);
} else {
if(row) {
cb(null, row.id, row.user_name);
} else {
cb(new Error('No matching username'));
}
}
}
);
}
User.prototype.create = function(options, cb) { User.prototype.create = function(options, cb) {
assert(0 === this.userId); assert(0 === this.userId);
assert(this.username.length > 0); // :TODO: Min username length? Max? assert(this.username.length > 0); // :TODO: Min username length? Max?
@ -175,8 +158,6 @@ User.prototype.create = function(options, cb) {
// :TODO: set various defaults, e.g. default activation status, etc. // :TODO: set various defaults, e.g. default activation status, etc.
self.properties.account_status = Config.users.requireActivation ? User.AccountStatus.inactive : User.AccountStatus.active; self.properties.account_status = Config.users.requireActivation ? User.AccountStatus.inactive : User.AccountStatus.active;
// :TODO: Set default groups from Config.users.defaultGroups[]
async.series( async.series(
[ [
function beginTransaction(callback) { function beginTransaction(callback) {
@ -195,11 +176,13 @@ User.prototype.create = function(options, cb) {
} else { } else {
self.userId = this.lastID; self.userId = this.lastID;
// Do not SGRValuesre activation for userId 1 (root/admin) // Do not require activation for userId 1 (root/admin)
if(1 === self.userId) { if(1 === self.userId) {
self.properties.account_status = User.AccountStatus.active; self.properties.account_status = User.AccountStatus.active;
} }
callback(null); callback(null);
} }
} }
@ -226,6 +209,21 @@ User.prototype.create = function(options, cb) {
} }
}); });
}, },
function setInitialSysOpGroupMembership(callback) {
if(1 !== self.userId) {
callback(null);
return;
}
userGroup.getGroupsByName( [ 'sysops' ], function sysopGroups(err, groups) {
if(err) {
callback(err);
} else {
_.assign(self.groups, self.groups, groups);
callback(null);
}
});
},
function saveAll(callback) { function saveAll(callback) {
self.persist(false, function persisted(err) { self.persist(false, function persisted(err) {
callback(err); callback(err);
@ -265,7 +263,7 @@ User.prototype.persist = function(useTransaction, cb) {
} }
}, },
function saveProps(callback) { function saveProps(callback) {
persistProperties(self, function persisted(err) { self.persistProperties(function persisted(err) {
callback(err); callback(err);
}); });
}, },
@ -321,74 +319,32 @@ User.prototype.persistProperties = function(cb) {
}); });
}; };
///////////////////////////////////////////////////////////////////////////////
function createNew(user, cb) { // Exported methods
assert(user.username && user.username.length > 1, 'Invalid userName'); ///////////////////////////////////////////////////////////////////////////////
function getUserIdAndName(username, cb) {
async.series( userDb.get(
[ 'SELECT id, user_name ' +
function beginTransaction(callback) { 'FROM user ' +
userDb.run('BEGIN;', function onBegin(err) { 'WHERE user_name LIKE ?;',
callback(err); [ username ],
}); function onResults(err, row) {
},
function createUserRec(callback) {
userDb.run(
'INSERT INTO user (user_name) ' +
'VALUES (?);',
[ user.username ],
function onUserInsert(err) {
if(err) {
callback(err);
} else {
user.userId = this.lastID;
callback(null);
}
}
);
},
function genPasswordDkAndSaltIfRequired(callback) {
if(user.password && user.password.length > 0) {
generatePasswordDerivedKeyAndSalt(user.password, function onDkAndSalt(err, info) {
if(err) {
callback(err);
} else {
user.properties = user.properties || {};
user.properties.pw_pbkdf2_salt = info.salt;
user.properties.pw_pbkdf2_dk = info.dk;
callback(null);
}
});
} else {
callback(null);
}
},
function saveAll(callback) {
persistAll(user, false, function onPersisted(err) {
callback(err);
});
}
],
function onComplete(err) {
if(err) { if(err) {
var originalError = err; cb(err);
userDb.run('ROLLBACK;', function onRollback(err) {
assert(!err);
cb(originalError);
});
} else { } else {
userDb.run('COMMIT;', function onCommit(err) { if(row) {
if(err) { cb(null, row.id, row.user_name);
cb(err); } else {
} else { cb(new Error('No matching username'));
cb(null, user.userId); }
}
});
} }
} }
); );
} }
///////////////////////////////////////////////////////////////////////////////
// Internal utility methods
///////////////////////////////////////////////////////////////////////////////
function generatePasswordDerivedKeyAndSalt(password, cb) { function generatePasswordDerivedKeyAndSalt(password, cb) {
async.waterfall( async.waterfall(
[ [
@ -430,28 +386,6 @@ function generatePasswordDerivedKey(password, salt, cb) {
}); });
} }
function persistProperties(user, cb) {
assert(user.userId > 0);
var stmt = userDb.prepare(
'REPLACE INTO user_property (user_id, prop_name, prop_value) ' +
'VALUES (?, ?, ?);');
async.each(Object.keys(user.properties), function onProp(propName, callback) {
stmt.run(user.userId, propName, user.properties[propName], function onRun(err) {
callback(err);
});
}, function onComplete(err) {
if(err) {
cb(err);
} else {
stmt.finalize(function onFinalized() {
cb(null);
});
}
});
}
function loadProperties(options, cb) { function loadProperties(options, cb) {
assert(options.userId); assert(options.userId);
@ -479,77 +413,3 @@ function loadProperties(options, cb) {
cb(null, properties); cb(null, properties);
}); });
} }
/*function getProperties(userId, propNames, cb) {
var properties = {};
async.each(propNames, function onPropName(propName, next) {
userDb.get(
'SELECT prop_value ' +
'FROM user_property ' +
'WHERE user_id = ? AND prop_name = ?;',
[ userId, propName ],
function onRow(err, row) {
if(err) {
next(err);
} else {
if(row) {
properties[propName] = row.prop_value;
next();
} else {
next(new Error('No property "' + propName + '" for user ' + userId));
}
}
}
);
}, function complete(err) {
if(err) {
cb(err);
} else {
cb(null, properties);
}
});
}
*/
function persistAll(user, useTransaction, cb) {
assert(user.userId > 0);
async.series(
[
function beginTransaction(callback) {
if(useTransaction) {
userDb.run('BEGIN;', function onBegin(err) {
callback(err);
});
} else {
callback(null);
}
},
function saveProps(callback) {
persistProperties(user, function onPropPersist(err) {
callback(err);
});
}
],
function onComplete(err) {
if(err) {
if(useTransaction) {
userDb.run('ROLLBACK;', function onRollback(err) {
cb(err);
});
} else {
cb(err);
}
} else {
if(useTransaction) {
userDb.run('COMMIT;', function onCommit(err) {
cb(err);
});
} else {
cb(null);
}
}
}
);
}

9
core/user_group.js
View File

@ -89,5 +89,12 @@ function addUserToGroups(userId, groups, cb) {
} }
function removeUserFromGroup(userId, groupId, cb) { function removeUserFromGroup(userId, groupId, cb) {
userDb.run(
'DELETE FROM user_group_member ' +
'WHERE group_id = ? AND user_id = ?;',
[ groupId, userId ],
function complete(err) {
cb(err);
}
);
} }

2
mods/apply.js
View File

@ -89,7 +89,7 @@ function submitApplication(callingMenu, formData, extraArgs) {
web_address : formData.value.web, web_address : formData.value.web,
// :TODO: This is set in User.create() -- proabbly don't need it here: // :TODO: This is set in User.create() -- proabbly don't need it here:
account_status : Config.users.requireActivation ? user.User.AccountStatus.inactive : user.User.AccountStatus.active, //account_status : Config.users.requireActivation ? user.User.AccountStatus.inactive : user.User.AccountStatus.active,
// :TODO: Other defaults // :TODO: Other defaults
// :TODO: should probably have a place to create defaults/etc. // :TODO: should probably have a place to create defaults/etc.