fix: return a json response when a incomplete url is requested

dadi/lib/storage/disk.js

@@ -35,13 +35,13 @@ DiskStorage.prototype.getDefaultFile = function () {
     let fullUrl = this.getFullUrl()
 
     fs.lstat(fullUrl, (err, stats) => {
-      if (err) return reject(err)
+      if (err) return resolve()
 
       if (stats.isDirectory()) {
         let defaultFiles = config.get('defaultFiles')
 
         fs.readdir(fullUrl, (err, files) => {
-          if (err) return reject(err)
+          if (err) return resolve()
 
           files = files.filter(file => defaultFiles.includes(path.basename(file)))
 
@@ -58,7 +58,9 @@ DiskStorage.prototype.get = function () {
 
     // If we're looking at a directory (assumed because no extension),
     // attempt to get a configured default file from the directory
-    if (path.parse(this.getFullUrl()).ext === '') {
+    let isDirectory = path.parse(this.getFullUrl()).ext === ''
+
+    if (isDirectory) {
       wait = this.getDefaultFile()
     }
 
@@ -97,7 +99,8 @@ DiskStorage.prototype.get = function () {
         }
 
         return new Missing().get({
-          domain: this.domain
+          domain: this.domain,
+          isDirectory: isDirectory
         }).then(stream => {
           this.notFound = true
           this.lastModified = new Date()

dadi/lib/storage/http.js

@@ -114,11 +114,11 @@ HTTPStorage.prototype.get = function ({
 
         if (statusCode === 404) {
           new Missing().get({
-            domain: this.domain
+            domain: this.domain,
+            isDirectory: path.parse(this.getFullUrl()).ext === ''
           }).then(stream => {
             this.notFound = true
             this.lastModified = new Date()
-
             resolve(stream)
           }).catch(() => {
             reject(httpError)

dadi/lib/storage/missing.js

@@ -4,22 +4,23 @@ const config = require(path.join(__dirname, '/../../../config'))
 
 const Missing = function () {}
 
-Missing.prototype.get = function ({domain} = {}) {
+Missing.prototype.get = function ({domain, isDirectory = false}) {
   let imagePath = config.get('notFound.images.enabled', domain)
     ? config.get('notFound.images.path', domain)
     : null
 
   return new Promise((resolve, reject) => {
-    if (!imagePath) {
+    if (!imagePath || isDirectory) {
       return reject({ statusCode: 404 })
     }
 
-    let stream = fs.createReadStream(imagePath)
     let errorNotFound = {
       statusCode: 404,
       message: `File not found: ${imagePath}`
     }
 
+    let stream = fs.createReadStream(imagePath)
+
     stream.on('open', () => {
       // Check file size.
       fs.stat(imagePath, (error, stats) => {

dadi/lib/storage/s3.js

@@ -70,7 +70,8 @@ S3Storage.prototype.get = function () {
     (error) => {
       if (error.statusCode === 404) {
         return new Missing().get({
-          domain: this.domain
+          domain: this.domain,
+          isDirectory: path.parse(this.getFullUrl()).ext === ''
         }).then(stream => {
           this.notFound = true
           this.lastModified = new Date()

test/acceptance/controller.js

@@ -1035,6 +1035,27 @@ describe('Controller', function () {
           })
       })
 
+      it('should return a json response when a directory is requested', function (done) {
+
+        config.set('notFound.images.enabled', true)
+        config.set('notFound.images.path', './test/images/missing.png')
+        config.set('notFound.statusCode', 410)
+
+        let client = request(cdnUrl)
+          .get('/path/to/missing/')
+          .expect(410)
+          .end((err, res) => {
+            res.body.message.includes('File not found:').should.eql(true)
+            res.statusCode.should.eql(404)
+
+            config.set('notFound.images.enabled', configBackup.notFound.images.enabled)
+            config.set('notFound.statusCode', configBackup.notFound.statusCode)
+
+            done()
+          })
+
+      })
+
       describe('when multi-domain is enabled', () => {
         let fallbackImages = {
           localhost: 'test/images/original.jpg',
@@ -1430,7 +1451,7 @@ describe('Controller', function () {
               res.headers['content-type'].should.eql('image/png')
               res.statusCode.should.eql(410)
 
-              config.set('notFound.images.enabled', configBackup.notFound.statusCode)
+              config.set('notFound.images.enabled', configBackup.notFound.images.enabled)
               config.set('notFound.statusCode', configBackup.notFound.statusCode)
 
               done()
@@ -1646,6 +1667,30 @@ describe('Controller', function () {
         })
       })
 
+      it('should return a json response when a directory is requested', function (done) {
+        // return 404 from the S3 request
+        AWS.mock('S3', 'getObject', Promise.reject({ statusCode: 404 }))
+
+        config.set('images.s3.bucketName', 'test-bucket')
+        config.set('images.s3.accessKey', 'xxx')
+        config.set('images.s3.secretKey', 'xyz')
+        config.set('notFound.statusCode', 404)
+        config.set('notFound.images.enabled', true)
+        config.set('notFound.images.path', './test/images/')
+
+        let client = request(cdnUrl)
+          .get('/images/mock/')
+          .expect(404)
+          .end((err, res) => {
+            AWS.restore()
+
+            res.body.message.includes('File not found:').should.eql(true)
+            res.statusCode.should.eql(404)
+
+            done()
+          })
+      })
+
       it('should return configured statusCode if image is not found', function (done) {
         // return 404 from the S3 request
         AWS.mock('S3', 'getObject', Promise.reject({ statusCode: 404 }))