Skip to content

Handle setting no typ in header #1

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle setting no typ in header #1

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
23 changes: 12 additions & 11 deletions sign.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ if (PS_SUPPORTED) {
}

var sign_options_schema = {
expiresIn: { isValid: function(value) { return isInteger(value) || (isString(value) && value); }, message: '"expiresIn" should be a number of seconds or string representing a timespan' },
notBefore: { isValid: function(value) { return isInteger(value) || (isString(value) && value); }, message: '"notBefore" should be a number of seconds or string representing a timespan' },
audience: { isValid: function(value) { return isString(value) || Array.isArray(value); }, message: '"audience" must be a string or array' },
expiresIn: { isValid: function (value) { return isInteger(value) || (isString(value) && value); }, message: '"expiresIn" should be a number of seconds or string representing a timespan' },
notBefore: { isValid: function (value) { return isInteger(value) || (isString(value) && value); }, message: '"notBefore" should be a number of seconds or string representing a timespan' },
audience: { isValid: function (value) { return isString(value) || Array.isArray(value); }, message: '"audience" must be a string or array' },
algorithm: { isValid: includes.bind(null, SUPPORTED_ALGS), message: '"algorithm" must be a valid string enum value' },
header: { isValid: isPlainObject, message: '"header" must be an object' },
encoding: { isValid: isString, message: '"encoding" must be a string' },
Expand All @@ -26,7 +26,8 @@ var sign_options_schema = {
jwtid: { isValid: isString, message: '"jwtid" must be a string' },
noTimestamp: { isValid: isBoolean, message: '"noTimestamp" must be a boolean' },
keyid: { isValid: isString, message: '"keyid" must be a string' },
mutatePayload: { isValid: isBoolean, message: '"mutatePayload" must be a boolean' }
mutatePayload: { isValid: isBoolean, message: '"mutatePayload" must be a boolean' },
noTyp: { isValid: isBoolean, message: '"noTyp" must be a boolean' },
};

var registered_claims_schema = {
Expand All @@ -40,7 +41,7 @@ function validate(schema, allowUnknown, object, parameterName) {
throw new Error('Expected "' + parameterName + '" to be a plain object.');
}
Object.keys(object)
.forEach(function(key) {
.forEach(function (key) {
var validator = schema[key];
if (!validator) {
if (!allowUnknown) {
Expand Down Expand Up @@ -79,7 +80,7 @@ var options_for_objects = [
'jwtid',
];

module.exports = async function(payload, secretOrPrivateKey, options, callback) {
module.exports = async function (payload, secretOrPrivateKey, options, callback) {
if (typeof options === 'function') {
callback = options;
options = {};
Expand All @@ -88,11 +89,11 @@ module.exports = async function(payload, secretOrPrivateKey, options, callback)
}

var isObjectPayload = typeof payload === 'object' &&
!Buffer.isBuffer(payload);
!Buffer.isBuffer(payload);

var header = Object.assign({
alg: options.algorithm || 'HS256',
typ: isObjectPayload ? 'JWT' : undefined,
typ: isObjectPayload && !options.noTyp ? 'JWT' : undefined,
kid: options.keyid
}, options.header);

Expand All @@ -117,15 +118,15 @@ module.exports = async function(payload, secretOrPrivateKey, options, callback)
return failure(error);
}
if (!options.mutatePayload) {
payload = Object.assign({},payload);
payload = Object.assign({}, payload);
}
} else {
var invalid_options = options_for_objects.filter(function (opt) {
return typeof options[opt] !== 'undefined';
});

if (invalid_options.length > 0) {
return failure(new Error('invalid ' + invalid_options.join(',') + ' option for ' + (typeof payload ) + ' payload'));
return failure(new Error('invalid ' + invalid_options.join(',') + ' option for ' + (typeof payload) + ' payload'));
}
}

Expand Down Expand Up @@ -211,6 +212,6 @@ module.exports = async function(payload, secretOrPrivateKey, options, callback)
// }
});
} else {
return jws.sign({header: header, payload: payload, secret: secretOrPrivateKey, encoding: encoding});
return jws.sign({ header: header, payload: payload, secret: secretOrPrivateKey, encoding: encoding });
}
};