maxAge: Add validation to timespan result

ziluvatar · ziluvatar · commit 66a4f8b996c8 · 2017-08-29T12:24:08.000+02:00
diff --git a/test/verify.tests.js b/test/verify.tests.js
@@ -115,7 +115,7 @@ describe('verify', function() {
 
     describe('option: maxAge', function () {
 
-      ['3s', 3].forEach(function(maxAge) {
+      [String('3s'), '3s', 3].forEach(function(maxAge) {
         it(`should error for claims issued before a certain timespan (${typeof maxAge} type)`, function (done) {
           clock = sinon.useFakeTimers(1437018587000); // iat + 5s, exp - 5s
           var options = {algorithms: ['HS256'], maxAge: maxAge};
@@ -131,7 +131,7 @@ describe('verify', function() {
         });
       });
 
-      ['5s', 5].forEach(function (maxAge) {
+      [String('5s'), '5s', 5].forEach(function (maxAge) {
         it(`should not error for claims issued before a certain timespan but still inside clockTolerance timespan (${typeof maxAge} type)`, function (done) {
           clock = sinon.useFakeTimers(1437018587500); // iat + 5.5s, exp - 4.5s
           var options = {algorithms: ['HS256'], maxAge: maxAge, clockTolerance: 1 };
@@ -144,7 +144,7 @@ describe('verify', function() {
         });
       });
 
-      ['6s', 6].forEach(function (maxAge) {
+      [String('6s'), '6s', 6].forEach(function (maxAge) {
         it(`should not error if within maxAge timespan (${typeof maxAge} type)`, function (done) {
           clock = sinon.useFakeTimers(1437018587500);// iat + 5.5s, exp - 4.5s
           var options = {algorithms: ['HS256'], maxAge: maxAge};
@@ -157,7 +157,7 @@ describe('verify', function() {
         });
       });
 
-      ['8s', 8].forEach(function (maxAge) {
+      [String('8s'), '8s', 8].forEach(function (maxAge) {
         it(`can be more restrictive than expiration (${typeof maxAge} type)`, function (done) {
           clock = sinon.useFakeTimers(1437018591900); // iat + 9.9s, exp - 0.1s
           var options = {algorithms: ['HS256'], maxAge: maxAge };
@@ -173,7 +173,7 @@ describe('verify', function() {
         });
       });
 
-      ['12s', 12].forEach(function (maxAge) {
+      [String('12s'), '12s', 12].forEach(function (maxAge) {
         it(`cannot be more permissive than expiration (${typeof maxAge} type)`, function (done) {
           clock = sinon.useFakeTimers(1437018593000); // iat + 11s, exp + 1s
           var options = {algorithms: ['HS256'], maxAge: '12s'};
@@ -190,6 +190,20 @@ describe('verify', function() {
         });
       });
 
+      [new String('1s'), 'no-timespan-string'].forEach(function (maxAge){
+        it(`should error if maxAge is specified with a wrong string format/type (value: ${maxAge}, type: ${typeof maxAge})`, function (done) {
+          clock = sinon.useFakeTimers(1437018587000); // iat + 5s, exp - 5s
+          var options = { algorithms: ['HS256'], maxAge: maxAge };
+
+          jwt.verify(token, key, options, function (err, p) {
+            assert.equal(err.name, 'JsonWebTokenError');
+            assert.equal(err.message, '"maxAge" should be a number of seconds or string representing a timespan eg: "1d", "20h", 60');
+            assert.isUndefined(p);
+            done();
+          });
+        });
+      });
+
       it('should error if maxAge is specified but there is no iat claim', function (done) {
         var token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJmb28iOiJiYXIifQ.0MBPd4Bru9-fK_HY3xmuDAc6N_embknmNuhdb9bKL_U';
         var options = {algorithms: ['HS256'], maxAge: '1s'};
@@ -201,6 +215,7 @@ describe('verify', function() {
           done();
         });
       });
+
     });
 
     describe('option: clockTimestamp', function () {
diff --git a/verify.js b/verify.js
@@ -170,6 +170,9 @@ module.exports = function (jwtString, secretOrPublicKey, options, callback) {
     }
 
     var maxAgeTimestamp = timespan(options.maxAge, payload.iat);
+    if (typeof maxAgeTimestamp === 'undefined') {
+      return done(new JsonWebTokenError('"maxAge" should be a number of seconds or string representing a timespan eg: "1d", "20h", 60'));
+    }
     if (clockTimestamp >= maxAgeTimestamp + (options.clockTolerance || 0)) {
       return done(new TokenExpiredError('maxAge exceeded', new Date(maxAgeTimestamp * 1000)));
     }

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,9 @@ module.exports = function (jwtString, secretOrPublicKey, options, callback) {`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`var maxAgeTimestamp = timespan(options.maxAge, payload.iat);`
	`173`	`+ if (typeof maxAgeTimestamp === 'undefined') {`
	`174`	`+ return done(new JsonWebTokenError('"maxAge" should be a number of seconds or string representing a timespan eg: "1d", "20h", 60'));`
	`175`	`+ }`
`173`	`176`	`if (clockTimestamp >= maxAgeTimestamp + (options.clockTolerance \|\| 0)) {`
`174`	`177`	`return done(new TokenExpiredError('maxAge exceeded', new Date(maxAgeTimestamp * 1000)));`
`175`	`178`	`}`