Allow ?metadata even when the C-T is unlisted in allowedImageSourceCo…

…ntentTypes.
papandreou · Nov 9, 2016 · 8e27f0e · 8e27f0e
1 parent 33fab6f
commit 8e27f0e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/processImage.js b/lib/processImage.js
@@ -188,7 +188,7 @@ module.exports = function (options) {
 
                 var contentType = res.getHeader('Content-Type');
 
-                if (contentType && (!options.allowedImageSourceContentTypes || options.allowedImageSourceContentTypes.indexOf(contentType) !== -1) && (contentType.indexOf('image/') === 0 || isMetadataRequest)) {
+                if (isMetadataRequest || (contentType && (options.allowedImageSourceContentTypes ? options.allowedImageSourceContentTypes.indexOf(contentType) !== -1 : contentType.indexOf('image/') === 0))) {
                     sourceMetadata = {
                         contentType: contentType,
                         filesize: contentLengthHeaderValue && parseInt(contentLengthHeaderValue, 10),

diff --git a/test/processImage.js b/test/processImage.js
@@ -414,6 +414,17 @@ describe('express-processimage', function () {
             });
         });
 
+        it('should allow retrieving the metadata of a non-image file with a non-image extension, even when unlisted in allowedImageSourceContentTypes', function () {
+            config.allowedImageSourceContentTypes = ['image/png'];
+            return expect('GET /something.txt?metadata', 'to yield response', {
+                body: {
+                    contentType: 'text/plain; charset=UTF-8',
+                    filesize: 4,
+                    etag: expect.it('to be a string')
+                }
+            });
+        });
+
         it('should set animated:true for an animated gif', function () {
             return expect('GET /animated.gif?metadata', 'to yield response', {
                 body: {