hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:nodebb/NodeBB

Browse Source
v1.18.x
Julian Lam 11 years ago
parent 9a9ce8684c 586aeaf53f
commit 699795621a
16 changed files with 244 additions and 219 deletions
Show Stats Download Patch File Download Diff File

13
package.json
Unescape Escape View File

@ -20,8 +20,15 @@
"connect-flash": "^0.1.1", "connect-flash": "^0.1.1",
"cron": "~1.0.4", "cron": "~1.0.4",
"daemon": "~1.1.0", "daemon": "~1.1.0",
"express": "3.2.0", "express": "4.4.5",
"express-namespace": "~0.1.1", "cookie-parser": "^1.0.1",
"body-parser": "^1.0.1",
"serve-favicon": "^2.0.1",
"express-session": "^1.0.2",
"csurf": "^1.1.0",
"compression": "^1.0.1",
"connect-multiparty": "^1.0.1",
"morgan": "^1.0.0",
"gm": "1.14.2", "gm": "1.14.2",
"gravatar": "1.0.6", "gravatar": "1.0.6",
"less": "~1.6.3", "less": "~1.6.3",
@ -52,7 +59,7 @@
"validator": "~3.4.0", "validator": "~3.4.0",
"winston": "~0.7.2", "winston": "~0.7.2",
"xregexp": "~2.0.0", "xregexp": "~2.0.0",
"templates.js": "0.0.6" "templates.js": "0.0.7"
}, },
"devDependencies": { "devDependencies": {
"mocha": "~1.13.0" "mocha": "~1.13.0"

1
public/src/templates.js
Unescape Escape View File

@ -62,6 +62,7 @@ Please use the npm module instead - require('templates.js')
}; };
function express(filename, options, fn) { function express(filename, options, fn) {
console.log(filename, options, fn);
var fs = require('fs'), var fs = require('fs'),
tpl = filename.replace(options.settings.views + '/', ''); tpl = filename.replace(options.settings.views + '/', '');

2
src/categories.js
Unescape Escape View File

@ -275,7 +275,7 @@ var db = require('./database'),
return callback(err); return callback(err);
} }
if (!Array.isArray(categories)) { if (!Array.isArray(categories) || !categories.length) {
return callback(null, []); return callback(null, []);
} }

4
src/database/mongo.js
Unescape Escape View File

@ -6,7 +6,7 @@
var winston = require('winston'), var winston = require('winston'),
async = require('async'), async = require('async'),
nconf = require('nconf'), nconf = require('nconf'),
express = require('express'), session = require('express-session'),
db, db,
mongoClient, mongoClient,
mongoStore; mongoStore;
@ -41,7 +41,7 @@
module.init = function(callback) { module.init = function(callback) {
try { try {
mongoClient = require('mongodb').MongoClient; mongoClient = require('mongodb').MongoClient;
mongoStore = require('connect-mongo')(express); mongoStore = require('connect-mongo')({session: session});
} catch (err) { } catch (err) {
winston.error('Unable to initialize MongoDB! Is MongoDB installed? Error :' + err.message); winston.error('Unable to initialize MongoDB! Is MongoDB installed? Error :' + err.message);
process.exit(); process.exit();

4
src/database/redis.js
Unescape Escape View File

@ -5,7 +5,7 @@
var winston = require('winston'), var winston = require('winston'),
nconf = require('nconf'), nconf = require('nconf'),
path = require('path'), path = require('path'),
express = require('express'), session = require('express-session'),
utils = require('./../../public/src/utils.js'), utils = require('./../../public/src/utils.js'),
redis, redis,
connectRedis, connectRedis,
@ -40,7 +40,7 @@
module.init = function(callback) { module.init = function(callback) {
try { try {
redis = require('redis'); redis = require('redis');
connectRedis = require('connect-redis')(express); connectRedis = require('connect-redis')(session);
reds = require('reds'); reds = require('reds');
} catch (err) { } catch (err) {
winston.error('Unable to initialize Redis! Is Redis installed? Error :' + err.message); winston.error('Unable to initialize Redis! Is Redis installed? Error :' + err.message);

37
src/install.js
Unescape Escape View File

@ -11,7 +11,7 @@ var async = require('async'),
DATABASES = { DATABASES = {
"redis": { "redis": {
"dependencies": ["redis@~0.10.1", "connect-redis@~1.4"] "dependencies": ["redis@~0.10.1", "connect-redis@~2.0.0"]
}, },
"mongo": { "mongo": {
"dependencies": ["mongodb", "connect-mongo"] "dependencies": ["mongodb", "connect-mongo"]
@ -366,26 +366,25 @@ function createCategories(next) {
var Categories = require('./categories'); var Categories = require('./categories');
Categories.getAllCategories(function (err, categoryData) { Categories.getAllCategories(function (err, categoryData) {
if (categoryData.length === 0) { if (err) {
winston.warn('No categories found, populating instance with default categories'); return next(err);
}
fs.readFile(path.join(__dirname, '../', 'install/data/categories.json'), function (err, default_categories) {
default_categories = JSON.parse(default_categories); if (Array.isArray(categoryData) && categoryData.length) {
async.eachSeries(default_categories, function (category, next) {
Categories.create(category, next);
}, function (err) {
if (!err) {
next();
} else {
winston.error('Could not set up categories');
}
});
});
} else {
winston.info('Categories OK. Found ' + categoryData.length + ' categories.'); winston.info('Categories OK. Found ' + categoryData.length + ' categories.');
next(); return next();
} }
winston.warn('No categories found, populating instance with default categories');
fs.readFile(path.join(__dirname, '../', 'install/data/categories.json'), function (err, default_categories) {
if (err) {
return next(err);
}
default_categories = JSON.parse(default_categories);
async.eachSeries(default_categories, Categories.create, next);
});
}); });
} }

5
src/logger.js
Unescape Escape View File

@ -10,7 +10,8 @@ var fs = require('fs'),
winston = require('winston'), winston = require('winston'),
util = require('util'), util = require('util'),
socketio = require('socket.io'), socketio = require('socket.io'),
meta = require('./meta'); meta = require('./meta'),
morgan = require('morgan');
var opts = { var opts = {
/* /*
@ -124,7 +125,7 @@ var opts = {
/* /*
* Always initialize "ofn" (original function) with the original logger function * Always initialize "ofn" (original function) with the original logger function
*/ */
opts.express.ofn = express.logger({stream : opts.streams.log.f}); opts.express.ofn = morgan({stream : opts.streams.log.f});
}; };
Logger.expressLogger = function(req,res,next) { Logger.expressLogger = function(req,res,next) {

137
src/middleware/index.js
Unescape Escape View File

@ -15,6 +15,13 @@ var utils = require('./../../public/src/utils'),
winston = require('winston'), winston = require('winston'),
flash = require('connect-flash'), flash = require('connect-flash'),
templates = require('templates.js'), templates = require('templates.js'),
bodyParser = require('body-parser'),
cookieParser = require('cookie-parser'),
compression = require('compression'),
favicon = require('serve-favicon'),
multipart = require('connect-multiparty'),
csrf = require('csurf'),
session = require('express-session'),
relativePath, relativePath,
viewsPath, viewsPath,
@ -134,52 +141,6 @@ function compileTemplates(pluginTemplates) {
}); });
} }
function handleErrors(err, req, res, next) {
// we may use properties of the error object
// here and next(err) appropriately, or if
// we possibly recovered from the error, simply next().
console.error(err.stack);
var status = err.status || 500;
res.status(status);
req.flash('errorMessage', err.message);
res.redirect('500');
}
function catch404(req, res, next) {
var isLanguage = new RegExp('^' + relativePath + '/language/[\\w]{2,}/.*.json'),
isClientScript = new RegExp('^' + relativePath + '\\/src\\/forum(\\/admin)?\\/.+\\.js');
res.status(404);
if (isClientScript.test(req.url)) {
res.type('text/javascript').send(200, '');
} else if (isLanguage.test(req.url)) {
res.json(200, {});
} else if (req.accepts('html')) {
if (process.env.NODE_ENV === 'development') {
winston.warn('Route requested but not found: ' + req.url);
}
res.redirect(relativePath + '/404');
} else if (req.accepts('json')) {
if (process.env.NODE_ENV === 'development') {
winston.warn('Route requested but not found: ' + req.url);
}
res.json({
error: 'Not found'
});
} else {
res.type('txt').send('Not found');
}
}
module.exports = function(app, data) { module.exports = function(app, data) {
middleware = require('./middleware')(app); middleware = require('./middleware')(app);
@ -188,65 +149,61 @@ module.exports = function(app, data) {
themesPath = nconf.get('themes_path'); themesPath = nconf.get('themes_path');
baseTemplatesPath = nconf.get('base_templates_path'); baseTemplatesPath = nconf.get('base_templates_path');
app.configure(function() {
app.engine('tpl', templates.__express);
app.set('view engine', 'tpl');
app.set('views', viewsPath);
app.use(flash());
app.enable('view cache'); app.engine('tpl', templates.__express);
app.set('view engine', 'tpl');
app.set('views', viewsPath);
app.set('json spaces', process.env.NODE_ENV === 'development' ? 4 : 0);
app.use(flash());
app.use(express.compress()); app.enable('view cache');
app.use(express.favicon(path.join(__dirname, '../../', 'public', meta.config['brand:favicon'] ? meta.config['brand:favicon'] : 'favicon.ico'))); app.use(compression());
app.use(relativePath + '/apple-touch-icon', middleware.routeTouchIcon);
app.use(express.bodyParser());
app.use(express.cookieParser());
app.use(express.session({
store: db.sessionStore,
secret: nconf.get('secret'),
key: 'express.sid',
cookie: {
maxAge: 1000 * 60 * 60 * 24 * parseInt(meta.configs.loginDays || 14, 10)
}
}));
app.use(express.csrf()); // todo, make this a conditional middleware app.use(favicon(path.join(__dirname, '../../', 'public', meta.config['brand:favicon'] ? meta.config['brand:favicon'] : 'favicon.ico')));
app.use(relativePath + '/apple-touch-icon', middleware.routeTouchIcon);
app.use(function (req, res, next) { app.use(bodyParser.urlencoded({extended: true}));
res.locals.csrf_token = req.session._csrf; app.use(bodyParser.json());
res.setHeader('X-Powered-By', 'NodeBB'); app.use(cookieParser());
res.setHeader('X-Frame-Options', 'SAMEORIGIN'); app.use(session({
if (meta.config['allow-from-uri']) { store: db.sessionStore,
res.setHeader('ALLOW-FROM', meta.config['allow-from-uri']); secret: nconf.get('secret'),
} key: 'express.sid',
cookie: {
maxAge: 1000 * 60 * 60 * 24 * parseInt(meta.configs.loginDays || 14, 10)
},
resave: true,
saveUninitialized: true
}));
next(); app.use(multipart());
}); app.use(csrf());
app.use(middleware.processRender); app.use(function (req, res, next) {
res.locals.csrf_token = req.csrfToken();
res.setHeader('X-Powered-By', 'NodeBB');
auth.initialize(app); res.setHeader('X-Frame-Options', 'SAMEORIGIN');
if (meta.config['allow-from-uri']) {
res.setHeader('ALLOW-FROM', meta.config['allow-from-uri']);
}
routeCurrentTheme(app, data.currentThemeId, data.themesData); next();
routeThemeScreenshots(app, data.themesData); });
plugins.getTemplates(function(err, pluginTemplates) { app.use(middleware.processRender);
compileTemplates(pluginTemplates);
});
app.use(relativePath, app.router); auth.initialize(app);
app.use(relativePath, express.static(path.join(__dirname, '../../', 'public'), { routeCurrentTheme(app, data.currentThemeId, data.themesData);
maxAge: app.enabled('cache') ? 5184000000 : 0 routeThemeScreenshots(app, data.themesData);
}));
app.use(catch404); plugins.getTemplates(function(err, pluginTemplates) {
app.use(handleErrors); compileTemplates(pluginTemplates);
}); });
return middleware; return middleware;
}; };

2
src/plugins.js
Unescape Escape View File

@ -73,7 +73,7 @@ var fs = require('fs'),
}, },
function(plugins, next) { function(plugins, next) {
if (!plugins || !Array.isArray(plugins)) { if (!plugins || !Array.isArray(plugins)) {
next(); return next();
} }
plugins.push(meta.config['theme:id']); plugins.push(meta.config['theme:id']);

2
src/postTools.js
Unescape Escape View File

@ -54,7 +54,7 @@ var winston = require('winston'),
if (err) { if (err) {
return next(err); return next(err);
} }
options.tags = options.tags || [];
if (isMainPost) { if (isMainPost) {
title = title.trim(); title = title.trim();

2
src/routes/admin.js
Unescape Escape View File

@ -2,7 +2,7 @@
function mainRoutes(app, middleware, controllers) { function mainRoutes(app, middleware, controllers) {
app.get('/admin/', middleware.admin.buildHeader, controllers.admin.home); app.get('/admin', middleware.admin.buildHeader, controllers.admin.home);
app.get('/admin/index', middleware.admin.buildHeader, controllers.admin.home); app.get('/admin/index', middleware.admin.buildHeader, controllers.admin.home);
app.get('/api/admin/index', controllers.admin.home); app.get('/api/admin/index', controllers.admin.home);

23
src/routes/api.js
Unescape Escape View File

@ -4,6 +4,7 @@ var path = require('path'),
async = require('async'), async = require('async'),
fs = require('fs'), fs = require('fs'),
nconf = require('nconf'), nconf = require('nconf'),
express = require('express'),
user = require('../user'), user = require('../user'),
topics = require('../topics'), topics = require('../topics'),
@ -178,17 +179,19 @@ function getRecentPosts(req, res, next) {
} }
module.exports = function(app, middleware, controllers) { module.exports = function(app, middleware, controllers) {
app.namespace('/api', function () {
app.get('/config', controllers.api.getConfig);
app.get('/user/uid/:uid', middleware.checkGlobalPrivacySettings, controllers.accounts.getUserByUID); var router = express.Router();
app.get('/get_templates_listing', getTemplatesListing); app.use('/api', router);
app.get('/categories/:cid/moderators', getModerators);
app.get('/recent/posts/:term?', getRecentPosts);
app.post('/post/upload', uploadPost); router.get('/config', controllers.api.getConfig);
app.post('/topic/thumb/upload', uploadThumb);
app.post('/user/:userslug/uploadpicture', middleware.authenticate, middleware.checkGlobalPrivacySettings, middleware.checkAccountPermissions, controllers.accounts.uploadPicture); router.get('/user/uid/:uid', middleware.checkGlobalPrivacySettings, controllers.accounts.getUserByUID);
}); router.get('/get_templates_listing', getTemplatesListing);
router.get('/categories/:cid/moderators', getModerators);
router.get('/recent/posts/:term?', getRecentPosts);
router.post('/post/upload', uploadPost);
router.post('/topic/thumb/upload', uploadThumb);
router.post('/user/:userslug/uploadpicture', middleware.authenticate, middleware.checkGlobalPrivacySettings, middleware.checkAccountPermissions, controllers.accounts.uploadPicture);
}; };

85
src/routes/debug.js
Unescape Escape View File

@ -1,60 +1,61 @@
"use strict"; "use strict";
var user = require('./../user'), var express = require('express'),
user = require('./../user'),
categories = require('./../categories'), categories = require('./../categories'),
topics = require('./../topics'), topics = require('./../topics'),
posts = require('./../posts'); posts = require('./../posts');
module.exports = function(app, middleware, controllers) { module.exports = function(app, middleware, controllers) {
app.namespace('/debug', function() { var router = express.Router();
app.get('/uid/:uid', function (req, res) { app.use('/debug', router);
if (!req.params.uid) { router.get('/uid/:uid', function (req, res) {
return res.redirect('/404'); if (!req.params.uid) {
} return res.redirect('/404');
}
user.getUserData(req.params.uid, function (err, data) { user.getUserData(req.params.uid, function (err, data) {
if (data) { if (data) {
res.send(data); res.send(data);
} else { } else {
res.json(404, { res.json(404, {
error: "User doesn't exist!" error: "User doesn't exist!"
}); });
} }
});
}); });
});
app.get('/cid/:cid', function (req, res) { router.get('/cid/:cid', function (req, res) {
categories.getCategoryData(req.params.cid, function (err, data) { categories.getCategoryData(req.params.cid, function (err, data) {
if (data) { if (data) {
res.send(data); res.send(data);
} else { } else {
res.send(404, "Category doesn't exist!"); res.send(404, "Category doesn't exist!");
} }
});
}); });
});
app.get('/tid/:tid', function (req, res) { router.get('/tid/:tid', function (req, res) {
topics.getTopicData(req.params.tid, function (err, data) { topics.getTopicData(req.params.tid, function (err, data) {
if (data) { if (data) {
res.send(data); res.send(data);
} else { } else {
res.send(404, "Topic doesn't exist!"); res.send(404, "Topic doesn't exist!");
} }
});
}); });
});
app.get('/pid/:pid', function (req, res) { router.get('/pid/:pid', function (req, res) {
posts.getPostData(req.params.pid, function (err, data) { posts.getPostData(req.params.pid, function (err, data) {
if (data) { if (data) {
res.send(data); res.send(data);
} else { } else {
res.send(404, "Post doesn't exist!"); res.send(404, "Post doesn't exist!");
} }
});
}); });
});
app.get('/test', function(req, res) { router.get('/test', function(req, res) {
res.redirect('404'); res.redirect('404');
});
}); });
}; };

126
src/routes/index.js
Unescape Escape View File

@ -1,9 +1,12 @@
"use strict"; "use strict";
var nconf = require('nconf'), var nconf = require('nconf'),
path = require('path'),
winston = require('winston'),
controllers = require('./../controllers'), controllers = require('./../controllers'),
meta = require('./../meta'), meta = require('./../meta'),
plugins = require('./../plugins'), plugins = require('./../plugins'),
express = require('express'),
metaRoutes = require('./meta'), metaRoutes = require('./meta'),
apiRoutes = require('./api'), apiRoutes = require('./api'),
@ -74,8 +77,8 @@ function categoryRoutes(app, middleware, controllers) {
app.get('/recent/:term?', middleware.buildHeader, controllers.categories.recent); app.get('/recent/:term?', middleware.buildHeader, controllers.categories.recent);
app.get('/api/recent/:term?', controllers.categories.recent); app.get('/api/recent/:term?', controllers.categories.recent);
app.get('/unread/', middleware.buildHeader, middleware.authenticate, controllers.categories.unread); app.get('/unread', middleware.buildHeader, middleware.authenticate, controllers.categories.unread);
app.get('/api/unread/', middleware.authenticate, controllers.categories.unread); app.get('/api/unread', middleware.authenticate, controllers.categories.unread);
app.get('/api/unread/total', middleware.authenticate, controllers.categories.unreadTotal); app.get('/api/unread/total', middleware.authenticate, controllers.categories.unreadTotal);
@ -151,38 +154,93 @@ function groupRoutes(app, middleware, controllers) {
module.exports = function(app, middleware) { module.exports = function(app, middleware) {
app.namespace(nconf.get('relative_path'), function() {
plugins.ready(function() {
app.all('/api/*', middleware.updateLastOnlineTime, middleware.prepareAPI);
app.all('/api/admin/*', middleware.admin.isAdmin, middleware.prepareAPI);
app.all('/admin/*', middleware.admin.isAdmin);
app.get('/admin', middleware.admin.isAdmin);
plugins.fireHook('action:app.load', app, middleware, controllers);
adminRoutes(app, middleware, controllers);
metaRoutes(app, middleware, controllers);
apiRoutes(app, middleware, controllers);
feedRoutes(app, middleware, controllers);
pluginRoutes(app, middleware, controllers);
authRoutes.createRoutes(app, middleware, controllers);
/**
* Every view has an associated API route.
*
*/
mainRoutes(app, middleware, controllers);
staticRoutes(app, middleware, controllers);
topicRoutes(app, middleware, controllers);
tagRoutes(app, middleware, controllers);
categoryRoutes(app, middleware, controllers);
accountRoutes(app, middleware, controllers);
userRoutes(app, middleware, controllers);
groupRoutes(app, middleware, controllers);
});
if (process.env.NODE_ENV === 'development') { var router = express.Router();
require('./debug')(app, middleware, controllers); app.use(nconf.get('relative_path'), router);
}
plugins.ready(function() {
router.all('/api/*', middleware.updateLastOnlineTime, middleware.prepareAPI);
router.all('/api/admin/*', middleware.admin.isAdmin, middleware.prepareAPI);
router.all('/admin/*', middleware.admin.isAdmin);
router.get('/admin', middleware.admin.isAdmin);
plugins.fireHook('action:app.load', router, middleware, controllers);
adminRoutes(router, middleware, controllers);
metaRoutes(router, middleware, controllers);
apiRoutes(router, middleware, controllers);
feedRoutes(router, middleware, controllers);
pluginRoutes(router, middleware, controllers);
authRoutes.createRoutes(router, middleware, controllers);
/**
* Every view has an associated API route.
*
*/
mainRoutes(router, middleware, controllers);
staticRoutes(router, middleware, controllers);
topicRoutes(router, middleware, controllers);
tagRoutes(router, middleware, controllers);
categoryRoutes(router, middleware, controllers);
accountRoutes(router, middleware, controllers);
userRoutes(router, middleware, controllers);
groupRoutes(router, middleware, controllers);
app.use(nconf.get('relative_path'), express.static(path.join(__dirname, '../../', 'public'), {
maxAge: app.enabled('cache') ? 5184000000 : 0
}));
app.use(catch404);
app.use(handleErrors);
}); });
if (process.env.NODE_ENV === 'development') {
require('./debug')(app, middleware, controllers);
}
}; };
function handleErrors(err, req, res, next) {
// we may use properties of the error object
// here and next(err) appropriately, or if
// we possibly recovered from the error, simply next().
console.error(err.stack);
var status = err.status || 500;
res.status(status);
req.flash('errorMessage', err.message);
res.redirect('500');
}
function catch404(req, res, next) {
var relativePath = nconf.get('relative_path');
var isLanguage = new RegExp('^' + relativePath + '/language/[\\w]{2,}/.*.json'),
isClientScript = new RegExp('^' + relativePath + '\\/src\\/forum(\\/admin)?\\/.+\\.js');
res.status(404);
if (isClientScript.test(req.url)) {
res.type('text/javascript').send(200, '');
} else if (isLanguage.test(req.url)) {
res.json(200, {});
} else if (req.accepts('html')) {
if (process.env.NODE_ENV === 'development') {
winston.warn('Route requested but not found: ' + req.url);
}
res.redirect(relativePath + '/404');
} else if (req.accepts('json')) {
if (process.env.NODE_ENV === 'development') {
winston.warn('Route requested but not found: ' + req.url);
}
res.json({
error: 'Not found'
});
} else {
res.type('txt').send('Not found');
}
}

5
src/socket.io/index.js
Unescape Escape View File

@ -7,8 +7,7 @@ var SocketIO = require('socket.io'),
path = require('path'), path = require('path'),
fs = require('fs'), fs = require('fs'),
nconf = require('nconf'), nconf = require('nconf'),
express = require('express'), socketCookieParser = require('cookie-parser')(nconf.get('secret')),
socketCookieParser = express.cookieParser(nconf.get('secret')),
winston = require('winston'), winston = require('winston'),
db = require('../database'), db = require('../database'),
@ -60,7 +59,7 @@ Sockets.init = function(server) {
winston.error(err.message); winston.error(err.message);
} }
sessionID = socket.handshake.signedCookies["express.sid"]; sessionID = socket.handshake.signedCookies['express.sid'];
db.sessionStore.get(sessionID, function(err, sessionData) { db.sessionStore.get(sessionID, function(err, sessionData) {
if (!err && sessionData && sessionData.passport && sessionData.passport.user) { if (!err && sessionData && sessionData.passport && sessionData.passport.user) {
uid = parseInt(sessionData.passport.user, 10); uid = parseInt(sessionData.passport.user, 10);

1
src/webserver.js
Unescape Escape View File

@ -2,7 +2,6 @@ var path = require('path'),
fs = require('fs'), fs = require('fs'),
nconf = require('nconf'), nconf = require('nconf'),
express = require('express'), express = require('express'),
express_namespace = require('express-namespace'),
WebServer = express(), WebServer = express(),
server, server,
winston = require('winston'), winston = require('winston'),

Write Preview
Loading…
Cancel
Save