crypto: adjust types for getRandomValues

prevents Web Crypto API's getRandomValues from accepting DataView - Fixes: #41480 - Refs: https://www.w3.org/TR/WebCryptoAPI/#Crypto-method-getRandomValues
nodejs · Jan 11, 2022 · e074f4b · e074f4b
1 parent 6b7b0b7
commit e074f4b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/lib/internal/crypto/random.js b/lib/internal/crypto/random.js
@@ -50,6 +50,7 @@ const {
 const {
   isArrayBufferView,
   isAnyArrayBuffer,
+  isTypedArray,
   isFloat32Array,
   isFloat64Array,
 } = require('internal/util/types');
@@ -307,7 +308,7 @@ function onJobDone(buf, callback, error) {
 // not allowed to exceed 65536 bytes, and can only
 // be an integer-type TypedArray.
 function getRandomValues(data) {
-  if (!isArrayBufferView(data) ||
+  if (!isTypedArray(data) ||
       isFloat32Array(data) ||
       isFloat64Array(data)) {
     // Ordinarily this would be an ERR_INVALID_ARG_TYPE. However,

diff --git a/test/fixtures/wpt/WebCryptoAPI/getRandomValues.any.js b/test/fixtures/wpt/WebCryptoAPI/getRandomValues.any.js
@@ -13,7 +13,17 @@ test(function() {
     assert_throws_dom("TypeMismatchError", function() {
         self.crypto.getRandomValues(new Float64Array(65537))
     }, "Float64Array (too long)")
-}, "Float arrays")
+}, "Float arrays");
+
+test(function() {
+    assert_throws_dom("TypeMismatchError", function() {
+        self.crypto.getRandomValues(new DataView(new ArrayBuffer(1)))
+    }, "DataView")
+
+    assert_throws_dom("TypeMismatchError", function() {
+        self.crypto.getRandomValues(new DataView(new ArrayBuffer(65537)))
+    }, "DataView (too long)")
+}, "DataView");
 
 const arrays = [
     'Int8Array',

diff --git a/test/parallel/test-webcrypto-random.js b/test/parallel/test-webcrypto-random.js
@@ -13,6 +13,7 @@ const { getRandomValues } = require('crypto').webcrypto;
   undefined, null, '', 1, {}, [],
   new Float32Array(1),
   new Float64Array(1),
+  new DataView(new ArrayBuffer(1)),
 ].forEach((i) => {
   assert.throws(
     () => getRandomValues(i),
@@ -32,6 +33,7 @@ const intTypedConstructors = [
   Uint8Array,
   Uint16Array,
   Uint32Array,
+  Uint8ClampedArray,
   BigInt64Array,
   BigUint64Array,
 ];
@@ -47,7 +49,7 @@ for (const ctor of intTypedConstructors) {
 {
   const buf = new Uint16Array(10);
   const before = Buffer.from(buf).toString('hex');
-  getRandomValues(new DataView(buf.buffer));
+  getRandomValues(buf);
   const after = Buffer.from(buf).toString('hex');
   assert.notStrictEqual(before, after);
 }