Skip to content

Commit

Permalink
add clock tolerance
Browse files Browse the repository at this point in the history
  • Loading branch information
tsndr committed Feb 22, 2024
1 parent 3f62636 commit e503b16
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 6 deletions.
18 changes: 12 additions & 6 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,11 @@ export type JwtSignOptions<T> = {
* @prop {boolean} [throwError=false] If `true` throw error if checks fail. (default: `false`)
*/
export type JwtVerifyOptions = {
/**
* Clock tolerance to help with slightly out of sync systems
*/
clockTolerance?: number

/**
* If `true` throw error if checks fail. (default: `false`)
*
Expand Down Expand Up @@ -178,11 +183,10 @@ export async function sign<Payload = {}, Header = {}>(payload: JwtPayload<Payloa
* @throws {Error | string} Throws an error `string` if the token is invalid or an `Error-Object` if there's a validation issue.
* @returns {Promise<boolean>} Returns `true` if signature, `nbf` (if set) and `exp` (if set) are valid, otherwise returns `false`.
*/
export async function verify(token: string, secret: string | JsonWebKey | CryptoKey, options: JwtVerifyOptions | JwtAlgorithm = { algorithm: 'HS256', throwError: false }): Promise<boolean> {
export async function verify(token: string, secret: string | JsonWebKey | CryptoKey, options: JwtVerifyOptions | JwtAlgorithm = 'HS256'): Promise<boolean> {
if (typeof options === 'string')
options = { algorithm: options, throwError: false }

options = { algorithm: 'HS256', throwError: false, ...options }
options = { algorithm: options }
options = { algorithm: 'HS256', clockTolerance: 0, throwError: false, ...options }

if (typeof token !== 'string')
throw new Error('token must be a string')
Expand Down Expand Up @@ -215,10 +219,12 @@ export async function verify(token: string, secret: string | JsonWebKey | Crypto
if (!payload)
throw new Error('PARSE_ERROR')

if (payload.nbf && payload.nbf > Math.floor(Date.now() / 1000))
const now = Math.floor(Date.now() / 1000)

if (payload.nbf && Math.abs(payload.nbf - now) > (options.clockTolerance ?? 0))
throw new Error('NOT_YET_VALID')

if (payload.exp && payload.exp <= Math.floor(Date.now() / 1000))
if (payload.exp && Math.abs(payload.exp - now) > (options.clockTolerance ?? 0))
throw new Error('EXPIRED')

const key = secret instanceof CryptoKey ? secret : await importKey(secret, algorithm, ['verify'])
Expand Down
26 changes: 26 additions & 0 deletions tests/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,30 @@ describe.each(Object.entries(data) as [JwtAlgorithm, Dataset][])('%s', (algorith
const verified = await jwt.verify(token, data.public, algorithm)
expect(verified).toBeTruthy()
})
})

describe('Verify', async () => {
const secret = 'super-secret'

const now = Math.floor(Date.now() / 1000)
const off = 30 // 30 seconds
const nbf = now + off // Not valid before 30 seconds from now
const exp = now - off // Expired 30 seconds ago

const notYetValidToken = await jwt.sign({ sub: 'me', nbf }, secret)
const expiredToken = await jwt.sign({ sub: 'me', exp }, secret)

test('Not yet valid', () => {
expect(jwt.verify(notYetValidToken, secret, { throwError: true })).rejects.toThrowError('NOT_YET_VALID')
})

test('Expired', () => {
console.log({ exp, now: Math.floor(Date.now() / 1000) })
expect(jwt.verify(expiredToken, secret, { throwError: true })).rejects.toThrowError('EXPIRED')
})

test('Clock offset', () => {
expect(jwt.verify(notYetValidToken, secret, { clockTolerance: off, throwError: true })).resolves.toBe(true)
expect(jwt.verify(expiredToken, secret, { clockTolerance: off, throwError: true })).resolves.toBe(true)
})
})

0 comments on commit e503b16

Please sign in to comment.