Skip to content

fix(verify): compare fractional nbf against the exact current time #1050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
peralva wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −2
Open

fix(verify): compare fractional nbf against the exact current time #1050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions test/claim-nbf.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,32 @@ describe('not before', function() {
});
});

it('should accept a fractional "nbf" that is already active within the current second', function (done) {
signWithNotBefore(undefined, {nbf: 60.111}, (e1, token) => {
fakeClock.tick(999);
testUtils.verifyJWTHelper(token, 'secret', {}, (e2, decoded) => {
testUtils.asyncCheck(done, () => {
expect(e1).to.be.null;
expect(e2).to.be.null;
expect(decoded).to.have.property('nbf', 60.111);
});
})
});
});

it('should error on verify if a fractional "nbf" is after current time within the same second', function (done) {
signWithNotBefore(undefined, {nbf: 60.5}, (e1, token) => {
fakeClock.tick(200);
testUtils.verifyJWTHelper(token, 'secret', {}, (e2) => {
testUtils.asyncCheck(done, () => {
expect(e1).to.be.null;
expect(e2).to.be.instanceOf(jwt.NotBeforeError);
expect(e2).to.have.property('message', 'jwt not active');
});
})
});
});

it('should verify "nbf" using "clockTimestamp"', function (done) {
signWithNotBefore(10, {}, (e1, token) => {
testUtils.verifyJWTHelper(token, 'secret', {clockTimestamp: 70}, (e2, decoded) => {
Expand Down
6 changes: 4 additions & 2 deletions verify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ module.exports = function (jwtString, secretOrPublicKey, options, callback) {
return done(new JsonWebTokenError('allowInvalidAsymmetricKeyTypes must be a boolean'));
}

const clockTimestamp = options.clockTimestamp || Math.floor(Date.now() / 1000);
const now = Date.now() / 1000;
const clockTimestamp = options.clockTimestamp || Math.floor(now);
const notBeforeTimestamp = options.clockTimestamp || now;

if (!jwtString){
return done(new JsonWebTokenError('jwt must be provided'));
Expand Down Expand Up @@ -177,7 +179,7 @@ module.exports = function (jwtString, secretOrPublicKey, options, callback) {
if (typeof payload.nbf !== 'number') {
return done(new JsonWebTokenError('invalid nbf value'));
}
if (payload.nbf > clockTimestamp + (options.clockTolerance || 0)) {
if (payload.nbf > notBeforeTimestamp + (options.clockTolerance || 0)) {
return done(new NotBeforeError('jwt not active', new Date(payload.nbf * 1000)));
}
}
Expand Down