crypto: improve error handling in parseKeyEncoding

This change only affects KeyObject.export(). PR-URL: #26455 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>
nodejs · Mar 9, 2019 · 3afa5d7 · 3afa5d7
1 parent 1acf3b1
commit 3afa5d7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/lib/internal/crypto/keys.js b/lib/internal/crypto/keys.js
@@ -178,6 +178,9 @@ function isStringOrBuffer(val) {
 }
 
 function parseKeyEncoding(enc, keyType, isPublic, objName) {
+  if (enc === null || typeof enc !== 'object')
+    throw new ERR_INVALID_ARG_TYPE('options', 'object', enc);
+
   const isInput = keyType === undefined;
 
   const {

diff --git a/test/parallel/test-crypto-key-objects.js b/test/parallel/test-crypto-key-objects.js
@@ -107,6 +107,16 @@ const privatePem = fixtures.readSync('test_rsa_privkey.pem', 'ascii');
   assert.strictEqual(derivedPublicKey.asymmetricKeyType, 'rsa');
   assert.strictEqual(derivedPublicKey.symmetricKeySize, undefined);
 
+  // Test exporting with an invalid options object, this should throw.
+  for (const opt of [undefined, null, 'foo', 0, NaN]) {
+    common.expectsError(() => publicKey.export(opt), {
+      type: TypeError,
+      code: 'ERR_INVALID_ARG_TYPE',
+      message: 'The "options" argument must be of type object. Received type ' +
+               typeof opt
+    });
+  }
+
   const publicDER = publicKey.export({
     format: 'der',
     type: 'pkcs1'