Visitar URL original
crypto: validate JWK usages before key_ops · nodejs/node@2b62aaf · GitHub
Skip to content

Commit 2b62aaf

Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: validate JWK usages before key_ops
Check requested usages against the JWK public or private key type before validating key_ops. This preserves the SyntaxError precedence specified for RSA, EC, CFRG, ML-DSA, and ML-KEM imports. PR-URL: #65550 Backport-PR-URL: #66128 Assisted-by: Codex Signed-off-by: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent ec7819d commit 2b62aaf

10 files changed

Lines changed: 186 additions & 31 deletions

‎lib/internal/crypto/cfrg.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,12 @@ function cfrgImportKey(
148148
break;
149149
}
150150
case 'jwk': {
151+
const isPublic = keyData.d === undefined;
152+
verifyAcceptableKeyUse(
153+
name,
154+
usagesSet,
155+
isPublic ? allowedUsages.public : allowedUsages.private);
156+
151157
const expectedUse = (name === 'X25519' || name === 'X448') ? 'enc' : 'sig';
152158
validateJwk(keyData, 'OKP', extractable, usagesSet, expectedUse);
153159

@@ -161,11 +167,6 @@ function cfrgImportKey(
161167
'JWK "alg" does not match the requested algorithm', 'DataError');
162168
}
163169

164-
const isPublic = keyData.d === undefined;
165-
verifyAcceptableKeyUse(
166-
name,
167-
usagesSet,
168-
isPublic ? allowedUsages.public : allowedUsages.private);
169170
handle = importJwkKey(isPublic, keyData);
170171

171172
if (!isPublic) {

‎lib/internal/crypto/ec.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,12 @@ function ecImportKey(
164164
break;
165165
}
166166
case 'jwk': {
167+
const isPublic = keyData.d === undefined;
168+
verifyAcceptableKeyUse(
169+
name,
170+
usagesSet,
171+
isPublic ? allowedUsages.public : allowedUsages.private);
172+
167173
const expectedUse = name === 'ECDH' ? 'enc' : 'sig';
168174
validateJwk(keyData, 'EC', extractable, usagesSet, expectedUse);
169175

@@ -185,11 +191,6 @@ function ecImportKey(
185191
'DataError');
186192
}
187193

188-
const isPublic = keyData.d === undefined;
189-
verifyAcceptableKeyUse(
190-
name,
191-
usagesSet,
192-
isPublic ? allowedUsages.public : allowedUsages.private);
193194
handle = importJwkKey(isPublic, keyData);
194195
break;
195196
}

‎lib/internal/crypto/ml_dsa.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,17 +166,18 @@ function mlDsaImportKey(
166166
break;
167167
}
168168
case 'jwk': {
169+
const isPublic = keyData.priv === undefined;
170+
verifyAcceptableKeyUse(
171+
name,
172+
usagesSet,
173+
isPublic ? kUsages.public : kUsages.private);
174+
169175
validateJwk(keyData, 'AKP', extractable, usagesSet, 'sig');
170176

171177
if (keyData.alg !== name)
172178
throw lazyDOMException(
173179
'JWK "alg" Parameter and algorithm name mismatch', 'DataError');
174180

175-
const isPublic = keyData.priv === undefined;
176-
verifyAcceptableKeyUse(
177-
name,
178-
usagesSet,
179-
isPublic ? kUsages.public : kUsages.private);
180181
handle = importJwkKey(isPublic, keyData);
181182

182183
if (!isPublic) {

‎lib/internal/crypto/ml_kem.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,17 +175,18 @@ function mlKemImportKey(
175175
break;
176176
}
177177
case 'jwk': {
178+
const isPublic = keyData.priv === undefined;
179+
verifyAcceptableKeyUse(
180+
name,
181+
usagesSet,
182+
isPublic ? kUsages.public : kUsages.private);
183+
178184
validateJwk(keyData, 'AKP', extractable, usagesSet, 'enc');
179185

180186
if (keyData.alg !== name)
181187
throw lazyDOMException(
182188
'JWK "alg" Parameter and algorithm name mismatch', 'DataError');
183189

184-
const isPublic = keyData.priv === undefined;
185-
verifyAcceptableKeyUse(
186-
name,
187-
usagesSet,
188-
isPublic ? kUsages.public : kUsages.private);
189190
handle = importJwkKey(isPublic, keyData);
190191
break;
191192
}

‎lib/internal/crypto/rsa.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,12 @@ function rsaImportKey(
186186
break;
187187
}
188188
case 'jwk': {
189+
const isPublic = keyData.d === undefined;
190+
verifyAcceptableKeyUse(
191+
algorithm.name,
192+
usagesSet,
193+
isPublic ? allowedUsages.public : allowedUsages.private);
194+
189195
const expectedUse = algorithm.name === 'RSA-OAEP' ? 'enc' : 'sig';
190196
validateJwk(keyData, 'RSA', extractable, usagesSet, expectedUse);
191197

@@ -202,11 +208,6 @@ function rsaImportKey(
202208
'DataError');
203209
}
204210

205-
const isPublic = keyData.d === undefined;
206-
verifyAcceptableKeyUse(
207-
algorithm.name,
208-
usagesSet,
209-
isPublic ? allowedUsages.public : allowedUsages.private);
210211
handle = importJwkKey(isPublic, keyData);
211212
break;
212213
}

‎test/parallel/test-webcrypto-export-import-cfrg.js‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,41 @@ async function testImportRaw({ name, publicUsages }) {
411411
await Promise.all(tests);
412412
})().then(common.mustCall());
413413

414+
// JWK key usage validation precedes `key_ops` validation.
415+
(async function() {
416+
for (const { name, publicUsages, privateUsages } of testVectors) {
417+
const jwk = keyData[name].jwk;
418+
const publicJwk = {
419+
kty: jwk.kty,
420+
crv: jwk.crv,
421+
x: jwk.x,
422+
};
423+
const isKeyAgreement = name.startsWith('X');
424+
const invalidUsage = isKeyAgreement ?
425+
privateUsages[0] : publicUsages[0];
426+
const invalidJwk = isKeyAgreement ? publicJwk : jwk;
427+
428+
await assert.rejects(
429+
subtle.importKey(
430+
'jwk',
431+
{ ...invalidJwk, key_ops: [invalidUsage, invalidUsage] },
432+
{ name },
433+
true,
434+
[invalidUsage]),
435+
{ name: 'SyntaxError', message: /Unsupported key usage/ });
436+
437+
const validUsage = privateUsages[0];
438+
await assert.rejects(
439+
subtle.importKey(
440+
'jwk',
441+
{ ...jwk, key_ops: [validUsage, validUsage] },
442+
{ name },
443+
true,
444+
[validUsage]),
445+
{ name: 'DataError', message: 'Duplicate key operation' });
446+
}
447+
})().then(common.mustCall());
448+
414449
{
415450
const rsaPublic = crypto.createPublicKey(
416451
fixtures.readKey('rsa_public_2048.pem'));

‎test/parallel/test-webcrypto-export-import-ec.js‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,42 @@ async function testImportRaw({ name, publicUsages }, namedCurve) {
408408
await Promise.all(tests);
409409
})().then(common.mustCall());
410410

411+
// JWK key usage validation precedes `key_ops` validation.
412+
(async function() {
413+
const jwk = keyData['P-256'].jwk;
414+
const publicJwk = {
415+
kty: jwk.kty,
416+
crv: jwk.crv,
417+
x: jwk.x,
418+
y: jwk.y,
419+
};
420+
421+
for (const { name, publicUsages, privateUsages } of testVectors) {
422+
const invalidUsage = name === 'ECDH' ?
423+
privateUsages[0] : publicUsages[0];
424+
const invalidJwk = name === 'ECDH' ? publicJwk : jwk;
425+
426+
await assert.rejects(
427+
subtle.importKey(
428+
'jwk',
429+
{ ...invalidJwk, key_ops: [invalidUsage, invalidUsage] },
430+
{ name, namedCurve: 'P-256' },
431+
true,
432+
[invalidUsage]),
433+
{ name: 'SyntaxError', message: /Unsupported key usage/ });
434+
435+
const validUsage = privateUsages[0];
436+
await assert.rejects(
437+
subtle.importKey(
438+
'jwk',
439+
{ ...jwk, key_ops: [validUsage, validUsage] },
440+
{ name, namedCurve: 'P-256' },
441+
true,
442+
[validUsage]),
443+
{ name: 'DataError', message: 'Duplicate key operation' });
444+
}
445+
})().then(common.mustCall());
446+
411447

412448
// https://github.com/nodejs/node/issues/45859
413449
(async function() {

‎test/parallel/test-webcrypto-export-import-ml-dsa.js‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,40 @@ async function testImportRawSeed({ name, privateUsages }, extractable) {
488488
});
489489
})().then(common.mustCall());
490490

491+
// JWK key usage validation precedes `key_ops` validation.
492+
(async function() {
493+
const privateJwk = keyData['ML-DSA-65'].jwk;
494+
const publicJwk = { ...privateJwk, priv: undefined };
495+
496+
for (const [jwk, usage] of [
497+
[privateJwk, 'verify'],
498+
[publicJwk, 'sign'],
499+
]) {
500+
await assert.rejects(
501+
subtle.importKey(
502+
'jwk',
503+
{ ...jwk, key_ops: [usage, usage] },
504+
'ML-DSA-65',
505+
true,
506+
[usage]),
507+
{ name: 'SyntaxError', message: /Unsupported key usage/ });
508+
}
509+
510+
for (const [jwk, usage] of [
511+
[privateJwk, 'sign'],
512+
[publicJwk, 'verify'],
513+
]) {
514+
await assert.rejects(
515+
subtle.importKey(
516+
'jwk',
517+
{ ...jwk, key_ops: [usage, usage] },
518+
'ML-DSA-65',
519+
true,
520+
[usage]),
521+
{ name: 'DataError', message: /Duplicate key operation/ });
522+
}
523+
})().then(common.mustCall());
524+
491525
if (!process.features.openssl_is_boringssl) {
492526
(async function() {
493527
for (const { name, privateUsages } of testVectors) {

‎test/parallel/test-webcrypto-export-import-ml-kem.js‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -500,13 +500,29 @@ if (!process.features.openssl_is_boringssl) {
500500
common.printSkipMessage('Skipping unsupported private key format test');
501501
}
502502

503-
// Regression test: JWK `key_ops` validation must recognize ML-KEM operations
504-
// (encapsulateKey, encapsulateBits, decapsulateKey, decapsulateBits) so that
505-
// duplicate entries are rejected
503+
// JWK key usage validation precedes `key_ops` validation.
506504
(async function() {
507-
for (const op of ['encapsulateKey', 'encapsulateBits',
508-
'decapsulateKey', 'decapsulateBits']) {
509-
const jwk = { ...keyData['ML-KEM-768'].jwk, key_ops: [op, op] };
505+
const privateJwk = keyData['ML-KEM-768'].jwk;
506+
const encapsulationOps = ['encapsulateKey', 'encapsulateBits'];
507+
const decapsulationOps = ['decapsulateKey', 'decapsulateBits'];
508+
509+
for (const op of encapsulationOps) {
510+
const jwk = { ...privateJwk, key_ops: [op, op] };
511+
await assert.rejects(
512+
subtle.importKey('jwk', jwk, { name: 'ML-KEM-768' }, true, [op]),
513+
{ name: 'SyntaxError', message: /Unsupported key usage/ });
514+
}
515+
516+
// Duplicate entries are still rejected when the requested usages are valid.
517+
for (const op of encapsulationOps) {
518+
const jwk = { ...privateJwk, priv: undefined, key_ops: [op, op] };
519+
await assert.rejects(
520+
subtle.importKey('jwk', jwk, { name: 'ML-KEM-768' }, true, [op]),
521+
{ name: 'DataError', message: /Duplicate key operation/ });
522+
}
523+
524+
for (const op of decapsulationOps) {
525+
const jwk = { ...privateJwk, key_ops: [op, op] };
510526
await assert.rejects(
511527
subtle.importKey('jwk', jwk, { name: 'ML-KEM-768' }, true, [op]),
512528
{ name: 'DataError', message: /Duplicate key operation/ });

‎test/parallel/test-webcrypto-export-import-rsa.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,35 @@ const testVectors = [
647647
await Promise.all(variations);
648648
})().then(common.mustCall());
649649

650+
// Type-specific JWK usage validation precedes `key_ops` validation.
651+
(async function() {
652+
const privateJwk = keyData[1024].jwk;
653+
654+
for (const { name, publicUsages, privateUsages } of testVectors) {
655+
const algorithm = { name, hash: 'SHA-256' };
656+
const invalidUsage = publicUsages[0];
657+
const validUsage = privateUsages[0];
658+
659+
await assert.rejects(
660+
subtle.importKey(
661+
'jwk',
662+
{ ...privateJwk, key_ops: [invalidUsage, invalidUsage] },
663+
algorithm,
664+
true,
665+
[invalidUsage]),
666+
{ name: 'SyntaxError', message: /Unsupported key usage/ });
667+
668+
await assert.rejects(
669+
subtle.importKey(
670+
'jwk',
671+
{ ...privateJwk, key_ops: [validUsage, validUsage] },
672+
algorithm,
673+
true,
674+
[validUsage]),
675+
{ name: 'DataError', message: 'Duplicate key operation' });
676+
}
677+
})().then(common.mustCall());
678+
650679
{
651680
const ecPublic = crypto.createPublicKey(
652681
fixtures.readKey('ec_p256_public.pem'));

0 commit comments

Comments
 (0)