if metadata is empty, return true; if only contains spaces, \t, \n, r…

…eturn true
tus · Jul 31, 2018 · 2f2fc0d · 2f2fc0d
1 parent a819acb
commit 2f2fc0d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/validators/RequestValidator.js b/lib/validators/RequestValidator.js
@@ -34,13 +34,18 @@ class RequestValidator {
     // MUST NOT be empty. The key SHOULD be ASCII encoded and the value MUST
     // be Base64 encoded. All keys MUST be unique.
     static _invalidUploadMetadataHeader(value) {
+        if (value === "") {
+            return true;
+        }
+
         const keypairs = value.split(',')
                               .map((keypair) => keypair.trim());
-
         // Original code: check key/value pair. If value is empty, return true.
         // return keypairs.some((keypair) => keypair.split(' ').length !== 2);
         for (let i = 0; i < keypairs.length; i++) {
-            if (keypairs[i].split(' ').length !== 2) {
+            if (keypairs[i].replace(/\s/g, '').length === 0) {
+                return true;
+            } else if (keypairs[i].split(' ').length !== 2) {
                 log('Empty Metadata: ${keypairs[i]}');
             }
         }

diff --git a/test/Test-RequestValidator.js b/test/Test-RequestValidator.js
@@ -82,7 +82,8 @@ describe('RequestValidator', () => {
         it('should fail on non comma separated list', (done) => {
             assert.equal(RequestValidator._invalidUploadMetadataHeader('hello'), false);
             assert.equal(RequestValidator._invalidUploadMetadataHeader('hello world, tusrules'), false);
-            assert.equal(RequestValidator._invalidUploadMetadataHeader(''), false);
+            assert.equal(RequestValidator._invalidUploadMetadataHeader(''), true);
+            assert.equal(RequestValidator._invalidUploadMetadataHeader('  \t\n'), true);
             done();
         });
     });