crypto: input typechecking

wuweiweiwu · wuweiweiwu · commit c201c264d76b · 2018-03-10T12:27:10.000-08:00
Handle input typechecking in JavaScript using
errors. Minor fixes and updated tests
diff --git a/lib/internal/crypto/diffiehellman.js b/lib/internal/crypto/diffiehellman.js
@@ -193,6 +193,15 @@ ECDH.prototype.getPublicKey = function getPublicKey(encoding, format) {
 };
 
 ECDH.convertKey = function convertKey(key, curve, inEnc, outEnc, format) {
+  if (typeof key !== 'string' && !isArrayBufferView(key)) {
+    throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'key',
+                               ['string', 'Buffer', 'TypedArray', 'DataView']);
+  }
+
+  if (typeof curve !== 'string') {
+    throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'curve', 'string');
+  }
+
   const encoding = getDefaultEncoding();
   inEnc = inEnc || encoding;
   outEnc = outEnc || encoding;
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -5561,13 +5561,10 @@ void ConvertKey(const FunctionCallbackInfo<Value>& args) {
 
   CHECK_EQ(args.Length(), 3);
 
-  THROW_AND_RETURN_IF_NOT_BUFFER(args[0], "Public key");
-
   size_t len = Buffer::Length(args[0]);
   if (len == 0)
     return args.GetReturnValue().SetEmptyString();
 
-  THROW_AND_RETURN_IF_NOT_STRING(args[1], "ECDH curve name");
   node::Utf8Value curve(env->isolate(), args[1]);
 
   int nid = OBJ_sn2nid(*curve);
diff --git a/test/parallel/test-crypto-ecdh-convert-key.js b/test/parallel/test-crypto-ecdh-convert-key.js
@@ -4,9 +4,8 @@ if (!common.hasCrypto)
   common.skip('missing crypto');
 
 const assert = require('assert');
-const crypto = require('crypto');
 
-const { ECDH, getCurves } = crypto;
+const { ECDH, getCurves } = require('crypto');
 
 // A valid private key for the secp256k1 curve.
 const cafebabeKey = 'cafebabe'.repeat(8);
@@ -21,16 +20,16 @@ const cafebabePubPtUnComp =
 common.expectsError(
   () => ECDH.convertKey(),
   {
+    code: 'ERR_INVALID_ARG_TYPE',
     type: TypeError,
-    message: 'Public key must be a buffer'
   });
 
 // Invalid test: curve argument is undefined.
 common.expectsError(
   () => ECDH.convertKey(cafebabePubPtComp),
   {
+    code: 'ERR_INVALID_ARG_TYPE',
     type: TypeError,
-    message: 'ECDH curve name must be a string'
   });
 
 // Invalid test: curve argument is invalid.
@@ -41,9 +40,7 @@ common.expectsError(
     message: 'Invalid ECDH curve name'
   });
 
-const availableCurves = new Set(getCurves());
-
-if (availableCurves.has('secp256k1')) {
+if (getCurves().includes('secp256k1')) {
   // Invalid test: format argument is undefined.
   common.expectsError(
     () => ECDH.convertKey(cafebabePubPtComp, 'secp256k1', 'hex', 'hex', 10),
