Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 19:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

add blacklist test to onSuccessfulLogin as well

Browse Source
This commit is contained in:
Julian Lam
2017-08-23 12:13:52 -04:00
parent 10c8666520
commit 81cf8f77d3
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/controllers/authentication.js
View File

@@ -274,7 +274,6 @@ authenticationController.doLogin = function (req, uid, callback) {
}; };
authenticationController.onSuccessfulLogin = function (req, uid, callback) { authenticationController.onSuccessfulLogin = function (req, uid, callback) {
callback = callback || function () {};
var uuid = utils.generateUUID(); var uuid = utils.generateUUID();
req.session.meta = {}; req.session.meta = {};
@@ -294,6 +293,7 @@ authenticationController.onSuccessfulLogin = function (req, uid, callback) {
}); });
async.waterfall([ async.waterfall([
async.apply(meta.blacklist.test, req.ip),
function (next) { function (next) {
async.parallel([ async.parallel([
function (next) { function (next) {
@@ -316,7 +316,17 @@ authenticationController.onSuccessfulLogin = function (req, uid, callback) {
plugins.fireHook('action:user.loggedIn', { uid: uid, req: req }); plugins.fireHook('action:user.loggedIn', { uid: uid, req: req });
next(); next();
}, },
], callback); ], function (err) {
if (err) {
req.session.destroy();
}
if (typeof callback === 'function') {
callback(err);
} else {
return false;
}
});
}; };
authenticationController.localLogin = function (req, username, password, next) { authenticationController.localLogin = function (req, username, password, next) {