Fixes #272 use content-disposition library for blob

webgme · Apr 3, 2015 · fd3c1db · fd3c1db
1 parent 258d1a0
commit fd3c1db
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -31,6 +31,7 @@
     "commander": "=2.7.1",
     "compression": "=1.4.3",
     "connect-multiparty": "=1.2.5",
+    "content-disposition": "^0.5.0",
     "cookie-parser": "=1.3.4",
     "debug": "=2.1.3",
     "express": "=4.12.3",

diff --git a/src/server/middleware/blob/BlobServer.js b/src/server/middleware/blob/BlobServer.js
@@ -8,7 +8,8 @@
 'use strict';
 
 var mime = require('mime'),
-    BlobMetadata = requireJS('blob/BlobMetadata');
+    BlobMetadata = requireJS('blob/BlobMetadata'),
+    contentDisposition = require('content-disposition');
 
 function createExpressBlob(__app, blobBackend, ensureAuthenticated, __logger) {
     __app.get('/rest/blob/metadata', ensureAuthenticated, function (req, res) {
@@ -136,7 +137,7 @@ function createExpressBlob(__app, blobBackend, ensureAuthenticated, __logger) {
                 var mimeType = mime.lookup(filename);
 
                 if (download || mimeType === 'application/octet-stream' || mimeType === 'application/zip') {
-                    res.setHeader('Content-disposition', 'attachment; filename=' + filename);
+                    res.setHeader('Content-Disposition', contentDisposition(filename, {type: 'attachment'}));
                 }
                 res.setHeader('Content-type', mimeType);
 

diff --git a/test/server/middleware/blob/BlobServer.spec.js b/test/server/middleware/blob/BlobServer.spec.js
@@ -12,9 +12,11 @@ describe('BlobServer', function () {
     var gmeConfig = testFixture.getGmeConfig(),
         agent = testFixture.superagent.agent(),
         should = testFixture.should,
+        expect = testFixture.expect,
         rimraf = testFixture.rimraf,
         BlobClient = testFixture.BlobClient,
         Artifact = testFixture.requirejs('blob/Artifact'),
+        contentDisposition = require('content-disposition'),
         server,
         serverBaseUrl,
         bcParam = {};
@@ -120,8 +122,38 @@ describe('BlobServer', function () {
                     return;
                 }
                 agent.get(serverBaseUrl + '/rest/blob/download/' + hash).end(function (err, res) {
+                    var checkContentDisposition = function () {
+                        return contentDisposition.parse(res.header['content-disposition']);
+                    };
                     should.equal(res.status, 200, err);
-                    should.equal(res.header['content-disposition'], 'attachment; filename=notPublic.zip');
+                    expect(checkContentDisposition).to.not.throw(TypeError);
+                    should.equal(checkContentDisposition().parameters.filename, 'notPublic.zip');
+                    done();
+                });
+            });
+        });
+    });
+
+    it('should download non-public artifact "Case (1).zip" at /rest/blob/download/valid-hash', function (done) {
+        var bc = new BlobClient(bcParam),
+            artifact = new Artifact('Case (1)', bc);
+        artifact.addFile('tt.txt', 'ttt', function (err/*, fHash*/) {
+            if (err) {
+                done(err);
+                return;
+            }
+            artifact.save(function (err, hash) {
+                if (err) {
+                    done(err);
+                    return;
+                }
+                agent.get(serverBaseUrl + '/rest/blob/download/' + hash).end(function (err, res) {
+                    var checkContentDisposition = function () {
+                        return contentDisposition.parse(res.header['content-disposition']);
+                    };
+                    should.equal(res.status, 200, err);
+                    expect(checkContentDisposition).to.not.throw(TypeError);
+                    should.equal(checkContentDisposition().parameters.filename, 'Case (1).zip');
                     done();
                 });
             });
@@ -137,8 +169,12 @@ describe('BlobServer', function () {
                 return;
             }
             agent.get(serverBaseUrl + '/rest/blob/download/' + hash).end(function (err, res) {
+                var checkContentDisposition = function () {
+                    return contentDisposition.parse(res.header['content-disposition']);
+                };
                 should.equal(res.status, 200, err);
-                should.equal(res.header['content-disposition'], 'attachment; filename=notPublic.zip');
+                expect(checkContentDisposition).to.not.throw(TypeError);
+                should.equal(checkContentDisposition().parameters.filename, 'notPublic.zip');
                 done();
             });
         });
@@ -158,8 +194,12 @@ describe('BlobServer', function () {
                     return;
                 }
                 agent.get(serverBaseUrl + '/rest/blob/view/' + hash).end(function (err, res) {
+                    var checkContentDisposition = function () {
+                        return contentDisposition.parse(res.header['content-disposition']);
+                    };
                     should.equal(res.status, 200, err);
-                    should.equal(res.header['content-disposition'], 'attachment; filename=notPublic.zip');
+                    expect(checkContentDisposition).to.not.throw(TypeError);
+                    should.equal(checkContentDisposition().parameters.filename, 'notPublic.zip');
                     done();
                 });
             });
@@ -175,8 +215,12 @@ describe('BlobServer', function () {
                 return;
             }
             agent.get(serverBaseUrl + '/rest/blob/view/' + hash).end(function (err, res) {
+                var checkContentDisposition = function () {
+                    return contentDisposition.parse(res.header['content-disposition']);
+                };
                 should.equal(res.status, 200, err);
-                should.equal(res.header['content-disposition'], 'attachment; filename=notPublic.zip');
+                expect(checkContentDisposition).to.not.throw(TypeError);
+                should.equal(checkContentDisposition().parameters.filename, 'notPublic.zip');
                 done();
             });
         });