Fix retrieveSigningKeys error (#242)

* Update utils.js

* Update .eslintrc and fix linting errors
This commit is contained in:
David Patrick
2021-04-09 14:50:05 -07:00
committed by GitHub
parent 2338aae9f8
commit 819b360fd8
8 changed files with 17 additions and 17 deletions
+5 -2
View File
@@ -21,6 +21,9 @@
"space-before-blocks": [2, "always"] "space-before-blocks": [2, "always"]
}, },
"env": { "env": {
"node": true "node": true,
} "mocha": true,
"es6": true
},
"extends": "eslint:recommended"
} }
+2 -2
View File
@@ -20,10 +20,10 @@ module.exports.expressJwtSecret = function (options) {
} }
const client = new JwksClient(options); const client = new JwksClient(options);
const onError = options.handleSigningKeyError || handleSigningKeyError; const onError = options.handleSigningKeyError || handleSigningKeyError;
return function secretProvider(req, header, payload, cb) { return function secretProvider(req, header, payload, cb) {
if (!header || !supportedAlg.includes(header.alg)) { if (!header || !supportedAlg.includes(header.alg)) {
return cb(null, null); return cb(null, null);
} }
+1 -1
View File
@@ -37,7 +37,7 @@ module.exports.hapiJwt2Key = function (options) {
} }
const client = new JwksClient(options); const client = new JwksClient(options);
const onError = options.handleSigningKeyError || handleSigningKeyError; const onError = options.handleSigningKeyError || handleSigningKeyError;
return function secretProvider(decoded, cb) { return function secretProvider(decoded, cb) {
// We cannot find a signing certificate if there is no header (no kid). // We cannot find a signing certificate if there is no header (no kid).
+4 -2
View File
@@ -25,13 +25,15 @@ module.exports.passportJwtSecret = function (options) {
} }
const client = new JwksClient(options); const client = new JwksClient(options);
const onError = options.handleSigningKeyError || handleSigningKeyError; const onError = options.handleSigningKeyError || handleSigningKeyError;
return function secretProvider(req, rawJwtToken, cb) { return function secretProvider(req, rawJwtToken, cb) {
let decoded; let decoded;
try { try {
decoded = JWT.decode(rawJwtToken, { complete: true }); decoded = JWT.decode(rawJwtToken, { complete: true });
} catch (err) {} } catch (err) {
decoded = null;
}
if (!decoded || !supportedAlg.includes(decoded.header.alg)) { if (!decoded || !supportedAlg.includes(decoded.header.alg)) {
return cb(null, null); return cb(null, null);
+2 -7
View File
@@ -1,13 +1,8 @@
const jose = require('jose'); const jose = require('jose');
const JwksError = require('./errors/JwksError');
function retrieveSigningKeys(keys) { function retrieveSigningKeys(keys) {
let keystore = []; const keystore = jose.JWKS.asKeyStore({ keys }, { ignoreErrors: true });
try {
keystore = jose.JWKS.asKeyStore({ keys }, { ignoreErrors: true });
} catch (err) {
return cb(new JwksError(err.message));
}
return keystore.all({ use: 'sig' }).map((key) => { return keystore.all({ use: 'sig' }).map((key) => {
return { return {
kid: key.kid, kid: key.kid,
+1 -1
View File
@@ -1,7 +1,7 @@
const debug = require('debug'); const debug = require('debug');
const memoizer = require('lru-memoizer'); const memoizer = require('lru-memoizer');
function cacheWrapper(client, { cacheMaxEntries = 5, cacheMaxAge = 600000 } = options) { function cacheWrapper(client, { cacheMaxEntries = 5, cacheMaxAge = 600000 }) {
const logger = debug('jwks'); const logger = debug('jwks');
logger(`Configured caching of signing keys. Max: ${cacheMaxEntries} / Age: ${cacheMaxAge}`); logger(`Configured caching of signing keys. Max: ${cacheMaxEntries} / Age: ${cacheMaxAge}`);
return memoizer.sync({ return memoizer.sync({
+1 -1
View File
@@ -4,7 +4,7 @@ const retrieveSigningKeys = require('../utils').retrieveSigningKeys;
* Uses getKeysInterceptor to allow users to retrieve keys from a file, * Uses getKeysInterceptor to allow users to retrieve keys from a file,
* external cache, or provided object before falling back to the jwksUri endpoint * external cache, or provided object before falling back to the jwksUri endpoint
*/ */
function getKeysInterceptor(client, { getKeysInterceptor } = options) { function getKeysInterceptor(client, { getKeysInterceptor }) {
const getSigningKey = client.getSigningKey.bind(client); const getSigningKey = client.getSigningKey.bind(client);
return async (kid) => { return async (kid) => {
+1 -1
View File
@@ -3,7 +3,7 @@ const { RateLimiter } = require('limiter');
const JwksRateLimitError = require('../errors/JwksRateLimitError'); const JwksRateLimitError = require('../errors/JwksRateLimitError');
function rateLimtWrapper(client, { jwksRequestsPerMinute = 10 } = options) { function rateLimtWrapper(client, { jwksRequestsPerMinute = 10 }) {
const logger = debug('jwks'); const logger = debug('jwks');
const getSigningKey = client.getSigningKey.bind(client); const getSigningKey = client.getSigningKey.bind(client);