Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
43 changes: 24 additions & 19 deletions src/integrations/passport.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const jose = require('jose');
const { ArgumentError } = require('../errors');
const { JwksClient } = require('../JwksClient');
const { getJose } = require('../jose');
const supportedAlg = require('./config');

const handleSigningKeyError = (err, cb) => {
Expand Down Expand Up @@ -28,25 +28,30 @@ module.exports.passportJwtSecret = function (options) {
const onError = options.handleSigningKeyError || handleSigningKeyError;

return function secretProvider(req, rawJwtToken, cb) {
let decoded;
try {
decoded = {
payload: jose.decodeJwt(rawJwtToken),
header: jose.decodeProtectedHeader(rawJwtToken)
};
} catch (err) {
decoded = null;
}

if (!decoded || !supportedAlg.includes(decoded.header.alg)) {
return cb(null, null);
}

client.getSigningKey(decoded.header.kid)
.then(key => {
cb(null, key.publicKey || key.rsaPublicKey);
getJose()
.then(jose => {
let decoded;
try {
decoded = {
payload: jose.decodeJwt(rawJwtToken),
header: jose.decodeProtectedHeader(rawJwtToken)
};
} catch (err) {
decoded = null;
}

if (!decoded || !supportedAlg.includes(decoded.header.alg)) {
return cb(null, null);
}

client.getSigningKey(decoded.header.kid)
.then(key => {
cb(null, key.publicKey || key.rsaPublicKey);
}).catch(err => {
onError(err, (newError) => cb(newError, null));
});
}).catch(err => {
onError(err, (newError) => cb(newError, null));
cb(err, null);
});
};
};
14 changes: 14 additions & 0 deletions src/jose.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
let jose;
const dynamicImport = new Function('specifier', 'return import(specifier)');

function getJose() {
if (!jose) {
jose = dynamicImport('jose');
}

return jose;
}

module.exports = {
getJose
};
3 changes: 2 additions & 1 deletion src/utils.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const jose = require('jose');
const { getJose } = require('./jose');
const JwksError = require('./errors/JwksError');

function resolveAlg(jwk) {
Expand Down Expand Up @@ -33,6 +33,7 @@ function resolveAlg(jwk) {
}

async function retrieveSigningKeys(jwks) {
const jose = await getJose();
const results = [];

jwks = jwks
Expand Down
19 changes: 19 additions & 0 deletions tests/module-load.tests.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
const { execFileSync } = require('child_process');
const path = require('path');

describe('CommonJS module loading', () => {
it('loads public entrypoints when synchronous ESM require is disabled', () => {
execFileSync(
process.execPath,
[
'--no-experimental-require-module',
'-e',
"require('./src'); require('./src/utils');"
],
{
cwd: path.join(__dirname, '..'),
stdio: 'pipe'
}
);
});
});