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

closes #3217

Browse Source
This commit is contained in:
barisusakli
2015-06-17 14:13:29 -04:00
parent cea385e572
commit ed173e0a32
4 changed files with 244 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

236
src/controllers/authentication.js Normal file
View File

@@ -0,0 +1,236 @@
"use strict";
var async = require('async'),
winston = require('winston'),
passport = require('passport'),
nconf = require('nconf'),
validator = require('validator'),
db = require('../database'),
meta = require('../meta'),
user = require('../user'),
plugins = require('../plugins'),
utils = require('../../public/src/utils'),
Password = require('../password'),
authenticationController = {};
authenticationController.register = function(req, res, next) {
if (parseInt(meta.config.allowRegistration, 10) === 0) {
return res.sendStatus(403);
}
var userData = {};
for (var key in req.body) {
if (req.body.hasOwnProperty(key)) {
userData[key] = req.body[key];
}
}
var uid;
async.waterfall([
function(next) {
if (!userData.email) {
return next(new Error('[[error:invalid-email]]'));
}
if (!userData.username || userData.username.length < meta.config.minimumUsernameLength) {
return next(new Error('[[error:username-too-short]]'));
}
if (userData.username.length > meta.config.maximumUsernameLength) {
return next(new Error('[[error:username-too-long'));
}
if (!userData.password || userData.password.length < meta.config.minimumPasswordLength) {
return next(new Error('[[user:change_password_error_length]]'));
}
next();
},
function(next) {
plugins.fireHook('filter:register.check', {req: req, res: res, userData: userData}, next);
},
function(data, next) {
user.create(data.userData, next);
},
function(_uid, next) {
uid = _uid;
req.login({uid: uid}, next);
},
function(next) {
user.logIP(uid, req.ip);
user.notifications.sendWelcomeNotification(uid);
plugins.fireHook('filter:register.complete', {uid: uid, referrer: req.body.referrer}, next);
}
], function(err, data) {
if (err) {
return res.status(400).send(err.message);
}
res.status(200).send(data.referrer ? data.referrer : nconf.get('relative_path') + '/');
});
};
authenticationController.login = function(req, res, next) {
// Handle returnTo data
if (req.body.hasOwnProperty('returnTo') && !req.session.returnTo) {
req.session.returnTo = req.body.returnTo;
}
if (plugins.hasListeners('action:auth.overrideLogin')) {
return continueLogin(req, res, next);
}
var loginWith = meta.config.allowLoginWith || 'username-email';
if (req.body.username && utils.isEmailValid(req.body.username) && loginWith.indexOf('email') !== -1) {
user.getUsernameByEmail(req.body.username, function(err, username) {
if (err) {
return next(err);
}
req.body.username = username ? username : req.body.username;
continueLogin(req, res, next);
});
} else if (loginWith.indexOf('username') !== -1 && !validator.isEmail(req.body.username)) {
continueLogin(req, res, next);
} else {
res.status(500).send('[[error:wrong-login-type-' + loginWith + ']]');
}
};
function continueLogin(req, res, next) {
passport.authenticate('local', function(err, userData, info) {
if (err) {
return res.status(403).send(err.message);
}
if (!userData) {
if (typeof info === 'object') {
info = '[[error:invalid-username-or-password]]';
}
return res.status(403).send(info);
}
var passwordExpiry = userData.passwordExpiry !== undefined ? parseInt(userData.passwordExpiry, 10) : null;
// Alter user cookie depending on passed-in option
if (req.body.remember === 'on') {
var duration = 1000*60*60*24*parseInt(meta.config.loginDays || 14, 10);
req.session.cookie.maxAge = duration;
req.session.cookie.expires = new Date(Date.now() + duration);
} else {
req.session.cookie.maxAge = false;
req.session.cookie.expires = false;
}
if (passwordExpiry && passwordExpiry < Date.now()) {
winston.verbose('[auth] Triggering password reset for uid ' + userData.uid + ' due to password policy');
req.session.passwordExpired = true;
user.reset.generate(userData.uid, function(err, code) {
res.status(200).send(nconf.get('relative_path') + '/reset/' + code);
});
} else {
req.login({
uid: userData.uid
}, function(err) {
if (err) {
return res.status(403).send(err.message);
}
if (userData.uid) {
user.logIP(userData.uid, req.ip);
plugins.fireHook('action:user.loggedIn', userData.uid);
}
if (!req.session.returnTo) {
res.status(200).send(nconf.get('relative_path') + '/');
} else {
var next = req.session.returnTo;
delete req.session.returnTo;
res.status(200).send(next);
}
});
}
})(req, res, next);
}
authenticationController.localLogin = function(req, username, password, next) {
if (!username || !password) {
return next(new Error('[[error:invalid-password]]'));
}
var userslug = utils.slugify(username);
var uid, userData = {};
async.waterfall([
function(next) {
user.getUidByUserslug(userslug, next);
},
function(_uid, next) {
if (!_uid) {
return next(new Error('[[error:no-user]]'));
}
uid = _uid;
user.auth.logAttempt(uid, req.ip, next);
},
function(next) {
async.parallel({
userData: function(next) {
db.getObjectFields('user:' + uid, ['password', 'banned', 'passwordExpiry'], next);
},
isAdmin: function(next) {
user.isAdministrator(uid, next);
}
}, next);
},
function(result, next) {
userData = result.userData;
userData.uid = uid;
userData.isAdmin = result.isAdmin;
if (!result.isAdmin && parseInt(meta.config.allowLocalLogin, 10) === 0) {
return next(new Error('[[error:local-login-disabled]]'));
}
if (!userData || !userData.password) {
return next(new Error('[[error:invalid-user-data]]'));
}
if (userData.banned && parseInt(userData.banned, 10) === 1) {
return next(new Error('[[error:user-banned]]'));
}
Password.compare(password, userData.password, next);
},
function(passwordMatch, next) {
if (!passwordMatch) {
return next(new Error('[[error:invalid-password]]'));
}
user.auth.clearLoginAttempts(uid);
next(null, userData, '[[success:authentication-successful]]');
}
], next);
};
authenticationController.logout = function(req, res, next) {
if (req.user && parseInt(req.user.uid, 10) > 0 && req.sessionID) {
require('../socket.io').logoutUser(req.user.uid);
db.sessionStore.destroy(req.sessionID, function(err) {
if (err) {
return next(err);
}
req.logout();
res.status(200).send('');
});
} else {
res.status(200).send('');
}
};
module.exports = authenticationController;

6
src/controllers/index.js
View File

@@ -5,7 +5,6 @@ var async = require('async'),
validator = require('validator'),
winston = require('winston'),
auth = require('../routes/authentication'),
meta = require('../meta'),
user = require('../user'),
posts = require('../posts'),
@@ -24,6 +23,7 @@ var Controllers = {
users: require('./users'),
groups: require('./groups'),
accounts: require('./accounts'),
authentication: require('./authentication'),
api: require('./api'),
admin: require('./admin')
};
@@ -74,7 +74,7 @@ Controllers.reset = function(req, res, next) {
Controllers.login = function(req, res, next) {
var data = {},
loginStrategies = auth.getLoginStrategies(),
loginStrategies = require('../routes/authentication').getLoginStrategies(),
emailersPresent = plugins.hasListeners('action:email.send');
data.alternate_logins = loginStrategies.length > 0;
@@ -95,7 +95,7 @@ Controllers.register = function(req, res, next) {
}
var data = {},
loginStrategies = auth.getLoginStrategies();
loginStrategies = require('../routes/authentication').getLoginStrategies();
if (loginStrategies.length === 0) {
data = {

233
src/routes/authentication.js
View File

@@ -5,17 +5,11 @@
passportLocal = require('passport-local').Strategy,
nconf = require('nconf'),
winston = require('winston'),
async = require('async'),
validator = require('validator'),
express = require('express'),
Password = require('../password'),
meta = require('../meta'),
user = require('../user'),
controllers = require('../controllers'),
plugins = require('../plugins'),
db = require('../database'),
hotswap = require('../hotswap'),
utils = require('../../public/src/utils'),
loginStrategies = [];
@@ -46,7 +40,7 @@
winston.warn('[authentication] Login override detected, skipping local login strategy.');
plugins.fireHook('action:auth.overrideLogin');
} else {
passport.use(new passportLocal({passReqToCallback: true}, Auth.login));
passport.use(new passportLocal({passReqToCallback: true}, controllers.authentication.localLogin));
}
plugins.fireHook('filter:auth.init', loginStrategies, function(err) {
@@ -68,9 +62,9 @@
}));
});
router.post('/logout', Auth.middleware.applyCSRF, logout);
router.post('/register', Auth.middleware.applyCSRF, register);
router.post('/login', Auth.middleware.applyCSRF, login);
router.post('/register', Auth.middleware.applyCSRF, controllers.authentication.register);
router.post('/login', Auth.middleware.applyCSRF, controllers.authentication.login);
router.post('/logout', Auth.middleware.applyCSRF, controllers.authentication.logout);
hotswap.replace('auth', router);
if (typeof callback === 'function') {
@@ -79,62 +73,6 @@
});
};
Auth.login = function(req, username, password, next) {
if (!username || !password) {
return next(new Error('[[error:invalid-password]]'));
}
var userslug = utils.slugify(username);
var uid, userData = {};
async.waterfall([
function(next) {
user.getUidByUserslug(userslug, next);
},
function(_uid, next) {
if (!_uid) {
return next(new Error('[[error:no-user]]'));
}
uid = _uid;
user.auth.logAttempt(uid, req.ip, next);
},
function(next) {
async.parallel({
userData: function(next) {
db.getObjectFields('user:' + uid, ['password', 'banned', 'passwordExpiry'], next);
},
isAdmin: function(next) {
user.isAdministrator(uid, next);
}
}, next);
},
function(result, next) {
userData = result.userData;
userData.uid = uid;
userData.isAdmin = result.isAdmin;
if (!result.isAdmin && parseInt(meta.config.allowLocalLogin, 10) === 0) {
return next(new Error('[[error:local-login-disabled]]'));
}
if (!userData || !userData.password) {
return next(new Error('[[error:invalid-user-data]]'));
}
if (userData.banned && parseInt(userData.banned, 10) === 1) {
return next(new Error('[[error:user-banned]]'));
}
Password.compare(password, userData.password, next);
},
function(passwordMatch, next) {
if (!passwordMatch) {
return next(new Error('[[error:invalid-password]]'));
}
user.auth.clearLoginAttempts(uid);
next(null, userData, '[[success:authentication-successful]]');
}
], next);
};
passport.serializeUser(function(user, done) {
done(null, user.uid);
});
@@ -145,165 +83,4 @@
});
});
function login(req, res, next) {
// Handle returnTo data
if (req.body.hasOwnProperty('returnTo') && !req.session.returnTo) {
req.session.returnTo = req.body.returnTo;
}
if (plugins.hasListeners('action:auth.overrideLogin')) {
return Auth.continueLogin(req, res, next);
}
var loginWith = meta.config.allowLoginWith || 'username-email';
if (req.body.username && utils.isEmailValid(req.body.username) && loginWith.indexOf('email') !== -1) {
user.getUsernameByEmail(req.body.username, function(err, username) {
if (err) {
return next(err);
}
req.body.username = username ? username : req.body.username;
Auth.continueLogin(req, res, next);
});
} else if (loginWith.indexOf('username') !== -1 && !validator.isEmail(req.body.username)) {
Auth.continueLogin(req, res, next);
} else {
res.status(500).send('[[error:wrong-login-type-' + loginWith + ']]');
}
}
Auth.continueLogin = function(req, res, next) {
passport.authenticate('local', function(err, userData, info) {
if (err) {
return res.status(403).send(err.message);
}
if (!userData) {
if (typeof info === 'object') {
info = '[[error:invalid-username-or-password]]';
}
return res.status(403).send(info);
}
var passwordExpiry = userData.passwordExpiry !== undefined ? parseInt(userData.passwordExpiry, 10) : null;
// Alter user cookie depending on passed-in option
if (req.body.remember === 'on') {
var duration = 1000*60*60*24*parseInt(meta.config.loginDays || 14, 10);
req.session.cookie.maxAge = duration;
req.session.cookie.expires = new Date(Date.now() + duration);
} else {
req.session.cookie.maxAge = false;
req.session.cookie.expires = false;
}
if (passwordExpiry && passwordExpiry < Date.now()) {
winston.verbose('[auth] Triggering password reset for uid ' + userData.uid + ' due to password policy');
req.session.passwordExpired = true;
user.reset.generate(userData.uid, function(err, code) {
res.status(200).send(nconf.get('relative_path') + '/reset/' + code);
});
} else {
req.login({
uid: userData.uid
}, function(err) {
if (err) {
return res.status(403).send(err.message);
}
if (userData.uid) {
user.logIP(userData.uid, req.ip);
plugins.fireHook('action:user.loggedIn', userData.uid);
}
if (!req.session.returnTo) {
res.status(200).send(nconf.get('relative_path') + '/');
} else {
var next = req.session.returnTo;
delete req.session.returnTo;
res.status(200).send(next);
}
});
}
})(req, res, next);
};
function register(req, res) {
if (parseInt(meta.config.allowRegistration, 10) === 0) {
return res.sendStatus(403);
}
var userData = {};
for (var key in req.body) {
if (req.body.hasOwnProperty(key)) {
userData[key] = req.body[key];
}
}
var uid;
async.waterfall([
function(next) {
if (!userData.email) {
return next(new Error('[[error:invalid-email]]'));
}
if (!userData.username || userData.username.length < meta.config.minimumUsernameLength) {
return next(new Error('[[error:username-too-short]]'));
}
if (userData.username.length > meta.config.maximumUsernameLength) {
return next(new Error('[[error:username-too-long'));
}
if (!userData.password || userData.password.length < meta.config.minimumPasswordLength) {
return next(new Error('[[user:change_password_error_length]]'));
}
next();
},
function(next) {
plugins.fireHook('filter:register.check', {req: req, res: res, userData: userData}, next);
},
function(data, next) {
user.create(data.userData, next);
},
function(_uid, next) {
uid = _uid;
req.login({uid: uid}, next);
},
function(next) {
user.logIP(uid, req.ip);
user.notifications.sendWelcomeNotification(uid);
plugins.fireHook('filter:register.complete', {uid: uid, referrer: req.body.referrer}, next);
}
], function(err, data) {
if (err) {
return res.status(400).send(err.message);
}
res.status(200).send(data.referrer ? data.referrer : nconf.get('relative_path') + '/');
});
}
function logout(req, res, next) {
if (req.user && parseInt(req.user.uid, 10) > 0 && req.sessionID) {
require('../socket.io').logoutUser(req.user.uid);
db.sessionStore.destroy(req.sessionID, function(err) {
if (err) {
return next(err);
}
req.logout();
res.status(200).send('');
});
} else {
res.status(200).send('');
}
}
}(exports));

5
src/routes/index.js
View File

@@ -123,11 +123,6 @@ module.exports = function(app, middleware) {
feedRoutes(router, middleware, controllers);
pluginRoutes(router, middleware, controllers);
/**
* Every view has an associated API route.
*
*/
mainRoutes(router, middleware, controllers);
topicRoutes(router, middleware, controllers);
tagRoutes(router, middleware, controllers);