Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-10 23:36:14 -05:00
Code Issues Activity

Switch middleware order to result in proper error

Browse source 
fixes #3694

- Split the res.isAdmin check out into it's own thing because we need to detect whether we are in the admin, before everything else
This commit is contained in:
Hannah Wolfe 2014-08-08 17:17:07 +01:00
parent 8cf270aad2
commit 7d37a829c3
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/server/middleware/index.js
View file

@ -80,13 +80,17 @@ function activateTheme(activeTheme) {
// Set active theme variable on the express server // Set active theme variable on the express server
expressServer.set('activeTheme', activeTheme); expressServer.set('activeTheme', activeTheme);
} }
// ### decideIsAdmin Middleware
// ### decideContext Middleware
// Uses the URL to detect whether this response should be an admin response // Uses the URL to detect whether this response should be an admin response
// This is used to ensure the right content is served, and is not for security purposes // This is used to ensure the right content is served, and is not for security purposes
function decideContext(req, res, next) { function decideIsAdmin(req, res, next) {
res.isAdmin = req.url.lastIndexOf(config.paths.subdir + '/ghost/', 0) === 0; res.isAdmin = req.url.lastIndexOf(config.paths.subdir + '/ghost/', 0) === 0;
next();
}
// ### configHbsForContext Middleware
// Setup handlebars for the current context (admin or theme)
function configHbsForContext(req, res, next) {
if (res.isAdmin) { if (res.isAdmin) {
expressServer.enable('admin'); expressServer.enable('admin');
expressServer.engine('hbs', expressServer.get('admin view engine')); expressServer.engine('hbs', expressServer.get('admin view engine'));
@ -257,8 +261,9 @@ setupMiddleware = function (server) {
expressServer.use(subdir + '/public', express['static'](path.join(corePath, '/built/public'), {maxAge: utils.ONE_YEAR_MS})); expressServer.use(subdir + '/public', express['static'](path.join(corePath, '/built/public'), {maxAge: utils.ONE_YEAR_MS}));
// First determine whether we're serving admin or theme content // First determine whether we're serving admin or theme content
expressServer.use(decideIsAdmin);
expressServer.use(updateActiveTheme); expressServer.use(updateActiveTheme);
expressServer.use(decideContext); expressServer.use(configHbsForContext);
// Admin only config // Admin only config
expressServer.use(subdir + '/ghost', middleware.whenEnabled('admin', express['static'](path.join(corePath, '/client/assets'), {maxAge: utils.ONE_YEAR_MS}))); expressServer.use(subdir + '/ghost', middleware.whenEnabled('admin', express['static'](path.join(corePath, '/client/assets'), {maxAge: utils.ONE_YEAR_MS})));