Merge pull request #214 from apiaryio/malformed-json-schema

Adds json schema parsing check during body validation

Author: artem-zakharchenko

lib/units/validateBody.js

@@ -102,10 +102,14 @@ function getBodySchemaType(bodySchema) {
   try {
     jph.parse(bodySchema);
     return [null, jsonSchemaType];
-  } catch (exception) {
-    const error = `Can't validate: expected body JSON Schema is not a parseable JSON:\n${exception.message}`;
+  } catch (error) {
+    // Gavel must throw when given malformed JSON Schema.
+    // See https://github.com/apiaryio/gavel.js/issues/203
+    throw new Error(`\
+Failed to validate HTTP message "body": given JSON Schema is not a valid JSON.
 
-    return [error, null];
+${error.message}\
+`);
   }
 }
 
@@ -170,6 +174,7 @@ function validateBody(expected, real) {
     real.headers && real.headers['content-type'],
     'real'
   );
+
   const [expectedTypeError, expectedType] = expected.bodySchema
     ? getBodySchemaType(expected.bodySchema)
     : getBodyType(

test/unit/units/validateBody.test.js

@@ -444,4 +444,34 @@ describe('validateBody', () => {
       });
     });
   });
+
+  describe('given malformed JSON schema', () => {
+    const getResult = () =>
+      validateBody(
+        {
+          // Purposely invalid JSON Schema
+          bodySchema: `
+          {
+            "$schema": "http://json-schema.org/draft-04/schema#",
+            "type": "object",
+            "properties": {
+                "href"": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+          `
+        },
+        {
+          body: '{ "foo": "bar" }'
+        }
+      );
+
+    it('must throw with malformed JSON schema error', () => {
+      expect(getResult).to.throw(
+        /^Failed to validate HTTP message "body": given JSON Schema is not a valid JSON/g
+      );
+    });
+  });
 });

test/unit/units/validateBody/getBodySchemaType.test.js

@@ -1,4 +1,4 @@
-const { assert } = require('chai');
+const { expect } = require('chai');
 const mediaTyper = require('media-typer');
 const { getBodySchemaType } = require('../../../../lib/units/validateBody');
 
@@ -17,14 +17,13 @@ describe('getBodySchemaType', () => {
         const [error, mediaType] = getBodySchemaType(value);
 
         it('returns "application/schema+json" media type', () => {
-          assert.deepEqual(
-            mediaType,
+          expect(mediaType).to.deep.equal(
             mediaTyper.parse('application/schema+json')
           );
         });
 
         it('has no errors', () => {
-          assert.isNull(error);
+          expect(error).to.be.null;
         });
       });
     });
@@ -41,31 +40,25 @@ describe('getBodySchemaType', () => {
         const [error, mediaType] = getBodySchemaType(jsonSchema);
 
         it('returns "application/schema+json" media type', () => {
-          assert.deepEqual(
-            mediaType,
+          expect(mediaType).to.deep.equal(
             mediaTyper.parse('application/schema+json')
           );
         });
 
         it('returns no errors', () => {
-          assert.isNull(error);
+          expect(error).to.be.null;
         });
       });
     });
   });
 
   describe('when given non-JSON string', () => {
-    const [error, mediaType] = getBodySchemaType('foo');
+    const run = () => getBodySchemaType('foo');
 
-    it('returns no media type', () => {
-      assert.isNull(mediaType);
-    });
-
-    it('returns parsing error', () => {
-      assert.match(
-        error,
-        /^Can't validate: expected body JSON Schema is not a parseable JSON:/
-      );
-    });
+    it('throws exception about invalid JSON', () => [
+      expect(run).to.throw(
+        /^Failed to validate HTTP message "body": given JSON Schema is not a valid JSON/
+      )
+    ]);
   });
 });