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

Serve immediate 404 for static files (no fallthru)

Browse source 
closes #5887

- make use of the new 'fallthrough' option which landed in express-static 1.10.0
- change local-file-store and middleware serving `/public/` and `/shared/` files to use the new `fallthrough: false` option
- 404s are now served directly, without slashes or uncapitalise getting triggered
This commit is contained in:
Hannah Wolfe 2015-09-27 20:14:09 +01:00
parent 6bbcbab3f3
commit a59cfc70a1
3 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,10 @@
var bodyParser = require('body-parser'), var bodyParser = require('body-parser'),
config = require('../config'), config = require('../config'),
errors = require('../errors'), errors = require('../errors'),
express = require('express'),
logger = require('morgan'), logger = require('morgan'),
path = require('path'), path = require('path'),
routes = require('../routes'), routes = require('../routes'),
serveStatic = require('express').static,
slashes = require('connect-slashes'), slashes = require('connect-slashes'),
storage = require('../storage'), storage = require('../storage'),
passport = require('passport'), passport = require('passport'),
@ -78,9 +78,15 @@ setupMiddleware = function setupMiddleware(blogApp, adminApp) {
blogApp.use(serveSharedFile('shared/ghost-url.min.js', 'application/javascript', utils.ONE_HOUR_S)); blogApp.use(serveSharedFile('shared/ghost-url.min.js', 'application/javascript', utils.ONE_HOUR_S));
// Static assets // Static assets
blogApp.use('/shared', express.static(path.join(corePath, '/shared'), {maxAge: utils.ONE_HOUR_MS})); blogApp.use('/shared', serveStatic(
path.join(corePath, '/shared'),
{maxAge: utils.ONE_HOUR_MS, fallthrough: false}
));
blogApp.use('/content/images', storage.getStorage().serve()); blogApp.use('/content/images', storage.getStorage().serve());
blogApp.use('/public', express.static(path.join(corePath, '/built/public'), {maxAge: utils.ONE_YEAR_MS})); blogApp.use('/public', serveStatic(
path.join(corePath, '/built/public'),
{maxAge: utils.ONE_YEAR_MS, fallthrough: false}
));
// First determine whether we're serving admin or theme content // First determine whether we're serving admin or theme content
blogApp.use(decideIsAdmin); blogApp.use(decideIsAdmin);
@ -88,7 +94,10 @@ setupMiddleware = function setupMiddleware(blogApp, adminApp) {
blogApp.use(themeHandler.configHbsForContext); blogApp.use(themeHandler.configHbsForContext);
// Admin only config // Admin only config
blogApp.use('/ghost', express.static(config.paths.clientAssets, {maxAge: utils.ONE_YEAR_MS})); blogApp.use('/ghost', serveStatic(
config.paths.clientAssets,
{maxAge: utils.ONE_YEAR_MS}
));
// Force SSL // Force SSL
// NOTE: Importantly this is _after_ the check above for admin-theme static resources, // NOTE: Importantly this is _after_ the check above for admin-theme static resources,

21
core/server/storage/local-file-store.js
View file

@ -1,15 +1,15 @@
// # Local File System Image Storage module // # Local File System Image Storage module
// The (default) module for storing images, using the local file system // The (default) module for storing images, using the local file system
var express = require('express'), var serveStatic = require('express').static,
fs = require('fs-extra'), fs = require('fs-extra'),
path = require('path'), path = require('path'),
util = require('util'), util = require('util'),
Promise = require('bluebird'), Promise = require('bluebird'),
errors = require('../errors'), errors = require('../errors'),
config = require('../config'), config = require('../config'),
utils = require('../utils'), utils = require('../utils'),
baseStore = require('./base'); baseStore = require('./base');
function LocalFileStore() { function LocalFileStore() {
} }
@ -52,7 +52,8 @@ LocalFileStore.prototype.exists = function (filename) {
// middleware for serving the files // middleware for serving the files
LocalFileStore.prototype.serve = function () { LocalFileStore.prototype.serve = function () {
// For some reason send divides the max age number by 1000 // For some reason send divides the max age number by 1000
return express.static(config.paths.imagesPath, {maxAge: utils.ONE_YEAR_MS}); // Fallthrough: false ensures that if an image isn't found, it automatically 404s
return serveStatic(config.paths.imagesPath, {maxAge: utils.ONE_YEAR_MS, fallthrough: false});
}; };
module.exports = LocalFileStore; module.exports = LocalFileStore;

8
core/test/functional/routes/frontend_spec.js
View file

@ -86,6 +86,14 @@ describe('Frontend Routing', function () {
.expect(/Page not found/) .expect(/Page not found/)
.end(doEnd(done)); .end(doEnd(done));
}); });
it('should 404 for unknown file', function (done) {
request.get('/content/images/some/file/that/doesnt-exist.jpg')
.expect('Cache-Control', testUtils.cacheRules['private'])
.expect(404)
.expect(/Page not found/)
.end(doEnd(done));
});
}); });
describe('Single post', function () { describe('Single post', function () {