Merge branch 'master' into develop

public/language/en-GB/admin/general/dashboard.json

@@ -21,6 +21,7 @@
 	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
 	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
+	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
 	"notices": "Notices",
 	"restart-not-required": "Restart not required",

src/controllers/admin/dashboard.js

@@ -30,6 +30,14 @@ dashboardController.get = function (req, res, next) {
 					link:'/admin/extend/plugins'
 				}
 			];
+
+			if (global.env !== 'production') {
+				notices.push({
+					done: false,
+					notDoneText: '[[admin/general/dashboard:running-in-development]]'
+				});
+			}
+
 			plugins.fireHook('filter:admin.notices', notices, next);
 		}
 	}, function (err, results) {

src/middleware/header.js

@@ -59,115 +59,122 @@ module.exports = function (middleware) {
 		};
 
 		templateValues.configJSON = JSON.stringify(res.locals.config);
-
+		async.waterfall([
-		async.parallel({
+			function (next) {
-			scripts: function (next) {
+				async.parallel({
-				plugins.fireHook('filter:scripts.get', [], next);
+					scripts: function (next) {
+						plugins.fireHook('filter:scripts.get', [], next);
+					},
+					isAdmin: function (next) {
+						user.isAdministrator(req.uid, next);
+					},
+					isGlobalMod: function (next) {
+						user.isGlobalModerator(req.uid, next);
+					},
+					isModerator: function (next) {
+						user.isModeratorOfAnyCategory(req.uid, next);
+					},
+					user: function (next) {
+						var userData = {
+							uid: 0,
+							username: '[[global:guest]]',
+							userslug: '',
+							email: '',
+							picture: meta.config.defaultAvatar,
+							status: 'offline',
+							reputation: 0,
+							'email:confirmed': false
+						};
+						if (req.uid) {
+							user.getUserFields(req.uid, Object.keys(userData), next);
+						} else {
+							next(null, userData);
+						}
+					},
+					isEmailConfirmSent: function (next) {
+						if (!meta.config.requireEmailConfirmation || !req.uid) {
+							return next(null, false);
+						}
+						db.get('uid:' + req.uid + ':confirm:email:sent', next);
+					},
+					navigation: async.apply(navigation.get),
+					tags: async.apply(meta.tags.parse, res.locals.metaTags, res.locals.linkTags),
+					banned: async.apply(user.isBanned, req.uid),
+					banReason: async.apply(user.getBannedReason, req.uid)
+				}, next);
 			},
-			isAdmin: function (next) {
+			function (results, next) {
-				user.isAdministrator(req.uid, next);
+				if (results.banned) {
-			},
+					req.logout();
-			isGlobalMod: function (next) {
+					return res.redirect('/?banned=' + (results.banReason || 'no-reason'));
-				user.isGlobalModerator(req.uid, next);
-			},
-			isModerator: function (next) {
-				user.isModeratorOfAnyCategory(req.uid, next);
-			},
-			user: function (next) {
-				var userData = {
-					uid: 0,
-					username: '[[global:guest]]',
-					userslug: '',
-					email: '',
-					picture: meta.config.defaultAvatar,
-					status: 'offline',
-					reputation: 0,
-					'email:confirmed': false
-				};
-				if (req.uid) {
-					user.getUserFields(req.uid, Object.keys(userData), next);
-				} else {
-					next(null, userData);
-				}
-			},
-			isEmailConfirmSent: function (next) {
-				if (!meta.config.requireEmailConfirmation || !req.uid) {
-					return next(null, false);
-				}
-				db.get('uid:' + req.uid + ':confirm:email:sent', next);
-			},
-			navigation: async.apply(navigation.get),
-			tags: async.apply(meta.tags.parse, res.locals.metaTags, res.locals.linkTags),
-			banned: async.apply(user.isBanned, req.uid),
-			banReason: async.apply(user.getBannedReason, req.uid)
-		}, function (err, results) {
-			if (err) {
-				return callback(err);
-			}
-
-			if (results.banned) {
-				req.logout();
-				return res.redirect('/?banned=' + (results.banReason || 'no-reason'));
-			}
-
-			results.user.isAdmin = results.isAdmin;
-			results.user.isGlobalMod = results.isGlobalMod;
-			results.user.isMod = !!results.isModerator;
-			results.user.uid = parseInt(results.user.uid, 10);
-			results.user.email = String(results.user.email).replace(/\\/g, '\\\\').replace(/"/g, '\\"');
-			results.user['email:confirmed'] = parseInt(results.user['email:confirmed'], 10) === 1;
-			results.user.isEmailConfirmSent = !!results.isEmailConfirmSent;
-
-			if (res.locals.config && parseInt(meta.config.disableCustomUserSkins, 10) !== 1 && res.locals.config.bootswatchSkin !== 'default') {
-				templateValues.bootswatchCSS = '//maxcdn.bootstrapcdn.com/bootswatch/latest/' + res.locals.config.bootswatchSkin + '/bootstrap.min.css';
-			}
-
-			templateValues.browserTitle = controllers.helpers.buildTitle(data.title);
-			templateValues.navigation = results.navigation;
-			templateValues.metaTags = results.tags.meta;
-			templateValues.linkTags = results.tags.link;
-			templateValues.isAdmin = results.user.isAdmin;
-			templateValues.isGlobalMod = results.user.isGlobalMod;
-			templateValues.showModMenu = results.user.isAdmin || results.user.isGlobalMod || results.user.isMod;
-			templateValues.user = results.user;
-			templateValues.userJSON = JSON.stringify(results.user);
-			templateValues.useCustomCSS = parseInt(meta.config.useCustomCSS, 10) === 1 && meta.config.customCSS;
-			templateValues.customCSS = templateValues.useCustomCSS ? (meta.config.renderedCustomCSS || '') : '';
-			templateValues.useCustomJS = parseInt(meta.config.useCustomJS, 10) === 1;
-			templateValues.customJS = templateValues.useCustomJS ? meta.config.customJS : '';
-			templateValues.maintenanceHeader = parseInt(meta.config.maintenanceMode, 10) === 1 && !results.isAdmin;
-			templateValues.defaultLang = meta.config.defaultLang || 'en-GB';
-			templateValues.privateUserInfo = parseInt(meta.config.privateUserInfo, 10) === 1;
-			templateValues.privateTagListing = parseInt(meta.config.privateTagListing, 10) === 1;
-
-			templateValues.template = {name: res.locals.template};
-			templateValues.template[res.locals.template] = true;
-
-			templateValues.scripts = results.scripts.map(function (script) {
-				return {src: script};
-			});
-
-			if (req.route && req.route.path === '/') {
-				modifyTitle(templateValues);
-			}
-
-			plugins.fireHook('filter:middleware.renderHeader', {templateValues: templateValues, req: req, res: res}, function (err, data) {
-				if (err) {
-					return callback(err);
 				}
 
-				req.app.render('header', data.templateValues, callback);
+				results.user.isAdmin = results.isAdmin;
-			});
+				results.user.isGlobalMod = results.isGlobalMod;
-		});
+				results.user.isMod = !!results.isModerator;
+				results.user.uid = parseInt(results.user.uid, 10);
+				results.user.email = String(results.user.email).replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+				results.user['email:confirmed'] = parseInt(results.user['email:confirmed'], 10) === 1;
+				results.user.isEmailConfirmSent = !!results.isEmailConfirmSent;
+
+				if (res.locals.config && parseInt(meta.config.disableCustomUserSkins, 10) !== 1 && res.locals.config.bootswatchSkin !== 'default') {
+					templateValues.bootswatchCSS = '//maxcdn.bootstrapcdn.com/bootswatch/latest/' + res.locals.config.bootswatchSkin + '/bootstrap.min.css';
+				}
+
+				templateValues.browserTitle = controllers.helpers.buildTitle(data.title);
+				templateValues.navigation = results.navigation;
+				templateValues.metaTags = results.tags.meta;
+				templateValues.linkTags = results.tags.link;
+				templateValues.isAdmin = results.user.isAdmin;
+				templateValues.isGlobalMod = results.user.isGlobalMod;
+				templateValues.showModMenu = results.user.isAdmin || results.user.isGlobalMod || results.user.isMod;
+				templateValues.user = results.user;
+				templateValues.userJSON = JSON.stringify(results.user);
+				templateValues.useCustomCSS = parseInt(meta.config.useCustomCSS, 10) === 1 && meta.config.customCSS;
+				templateValues.customCSS = templateValues.useCustomCSS ? (meta.config.renderedCustomCSS || '') : '';
+				templateValues.useCustomJS = parseInt(meta.config.useCustomJS, 10) === 1;
+				templateValues.customJS = templateValues.useCustomJS ? meta.config.customJS : '';
+				templateValues.maintenanceHeader = parseInt(meta.config.maintenanceMode, 10) === 1 && !results.isAdmin;
+				templateValues.defaultLang = meta.config.defaultLang || 'en-GB';
+				templateValues.privateUserInfo = parseInt(meta.config.privateUserInfo, 10) === 1;
+				templateValues.privateTagListing = parseInt(meta.config.privateTagListing, 10) === 1;
+
+				templateValues.template = {name: res.locals.template};
+				templateValues.template[res.locals.template] = true;
+
+				templateValues.scripts = results.scripts.map(function (script) {
+					return {src: script};
+				});
+
+				if (req.route && req.route.path === '/') {
+					modifyTitle(templateValues);
+				}
+
+				plugins.fireHook('filter:middleware.renderHeader', {
+					req: req, 
+					res: res,
+					templateValues: templateValues					
+				}, next);	
+			},
+			function (data, next) {
+				req.app.render('header', data.templateValues, next);
+			}
+		], callback);
 	};
 
 	middleware.renderFooter = function (req, res, data, callback) {
-		plugins.fireHook('filter:middleware.renderFooter', {templateValues: data, req: req, res: res}, function (err, data) {
+		async.waterfall([
-			if (err) {
+			function (next) {
-				return callback(err);
+				plugins.fireHook('filter:middleware.renderFooter', {
+					req: req,
+					res: res,
+					templateValues: data, 
+				}, next);
+			},
+			function (data, next) {
+				req.app.render('footer', data.templateValues, next);
 			}
-			req.app.render('footer', data.templateValues, callback);
+		], callback);
-		});
 	};
 
 	function modifyTitle(obj) {

src/socket.io/index.js

@@ -22,6 +22,10 @@ Sockets.init = function (server) {
 
 	var SocketIO = require('socket.io');
 	var socketioWildcard = require('socketio-wildcard')();
+	var ioConfig = {
+		transports: nconf.get('socket.io:transports')
+	};
+
 	io = new SocketIO({
 		path: nconf.get('relative_path') + '/socket.io'
 	});
@@ -47,17 +51,15 @@ Sockets.init = function (server) {
 		}
 
 		if (!override) {
-			io.set('origins', parsedUrl.protocol + '//' + domain + ':*');
+			ioConfig.origins = parsedUrl.protocol + '//' + domain + ':*';
 			winston.info('[socket.io] Restricting access to origin: ' + parsedUrl.protocol + '//' + domain + ':*');
 		} else {
-			io.set('origins', override);
+			ioConfig.origins = override;
 			winston.info('[socket.io] Restricting access to origin: ' + override);
 		}
 	}
 
-	io.listen(server, {
+	io.listen(server, ioConfig);
-		transports: nconf.get('socket.io:transports')
-	});
 
 	Sockets.server = io;
 };