Merge pull request #18 from jeskew/fix/json-messages

Update MessageValidator#validate to accept JSON-encoded messages

Author: jeskew

index.js

@@ -189,15 +189,23 @@ function MessageValidator(hostPattern, encoding) {
  * @param {validationCallback} cb
  */
 MessageValidator.prototype.validate = function (hash, cb) {
-    var hostPattern = this.hostPattern;
+    if (typeof hash === 'string') {
+        try {
+            hash = JSON.parse(hash);
+        } catch (err) {
+            cb(err);
+            return;
+        }
+    }
+
     hash = convertLambdaMessage(hash);
 
     if (!validateMessageStructure(hash)) {
         cb(new Error('Message missing required keys.'));
         return;
     }
 
-    if (!validateUrl(hash['SigningCertURL'], hostPattern)) {
+    if (!validateUrl(hash['SigningCertURL'], this.hostPattern)) {
         cb(new Error('The certificate is located on an invalid domain.'));
         return;
     }

package.json

@@ -7,9 +7,6 @@
     "url": "https://github.com/aws/aws-js-sns-message-validator.git"
   },
   "main": "index.js",
-  "directories": {
-    "test": "test"
-  },
   "devDependencies": {
     "chai": "^3.3.0",
     "mocha": "^2.3.3",
@@ -19,7 +16,7 @@
     "underscore": "^1.8.3"
   },
   "scripts": {
-    "test": "node_modules/mocha/bin/mocha"
+    "test": "mocha"
   },
   "keywords": [
     "AWS",

test/validator.js

@@ -210,6 +210,11 @@ describe('Message Validator', function () {
             (new MessageValidator(/^localhost:56789$/))
                 .validate(validMessage, done);
         });
+
+        it('should accept valid messages as JSON strings', function (done) {
+            (new MessageValidator(/^localhost:56789$/))
+                .validate(JSON.stringify(validMessage), done);
+        });
     });
 
     describe('subscription control message validation', function () {
@@ -239,7 +244,6 @@ describe('Message Validator', function () {
     });
 
     describe('UTF8 message validation', function () {
-
         it('should accept a valid UTF8 message', function (done) {
             (new MessageValidator(/^localhost:56789$/, 'utf8'))
                 .validate(utf8Message, done);