From 9922164343338dd36d970bb85e3eacfcdc2f3141 Mon Sep 17 00:00:00 2001
From: quim <joaquim.serafim@gmail.com>
Date: Sat, 18 Apr 2015 16:47:24 +0100
Subject: [PATCH] v.1.5.3

---
 index.js     | 31 ++++++++++++++++++-------------
 package.json |  4 ++--
 test/test.js |  4 +++-
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/index.js b/index.js
index 282a09f..be0c707 100644
--- a/index.js
+++ b/index.js
@@ -88,8 +88,9 @@ jwt.encode = function encode(key, payload, algorithm, cb) {
 
   // verify key & payload
   if (!key || !payload) {
-    return utils
-    .fnError(new JWTError('The key and payload are mandatory!'), cb);
+    return utils.fnError(
+      new JWTError('The key and payload are mandatory!'), cb
+    );
   } else if (!Object.keys(payload).length) {
     return utils.fnError(new JWTError('The payload is empty object!'), cb);
   } else {
@@ -99,15 +100,15 @@ jwt.encode = function encode(key, payload, algorithm, cb) {
     // get algorithm hash and type and check if is valid
     algorithm = this._search(algorithm);
 
-    if (!algorithm) {
-      return utils
-        .fnError(new JWTError('The algorithm is not supported!'), cb);
-    } else {
+    if (algorithm) {
       var parts = b64url.encode(header) +
         '.' + b64url.encode(JSON.stringify(payload));
-
       var res = utils.sign(algorithm, key, parts);
       return utils.fnResult(parts + '.' + res, cb);
+    } else {
+      return utils.fnError(
+        new JWTError('The algorithm is not supported!'), cb
+      );
     }
   }
 };
@@ -120,8 +121,9 @@ jwt.decode = function decode(key, token, cb) {
 
     // check all parts're present
     if (parts.length !== 3) {
-      return utils
-        .fnError(new JWTError('The JWT should consist of three parts!'), cb);
+      return utils.fnError(
+        new JWTError('The JWT should consist of three parts!'), cb
+      );
     }
 
     // base64 decode and parse JSON
@@ -132,14 +134,17 @@ jwt.decode = function decode(key, token, cb) {
     var algorithm = this._search(header.alg);
 
     if (!algorithm) {
-      return utils
-        .fnError(new JWTError('The algorithm is not supported!'), cb);
+      return utils.fnError(
+        new JWTError('The algorithm is not supported!'), cb
+      );
     } else {
       // verify the signature
-      var res = utils.verify(algorithm,
+      var res = utils.verify(
+        algorithm,
         key,
         parts.slice(0, 2).join('.'),
-        parts[2]);
+        parts[2]
+      );
 
       if (res) {
         return utils.fnResult(payload, cb);
diff --git a/package.json b/package.json
index 2cdd8d1..30f33d1 100644
--- a/package.json
+++ b/package.json
@@ -39,9 +39,9 @@
   "devDependencies": {
     "istanbul": "^0.3.13",
     "jscs": "^1.12.0",
-    "jshint": "^2.6.3",
+    "jshint": "^2.7.0",
     "pre-commit": "^1.0.6",
-    "tape": "^3.5.0"
+    "tape": "^4.0.0"
   },
   "pre-commit": [
     "jshint",
diff --git a/test/test.js b/test/test.js
index dc4ed5d..1138d37 100644
--- a/test/test.js
+++ b/test/test.js
@@ -185,7 +185,9 @@ test('jwt - encode without callback / null secret', function(assert) {
 });
 
 //
-//
+// test the jwt vulnerability because of the "none" algorithm
+// this alg is intended to be used for situations where the integrity
+// of the token has already been verified
 //
 
 test('should not encode for the "none" algorithm', function(assert) {