crypto: make webcrypto aliasKeyFormat directional

The helper no longer treats every raw alias the
same way and unintended values were accepted for
some algorithms.
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #63910
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>

Author: panva

lib/internal/crypto/webcrypto.js

@@ -839,14 +839,8 @@ function parseJwk(data) {
 returnkey;
 }
 
-functionaliasKeyFormat(format){
-switch(format){
-case'raw-public':
-case'raw-secret':
-return'raw';
-default:
-returnformat;
-}
+functionaliasKeyFormat(format,alias){
+returnformat===alias ? 'raw' : format;
 }
 
 functionimportKeySync(format,keyData,algorithm,extractable,usages){
@@ -857,7 +851,6 @@ function importKeySync(format, keyData, algorithm, extractable, usages) {
 case'RSA-PSS':
 // Fall through
 case'RSA-OAEP':
-format=aliasKeyFormat(format);
 result=require('internal/crypto/rsa')
 .rsaImportKey(
 format,
@@ -869,7 +862,7 @@ function importKeySync(format, keyData, algorithm, extractable, usages) {
 case'ECDSA':
 // Fall through
 case'ECDH':
-format=aliasKeyFormat(format);
+format=aliasKeyFormat(format,'raw-public');
 result=require('internal/crypto/ec')
 .ecImportKey(
 format,
@@ -885,7 +878,7 @@ function importKeySync(format, keyData, algorithm, extractable, usages) {
 case'X25519':
 // Fall through
 case'X448':
-format=aliasKeyFormat(format);
+format=aliasKeyFormat(format,'raw-public');
 result=require('internal/crypto/cfrg')
 .cfrgImportKey(
 format,
@@ -936,7 +929,7 @@ function importKeySync(format, keyData, algorithm, extractable, usages) {
 case'HKDF':
 // Fall through
 case'PBKDF2':
-format=aliasKeyFormat(format);
+format=aliasKeyFormat(format,'raw-secret');
 result=importGenericSecretKey(
 algorithm,
 format,

test/parallel/test-webcrypto-raw-format-aliases.js

@@ -0,0 +1,72 @@
+'use strict';
+
+constcommon=require('../common');
+
+if(!common.hasCrypto)
+common.skip('missing crypto');
+
+constassert=require('assert');
+const{ subtle }=globalThis.crypto;
+
+functiongetAlgorithmName(algorithm){
+returntypeofalgorithm==='string' ? algorithm : algorithm.name;
+}
+
+functionassertImportNotSupported(format,keyData,algorithm,extractable,usages){
+returnassert.rejects(
+subtle.importKey(format,keyData,algorithm,extractable,usages),
+{
+name: 'NotSupportedError',
+message: `Unable to import ${getAlgorithmName(algorithm)} using ${format} format`,
+});
+}
+
+asyncfunctionassertSecretKeyDoesNotAcceptRawPublic(algorithm){
+constkeyData=newUint8Array(32);
+awaitassertImportNotSupported(
+'raw-public',
+keyData,
+algorithm,
+false,
+['deriveBits']);
+}
+
+asyncfunctionassertPublicKeyDoesNotAcceptRawSecret(
+algorithm,
+generateUsages,
+importUsages,
+){
+const{ publicKey }=awaitsubtle.generateKey(
+algorithm,
+true,
+generateUsages);
+constkeyData=awaitsubtle.exportKey('raw',publicKey);
+
+awaitassertImportNotSupported(
+'raw-secret',
+keyData,
+algorithm,
+true,
+importUsages);
+}
+
+Promise.all([
+assertSecretKeyDoesNotAcceptRawPublic('HKDF'),
+assertSecretKeyDoesNotAcceptRawPublic('PBKDF2'),
+assertPublicKeyDoesNotAcceptRawSecret(
+{name: 'ECDSA',namedCurve: 'P-256'},
+['sign','verify'],
+['verify']),
+assertPublicKeyDoesNotAcceptRawSecret(
+{name: 'ECDH',namedCurve: 'P-256'},
+['deriveBits'],
+[]),
+assertPublicKeyDoesNotAcceptRawSecret(
+'Ed25519',
+['sign','verify'],
+['verify']),
+assertPublicKeyDoesNotAcceptRawSecret(
+'X25519',
+['deriveBits'],
+[]),
+]).then(common.mustCall());