Upload-Defer-Length value MUST be 1

Author: bhstahl

lib/handlers/HeadHandler.js

@@ -32,7 +32,7 @@ class HeadHandler extends BaseHandler {
                     return super.send(res, error);
                 }
 
-                return super.send(res, 404);
+                return super.send(res, 500);
             });
     }
 }

lib/handlers/PatchHandler.js

@@ -56,7 +56,7 @@ class PatchHandler extends BaseHandler {
                     return super.send(res, error);
                 }
 
-                return super.send(res, 404);
+                return super.send(res, 500);
             });
     }
 }

lib/handlers/PostHandler.js

@@ -16,13 +16,19 @@ class PostHandler extends BaseHandler {
         const deferred_length = req.headers['upload-defer-length'];
         // The request MUST include a Upload-Length or Upload-Defer-Length header
         if (!length && !deferred_length) {
-            return super.send(res, 400, { 'Content-Type': 'text/plain' }, 'Upload-Length or Upload-Defer-Length required');
+            return super.send(res, 400);
         }
 
         length = parseInt(length, 10);
         // The value MUST be a non-negative integer.
         if (isNaN(length) || length < 0) {
-            return super.send(res, 400, { 'Content-Type': 'text/plain' }, 'Upload-Length must be non-negative');
+            return super.send(res, 400);
+        }
+
+        length = parseInt(length, 10);
+        // The Upload-Defer-Length value MUST be 1.
+        if (deferred_length && deferred_length !== '1') {
+            return super.send(res, 400);
         }
 
         const file = new File(length);
@@ -32,7 +38,11 @@ class PostHandler extends BaseHandler {
                 return super.send(res, 201, { Location: url });
             })
             .catch((error) => {
-                super.send(res, 404);
+                if (Number.isInteger(error)) {
+                    return super.send(res, error);
+                }
+
+                return super.send(res, 500);
             });
     }
 }

test/Test-PostHandler.js

@@ -1,3 +1,5 @@
+/* eslint-env node, mocha */
+/* eslint no-unused-vars: ["error", { "vars": "none" }] */
 'use strict';
 
 const assert = require('assert');
@@ -6,10 +8,6 @@ const http = require('http');
 const DataStore = require('../lib/stores/DataStore');
 const PostHandler = require('../lib/handlers/PostHandler');
 
-let pluckBody = (res) => {
-    return /\n(.*)$/.exec(res.output[0])[1];
-}
-
 describe('PostHandler', () => {
     let res = null;
     let store = new DataStore({ path: '/files' });
@@ -25,8 +23,7 @@ describe('PostHandler', () => {
     it('MUST require the Upload-Length or Upload-Defer-Length required header', (done) => {
         req.headers = {};
         handler.send(req, res);
-        assert.equal(res.statusCode, 400)
-        assert.equal(pluckBody(res), 'Upload-Length or Upload-Defer-Length required');
+        assert.equal(res.statusCode, 400);
         done();
     });
 
@@ -35,8 +32,16 @@ describe('PostHandler', () => {
             'upload-length': -2
         };
         handler.send(req, res);
-        assert.equal(res.statusCode, 400)
-        assert.equal(pluckBody(res), 'Upload-Length must be non-negative');
+        assert.equal(res.statusCode, 400);
+        done();
+    });
+
+    it('The Upload-Defer-Length value MUST be 1', (done) => {
+        req.headers = {
+            'upload-defer-length': 5
+        };
+        handler.send(req, res);
+        assert.equal(res.statusCode, 400);
         done();
     });
 

test/Test-Server.js

@@ -69,15 +69,15 @@ describe('Server', () => {
         request(server.listen())
           .post(server.datastore.path)
           .set('Tus-Resumable', TUS_RESUMABLE)
-          .expect(400, 'Upload-Length or Upload-Defer-Length required', done)
+          .expect(400, {}, done)
     });
 
     it('POST should require non negative Upload-Length number', (done) => {
         request(server.listen())
           .post(server.datastore.path)
           .set('Tus-Resumable', TUS_RESUMABLE)
           .set('Upload-Length', -3)
-          .expect(400, 'Upload-Length must be non-negative', done)
+          .expect(400, {}, done)
     });
 
     it('should 404 other requests', (done) => {