crypto: fix webcrypto operation errors to be OperationError

PR-URL: #44171 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Backport-PR-URL: #44872
nodejs · Oct 11, 2022 · 2c938d7 · 2c938d7
1 parent a6e2cb4
commit 2c938d7
Show file tree

Hide file tree

Showing 9 changed files with 185 additions and 205 deletions.
diff --git a/lib/internal/crypto/aes.js b/lib/internal/crypto/aes.js
@@ -7,7 +7,6 @@ const {
   ArrayPrototypeIncludes,
   ArrayPrototypePush,
   MathFloor,
-  Promise,
   SafeSet,
   TypedArrayPrototypeSlice,
 } = primordials;
@@ -46,6 +45,7 @@ const {
 
 const {
   lazyDOMException,
+  promisify,
 } = require('internal/util');
 
 const { PromiseReject } = primordials;
@@ -57,11 +57,12 @@ const {
 } = require('internal/crypto/keys');
 
 const {
-  generateKey,
+  generateKey: _generateKey,
 } = require('internal/crypto/keygen');
 
 const kMaxCounterLength = 128;
 const kTagLengths = [32, 64, 96, 104, 112, 120, 128];
+const generateKey = promisify(_generateKey);
 
 function getAlgorithmName(name, length) {
   switch (name) {
@@ -239,22 +240,19 @@ async function aesGenerateKey(algorithm, extractable, keyUsages) {
       'SyntaxError');
   }
 
-  return new Promise((resolve, reject) => {
-    generateKey('aes', { length }, (err, key) => {
-      if (err) {
-        return reject(lazyDOMException(
-          'The operation failed for an operation-specific reason ' +
-          `[${err.message}]`,
-          'OperationError'));
-      }
-
-      resolve(new InternalCryptoKey(
-        key,
-        { name, length },
-        ArrayFrom(usagesSet),
-        extractable));
-    });
+  const key = await generateKey('aes', { length }).catch((err) => {
+    // TODO(@panva): add err as cause to DOMException
+    throw lazyDOMException(
+      'The operation failed for an operation-specific reason' +
+      `[${err.message}]`,
+      'OperationError');
   });
+
+  return new InternalCryptoKey(
+    key,
+    { name, length },
+    ArrayFrom(usagesSet),
+    extractable);
 }
 
 async function aesImportKey(

diff --git a/lib/internal/crypto/cfrg.js b/lib/internal/crypto/cfrg.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const {
-  Promise,
   SafeSet,
 } = primordials;
 
@@ -31,10 +30,11 @@ const {
 const {
   emitExperimentalWarning,
   lazyDOMException,
+  promisify,
 } = require('internal/util');
 
 const {
-  generateKeyPair,
+  generateKeyPair: _generateKeyPair,
 } = require('internal/crypto/keygen');
 
 const {
@@ -45,6 +45,8 @@ const {
   createPublicKey,
 } = require('internal/crypto/keys');
 
+const generateKeyPair = promisify(_generateKeyPair);
+
 function verifyAcceptableCfrgKeyUse(name, type, usages) {
   let checkSet;
   switch (name) {
@@ -131,65 +133,63 @@ async function cfrgGenerateKey(algorithm, extractable, keyUsages) {
       }
       break;
   }
-  return new Promise((resolve, reject) => {
-    let genKeyType;
-    switch (name) {
-      case 'Ed25519':
-        genKeyType = 'ed25519';
-        break;
-      case 'Ed448':
-        genKeyType = 'ed448';
-        break;
-      case 'X25519':
-        genKeyType = 'x25519';
-        break;
-      case 'X448':
-        genKeyType = 'x448';
-        break;
-    }
-    generateKeyPair(genKeyType, undefined, (err, pubKey, privKey) => {
-      if (err) {
-        return reject(lazyDOMException(
-          'The operation failed for an operation-specific reason',
-          'OperationError'));
-      }
+  let genKeyType;
+  switch (name) {
+    case 'Ed25519':
+      genKeyType = 'ed25519';
+      break;
+    case 'Ed448':
+      genKeyType = 'ed448';
+      break;
+    case 'X25519':
+      genKeyType = 'x25519';
+      break;
+    case 'X448':
+      genKeyType = 'x448';
+      break;
+  }
 
-      const algorithm = { name };
+  const keyPair = await generateKeyPair(genKeyType).catch((err) => {
+    // TODO(@panva): add err as cause to DOMException
+    throw lazyDOMException(
+      'The operation failed for an operation-specific reason',
+      'OperationError');
+  });
 
-      let publicUsages;
-      let privateUsages;
-      switch (name) {
-        case 'Ed25519':
-          // Fall through
-        case 'Ed448':
-          publicUsages = getUsagesUnion(usageSet, 'verify');
-          privateUsages = getUsagesUnion(usageSet, 'sign');
-          break;
-        case 'X25519':
-          // Fall through
-        case 'X448':
-          publicUsages = [];
-          privateUsages = getUsagesUnion(usageSet, 'deriveKey', 'deriveBits');
-          break;
-      }
+  let publicUsages;
+  let privateUsages;
+  switch (name) {
+    case 'Ed25519':
+      // Fall through
+    case 'Ed448':
+      publicUsages = getUsagesUnion(usageSet, 'verify');
+      privateUsages = getUsagesUnion(usageSet, 'sign');
+      break;
+    case 'X25519':
+      // Fall through
+    case 'X448':
+      publicUsages = [];
+      privateUsages = getUsagesUnion(usageSet, 'deriveKey', 'deriveBits');
+      break;
+  }
 
-      const publicKey =
-        new InternalCryptoKey(
-          pubKey,
-          algorithm,
-          publicUsages,
-          true);
-
-      const privateKey =
-        new InternalCryptoKey(
-          privKey,
-          algorithm,
-          privateUsages,
-          extractable);
-
-      resolve({ publicKey, privateKey });
-    });
-  });
+  const keyAlgorithm = { name };
+
+  const publicKey =
+    new InternalCryptoKey(
+      keyPair.publicKey,
+      keyAlgorithm,
+      publicUsages,
+      true);
+
+  const privateKey =
+    new InternalCryptoKey(
+      keyPair.privateKey,
+      keyAlgorithm,
+      privateUsages,
+      extractable);
+
+  return { privateKey, publicKey };
 }
 
 function cfrgExportKey(key, format) {

diff --git a/lib/internal/crypto/ec.js b/lib/internal/crypto/ec.js
@@ -2,7 +2,6 @@
 
 const {
   ObjectKeys,
-  Promise,
   SafeSet,
 } = primordials;
 
@@ -42,10 +41,11 @@ const {
 
 const {
   lazyDOMException,
+  promisify,
 } = require('internal/util');
 
 const {
-  generateKeyPair,
+  generateKeyPair: _generateKeyPair,
 } = require('internal/crypto/keygen');
 
 const {
@@ -56,6 +56,8 @@ const {
   createPublicKey,
 } = require('internal/crypto/keys');
 
+const generateKeyPair = promisify(_generateKeyPair);
+
 function verifyAcceptableEcKeyUse(name, type, usages) {
   let checkSet;
   switch (name) {
@@ -111,46 +113,44 @@ async function ecGenerateKey(algorithm, extractable, keyUsages) {
       }
       // Fall through
   }
-  return new Promise((resolve, reject) => {
-    generateKeyPair('ec', { namedCurve }, (err, pubKey, privKey) => {
-      if (err) {
-        return reject(lazyDOMException(
-          'The operation failed for an operation-specific reason',
-          'OperationError'));
-      }
 
-      const algorithm = { name, namedCurve };
+  const keypair = await generateKeyPair('ec', { namedCurve }).catch((err) => {
+    // TODO(@panva): add err as cause to DOMException
+    throw lazyDOMException(
+      'The operation failed for an operation-specific reason',
+      'OperationError');
+  });
 
-      let publicUsages;
-      let privateUsages;
-      switch (name) {
-        case 'ECDSA':
-          publicUsages = getUsagesUnion(usageSet, 'verify');
-          privateUsages = getUsagesUnion(usageSet, 'sign');
-          break;
-        case 'ECDH':
-          publicUsages = [];
-          privateUsages = getUsagesUnion(usageSet, 'deriveKey', 'deriveBits');
-          break;
-      }
+  let publicUsages;
+  let privateUsages;
+  switch (name) {
+    case 'ECDSA':
+      publicUsages = getUsagesUnion(usageSet, 'verify');
+      privateUsages = getUsagesUnion(usageSet, 'sign');
+      break;
+    case 'ECDH':
+      publicUsages = [];
+      privateUsages = getUsagesUnion(usageSet, 'deriveKey', 'deriveBits');
+      break;
+  }
 
-      const publicKey =
-        new InternalCryptoKey(
-          pubKey,
-          algorithm,
-          publicUsages,
-          true);
-
-      const privateKey =
-        new InternalCryptoKey(
-          privKey,
-          algorithm,
-          privateUsages,
-          extractable);
-
-      resolve({ publicKey, privateKey });
-    });
-  });
+  const keyAlgorithm = { name, namedCurve };
+
+  const publicKey =
+    new InternalCryptoKey(
+      keypair.publicKey,
+      keyAlgorithm,
+      publicUsages,
+      true);
+
+  const privateKey =
+    new InternalCryptoKey(
+      keypair.privateKey,
+      keyAlgorithm,
+      privateUsages,
+      extractable);
+
+  return { publicKey, privateKey };
 }
 
 function ecExportKey(key, format) {

diff --git a/lib/internal/crypto/mac.js b/lib/internal/crypto/mac.js
@@ -2,7 +2,6 @@
 
 const {
   ArrayFrom,
-  Promise,
   SafeSet,
 } = primordials;
 
@@ -27,6 +26,7 @@ const {
 
 const {
   lazyDOMException,
+  promisify,
 } = require('internal/util');
 
 const {
@@ -36,7 +36,7 @@ const {
 } = require('internal/errors');
 
 const {
-  generateKey,
+  generateKey: _generateKey,
 } = require('internal/crypto/keygen');
 
 const {
@@ -45,6 +45,8 @@ const {
   createSecretKey,
 } = require('internal/crypto/keys');
 
+const generateKey = promisify(_generateKey);
+
 async function hmacGenerateKey(algorithm, extractable, keyUsages) {
   const { hash, name } = algorithm;
   let { length } = algorithm;
@@ -62,21 +64,19 @@ async function hmacGenerateKey(algorithm, extractable, keyUsages) {
       'Unsupported key usage for an HMAC key',
       'SyntaxError');
   }
-  return new Promise((resolve, reject) => {
-    generateKey('hmac', { length }, (err, key) => {
-      if (err) {
-        return reject(lazyDOMException(
-          'The operation failed for an operation-specific reason',
-          'OperationError'));
-      }
 
-      resolve(new InternalCryptoKey(
-        key,
-        { name, length, hash: { name: hash.name } },
-        ArrayFrom(usageSet),
-        extractable));
-    });
+  const key = await generateKey('hmac', { length }).catch((err) => {
+    // TODO(@panva): add err as cause to DOMException
+    throw lazyDOMException(
+      'The operation failed for an operation-specific reason',
+      'OperationError');
   });
+
+  return new InternalCryptoKey(
+    key,
+    { name, length, hash: { name: hash.name } },
+    ArrayFrom(usageSet),
+    extractable);
 }
 
 async function hmacImportKey(