fix: add extra restrictions to non-cappasity uploads (#42)

* fix: add extra restrictions to non-cappasity uploads

* Add tests for cappasity-upload-pre hook

* delay before sync in tests

Author: jenyapoyarkov

src/custom/cappasity-upload-pre.js

@@ -3,7 +3,7 @@ const Promise = require('bluebird');
 const assert = require('assert');
 const isCappasityUpload = require('../utils/isCappasityUpload');
 
-module.exports = function extractMetadata({ files, meta, temp }) {
+module.exports = function extractMetadata({ files, meta, temp, unlisted, access }) {
   let sourceSHA;
 
   return Promise
@@ -27,19 +27,31 @@ module.exports = function extractMetadata({ files, meta, temp }) {
         }
       });
 
-      if (isCappasityUpload(Object.keys(fileTypes))) {
-        // assert constraints
-        if (differentFileTypes === 1) {
+      const cappasityUpload = isCappasityUpload(Object.keys(fileTypes));
+
+      // assert constraints
+      if (differentFileTypes === 1) {
+        if (cappasityUpload) {
           assert.equal(fileTypes['c-preview'], 1, 'must contain exactly one preview');
-        } else {
-          // must always be true if it's not a simple preview upload
-          assert.equal(fileTypes['c-bin'], 1, 'must contain exactly one binary upload');
-          meta.sourceSHA = sourceSHA;
         }
-      }
 
-      if (meta.export && !temp) {
-        throw new Errors.HttpStatusError(412, 'temp must be set to true');
+        if (!unlisted) {
+          throw new Errors.HttpStatusError(412, 'following upload must be unlisted');
+        }
+
+        if (!access.setPublic) {
+          throw new Errors.HttpStatusError(412, 'following upload must be public');
+        }
+      } else if (cappasityUpload) {
+        // must always be true if it's not a simple preview upload
+        assert.equal(fileTypes['c-bin'], 1, 'must contain exactly one binary upload');
+        meta.sourceSHA = sourceSHA;
+
+        if (meta.export && !temp) {
+          throw new Errors.HttpStatusError(412, 'temp must be set to true');
+        }
+      } else {
+        throw new Errors.HttpStatusError(400, 'should be either a cappasity model or a single image');
       }
     });
 };

test/docker.sh

@@ -10,7 +10,7 @@ COMPOSE=$(which docker-compose)
 MOCHA=$BIN/_mocha
 COVER="$BIN/isparta cover"
 NODE=$BIN/babel-node
-TESTS=${TESTS:-test/suites/*.js}
+TESTS=${TESTS:-test/suites/**/*.js test/suites/*.js}
 COMPOSE_VER=${COMPOSE_VER:-1.7.1}
 COMPOSE="docker-compose -f $DC"
 

test/suites/custom/cappasity-upload-pre.js

@@ -0,0 +1,159 @@
+const assert = require('assert');
+const hook = require('../../../src/custom/cappasity-upload-pre');
+const reject = require('lodash/reject');
+const { inspectPromise } = require('../../helpers/utils');
+
+describe('cappasity-upload-pre hook test suite', function suite() {
+  describe('validate model files', function modelSuite() {
+    const data = {
+      files: [{
+        type: 'c-bin',
+      }, {
+        type: 'c-texture',
+      }, {
+        type: 'c-archive',
+      }],
+      meta: {},
+    };
+
+    it('should pass', function test() {
+      return hook(data)
+        .reflect()
+        .then(inspectPromise());
+    });
+
+    it('should fail due to no c-bin files passed', function test() {
+      const payload = {
+        ...data,
+        files: reject(data.files, { type: 'c-bin' }),
+      };
+
+      return hook(payload)
+        .reflect()
+        .then(inspectPromise(false));
+    });
+
+    it('should fail due to no temp flag passed along with export flag', function test() {
+      const payload = {
+        ...data,
+        meta: {
+          export: true,
+        },
+      };
+
+      return hook(payload)
+        .reflect()
+        .then(inspectPromise(false));
+    });
+
+    it('should fail when several c-bin files are passed', function test() {
+      const payload = {
+        ...data,
+        files: [{
+          type: 'c-bin',
+        }, {
+          type: 'c-bin',
+        }],
+      };
+
+      return hook(payload)
+        .reflect()
+        .then(inspectPromise(false));
+    });
+
+    it('should pass when both flags `export` and `temp` are passed', function test() {
+      const payload = {
+        ...data,
+        export: true,
+        temp: true,
+      };
+
+      return hook(payload)
+        .reflect()
+        .then(inspectPromise());
+    });
+  });
+
+  describe('validate non-model files', function nonModelSuite() {
+    const data = {
+      files: [{
+        type: 'c-preview',
+      }],
+      access: {
+        setPublic: true,
+      },
+      unlisted: true,
+    };
+
+    it('should pass for cappasity preview', function test() {
+      return hook(data)
+        .reflect()
+        .then(inspectPromise());
+    });
+
+    it('should pass for background image', function test() {
+      const payload = {
+        ...data,
+        files: [{
+          type: 'background',
+        }],
+      };
+
+      return hook(payload)
+        .reflect()
+        .then(inspectPromise());
+    });
+
+    it('should fail when passed a single non-preview, non-background file', function test() {
+      const payload = {
+        ...data,
+        files: [{
+          type: 'c-bin',
+        }],
+      };
+
+      return hook(payload)
+        .reflect()
+        .then(inspectPromise(false));
+    });
+
+    it('should fail when file is private', function test() {
+      const payload = {
+        ...data,
+        access: {
+          setPublic: false,
+        },
+      };
+
+      return hook(payload)
+        .reflect()
+        .then(inspectPromise(false));
+    });
+
+    it('should fail when file is listed', function test() {
+      const payload = {
+        ...data,
+        unlisted: false,
+      };
+
+      return hook(payload)
+        .reflect()
+        .then(inspectPromise(false));
+    });
+
+    it('should fail when several non-model files are passed', function test() {
+      const payload = {
+        ...data,
+        files: [{
+          type: 'background',
+        }, {
+          type: 'c-preview',
+        }],
+      };
+
+      return hook(payload)
+        .reflect()
+        .then(inspectPromise(false));
+    });
+  });
+});

test/suites/sync.js

@@ -25,6 +25,8 @@ describe('finish upload suite', function suite() {
   // tear-down
   after('stop service', stopService);
 
+  it('...wait while upload completes', () => Promise.delay(10000));
+
   it('runs sync service', function test() {
     return this.send({}, 15000);
   });