Merge pull request #142 from apiaryio/honzajavorek/update-deps

Update dependencies

Author: honzajavorek

lib/mixins/validatable-http-message.js

@@ -1,5 +1,6 @@
 const jph = require('json-parse-helpfulerror');
 const mediaTyper = require('media-typer');
+const contentType = require('content-type');
 const isset = require('../utils/isset');
 const validators = require('../validators');
 
@@ -424,17 +425,23 @@ but body is not a parseable JSON:\n${error.message}\
     );
   }
 
-  isJsonContentType(contentType) {
-    if (!contentType) {
+  isJsonContentType(contentTypeValue) {
+    if (!contentTypeValue) {
+      return false;
+    }
+    try {
+      const { type } = contentType.parse(`${contentTypeValue}`);
+      const parsed = mediaTyper.parse(type);
+      return (
+        (parsed.type === 'application' && parsed.subtype === 'json')
+        || parsed.suffix === 'json'
+      );
+    } catch (e) {
+      // The Content-Type value is basically a user input, it can be any
+      // kind of rubbish, and it is neither this function's nor Gavel's problem
+      // if it's invalid
       return false;
     }
-
-    const parsed = mediaTyper.parse(`${contentType}`);
-    const isJson =
-      (parsed.type === 'application' && parsed.subtype === 'json') ||
-      parsed.suffix === 'json';
-
-    return isJson;
   }
 }