Skip to content

crypto: do not add undefined hash in webcrypto normalizeAlgorithm #42559

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

Merged
nodejs-github-bot merged 2 commits into from
Apr 3, 2022
Merged

crypto: do not add undefined hash in webcrypto normalizeAlgorithm #42559

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
379b548
crypto: do not add undefined hash in webcrypto normalizeAlgorithm
panva Apr 1, 2022
04e4cc8
fixup! crypto: do not add undefined hash in webcrypto normalizeAlgorithm
panva Apr 2, 2022
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
Next Next commit
crypto: do not add undefined hash in webcrypto normalizeAlgorithm
  • Loading branch information
@panva
panva committed Apr 1, 2022
commit 379b548cdaa080c71b179ed8ffba1cdd8b24882a
16 changes: 10 additions & 6 deletions lib/internal/crypto/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,35 +206,39 @@ function validateMaxBufferLength(data, name) {
}
}

function normalizeAlgorithm(algorithm, label = 'algorithm') {
function normalizeAlgorithm(algorithm) {
if (algorithm != null) {
if (typeof algorithm === 'string')
algorithm = { name: algorithm };

if (typeof algorithm === 'object') {
const { name } = algorithm;
let hash;
if (typeof name !== 'string' ||
!ArrayPrototypeIncludes(
kAlgorithmsKeys,
StringPrototypeToLowerCase(name))) {
throw lazyDOMException('Unrecognized name.', 'NotSupportedError');
}
if (algorithm.hash !== undefined) {
hash = normalizeAlgorithm(algorithm.hash, 'algorithm.hash');
let { hash } = algorithm;
if (hash !== undefined) {
hash = normalizeAlgorithm(hash);
if (!ArrayPrototypeIncludes(kHashTypes, hash.name))
throw lazyDOMException('Unrecognized name.', 'NotSupportedError');
}
return {
const normalized = {
...algorithm,
name: kAlgorithms[StringPrototypeToLowerCase(name)],
hash,
};
if (hash) {
normalized.hash = hash;
}
return normalized;
}
}
throw lazyDOMException('Unrecognized name.', 'NotSupportedError');
}


Comment thread
panva marked this conversation as resolved.
Outdated
function hasAnyNotIn(set, checks) {
for (const s of set)
if (!ArrayPrototypeIncludes(checks, s))
Expand Down
4 changes: 2 additions & 2 deletions lib/internal/crypto/webcrypto.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,10 +557,10 @@ async function unwrapKey(
extractable,
keyUsages) {
wrappedKey = getArrayBufferOrView(wrappedKey, 'wrappedKey');

unwrapAlgo = normalizeAlgorithm(unwrapAlgo);
let keyData = await cipherOrWrap(
kWebCryptoCipherDecrypt,
normalizeAlgorithm(unwrapAlgo),
unwrapAlgo,
unwrappingKey,
wrappedKey,
'unwrapKey');
Expand Down
25 changes: 25 additions & 0 deletions test/parallel/test-webcrypto-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Flags: --expose-internals
'use strict';

const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const assert = require('assert');

const {
normalizeAlgorithm,
} = require('internal/crypto/util');

{
// Check that normalizeAlgorithm does not add an undefined hash property
Comment thread
panva marked this conversation as resolved.
Outdated
assert.strictEqual('hash' in normalizeAlgorithm({ name: 'ECDH' }), false);
assert.strictEqual('hash' in normalizeAlgorithm('ECDH'), false);
}

{
// Check that normalizeAlgorithm does not mutate object inputs
Comment thread
panva marked this conversation as resolved.
Outdated
const algorithm = { name: 'ECDH', hash: 'SHA-256' };
assert.strictEqual(normalizeAlgorithm(algorithm) !== algorithm, true);
assert.deepStrictEqual(algorithm, { name: 'ECDH', hash: 'SHA-256' });
}