fixup! lib: refactor internal webidl converters

Signed-off-by: Filip Skokan <[email protected]>

Author: panva

lib/internal/crypto/webidl.js

@@ -51,7 +51,7 @@ function namedCurveValidator(V, dict) {
       'NotSupportedError');
 }
 
-const converters = { ...webidl };
+const converters = { __proto__: null, ...webidl };
 
 /**
  * @param {string | object} V - The hash algorithm identifier (string or object).

lib/internal/webidl.js

@@ -21,22 +21,15 @@ const {
   NumberMAX_SAFE_INTEGER,
   NumberMIN_SAFE_INTEGER,
   ObjectAssign,
-  ObjectGetOwnPropertyDescriptor,
   ObjectPrototypeIsPrototypeOf,
   SafeSet,
   String,
   SymbolIterator,
   TypeError,
   TypedArrayPrototypeGetBuffer,
   TypedArrayPrototypeGetSymbolToStringTag,
-  globalThis,
 } = primordials;
 
-const { SharedArrayBuffer } = globalThis;
-const SharedArrayBufferPrototypeGetGrowable = SharedArrayBuffer === undefined ?
-  undefined :
-  ObjectGetOwnPropertyDescriptor(SharedArrayBuffer.prototype, 'growable')?.get;
-
 const { kEmptyObject } = require('internal/util');
 const {
   isArrayBuffer,
@@ -611,7 +604,7 @@ function createDictionaryConverter(
     }
 
     // Step 2: create the IDL dictionary value.
-    const idlDict = {};
+    const idlDict = { __proto__: null };
 
     // Steps 3-4: iterate the flattened dictionary/member list.
     for (let i = 0; i < sortedMembers.length; i++) {
@@ -674,14 +667,8 @@ function createSequenceConverter(converter) {
 
     // Step 2: GetMethod(V, %Symbol.iterator%).
     const method = V[SymbolIterator];
-    // Step 3: throw if the iterator method is undefined or null.
-    if (method === undefined || method === null) {
-      throw makeException(
-        'cannot be converted to sequence.',
-        options);
-    }
-    // GetMethod also throws if the method is not callable.
-    if (typeof method !== 'function') {
+    // Step 3: throw if the iterator method is undefined, null, or not callable.
+    if (method == null || typeof method !== 'function') {
       throw makeException(
         'cannot be converted to sequence.',
         options);
@@ -811,9 +798,12 @@ function validateBufferSourceBacking(buffer, options) {
 function validateAllowGrowableSharedArrayBuffer(buffer, options) {
   // SharedArrayBuffer and ArrayBufferView conversion step 3:
   // IsFixedLengthArrayBuffer(buffer) must be true without [AllowResizable].
-  if (!options.allowResizable &&
-      SharedArrayBufferPrototypeGetGrowable !== undefined &&
-      FunctionPrototypeCall(SharedArrayBufferPrototypeGetGrowable, buffer)) {
+  // Do not use a primordial getter here. When this module is included in the
+  // startup snapshot, an early-captured SharedArrayBuffer.prototype.growable
+  // getter does not detect growable buffers created after deserialization.
+  // Lazily capturing the getter would work, but it would observe the runtime
+  // prototype at first comparison, so it would not be an actual primordial.
+  if (!options.allowResizable && buffer.growable) {
     throw makeException(
       'is backed by a growable SharedArrayBuffer, which is not allowed.',
       options);

test/parallel/test-internal-webidl-buffer-source.js

@@ -17,18 +17,12 @@ const TYPED_ARRAY_CTORS = [
 ];
 
 function createGrowableSharedArrayBufferView(Ctor) {
-  try {
-    const buffer = new SharedArrayBuffer(0, { maxByteLength: 1 });
-    const view = new Ctor(buffer);
-    return view.buffer.growable === true ? view : undefined;
-  } catch {
-    return undefined;
-  }
+  const buffer = new SharedArrayBuffer(0, { maxByteLength: 1 });
+  const view = new Ctor(buffer);
+  assert.strictEqual(view.buffer.growable, true);
+  return view;
 }
 
-const hasGrowableSharedArrayBufferViews =
-  createGrowableSharedArrayBufferView(Uint8Array) !== undefined;
-
 test('BufferSource accepts ArrayBuffer', () => {
   const ab = new ArrayBuffer(8);
   assert.strictEqual(converters.BufferSource(ab), ab);
@@ -172,13 +166,10 @@ test('BufferSource handles resizable-backed views with explicit options', () =>
   }
 });
 
-test('BufferSource handles growable SAB-backed views with explicit options', {
-  skip: !hasGrowableSharedArrayBufferViews,
-}, () => {
+test('BufferSource handles growable SAB-backed views with explicit options', () => {
   for (const Ctor of [DataView, ...TYPED_ARRAY_CTORS]) {
     {
       const view = createGrowableSharedArrayBufferView(Ctor);
-      assert.notStrictEqual(view, undefined);
       assert.throws(
         () => converters.BufferSource(view, {
           allowShared: true,
@@ -190,7 +181,6 @@ test('BufferSource handles growable SAB-backed views with explicit options', {
 
     {
       const view = createGrowableSharedArrayBufferView(Ctor);
-      assert.notStrictEqual(view, undefined);
       assert.strictEqual(converters.BufferSource(view, {
         allowShared: true,
         allowResizable: true,

test/parallel/test-internal-webidl.js

@@ -13,18 +13,12 @@ const opts = {
   context: 'Context',
 };
 function createGrowableSharedArrayBufferView() {
-  try {
-    const buffer = new SharedArrayBuffer(4, { maxByteLength: 8 });
-    const view = new Uint8Array(buffer);
-    return view.buffer.growable === true ? view : undefined;
-  } catch {
-    return undefined;
-  }
+  const buffer = new SharedArrayBuffer(4, { maxByteLength: 8 });
+  const view = new Uint8Array(buffer);
+  assert.strictEqual(view.buffer.growable, true);
+  return view;
 }
 
-const hasGrowableSharedArrayBufferView =
-  createGrowableSharedArrayBufferView() !== undefined;
-
 function assertInvalidArgType(fn) {
   assert.throws(fn, {
     name: 'TypeError',
@@ -369,7 +363,7 @@ assert.throws(() => webidl.requiredArguments(1, 2, opts), {
   ]);
 
   const idlDict = converter({ value: 1 });
-  assert.deepStrictEqual(idlDict, { value: '1' });
+  assert.deepStrictEqual(idlDict, { __proto__: null, value: '1' });
 
   assert.throws(() => converter({}, opts), {
     name: 'TypeError',
@@ -441,39 +435,37 @@ assert.throws(() => webidl.requiredArguments(1, 2, opts), {
   assert.strictEqual(converters.BufferSource(view, allowShared), view);
   assert.strictEqual(converters.Uint8Array(view, allowShared), view);
 
-  if (hasGrowableSharedArrayBufferView) {
-    const growableView = createGrowableSharedArrayBufferView();
-
-    assert.throws(() => converters.BufferSource(growableView, {
-      __proto__: null,
-      ...opts,
-      allowShared: true,
-      allowResizable: false,
-    }), {
-      name: 'TypeError',
-      code: 'ERR_INVALID_ARG_TYPE',
-      message: 'Prefix: Context is backed by a growable ' +
-        'SharedArrayBuffer, which is not allowed.',
-    });
-    assert.throws(() => converters.Uint8Array(growableView, {
-      __proto__: null,
-      ...opts,
-      allowShared: true,
-    }), {
-      name: 'TypeError',
-      code: 'ERR_INVALID_ARG_TYPE',
-      message: 'Prefix: Context is backed by a growable ' +
-        'SharedArrayBuffer, which is not allowed.',
-    });
-    assert.strictEqual(converters.BufferSource(growableView, {
-      __proto__: null,
-      allowShared: true,
-      allowResizable: true,
-    }), growableView);
-    assert.strictEqual(converters.Uint8Array(growableView, {
-      __proto__: null,
-      allowShared: true,
-      allowResizable: true,
-    }), growableView);
-  }
+  const growableView = createGrowableSharedArrayBufferView();
+
+  assert.throws(() => converters.BufferSource(growableView, {
+    __proto__: null,
+    ...opts,
+    allowShared: true,
+    allowResizable: false,
+  }), {
+    name: 'TypeError',
+    code: 'ERR_INVALID_ARG_TYPE',
+    message: 'Prefix: Context is backed by a growable ' +
+      'SharedArrayBuffer, which is not allowed.',
+  });
+  assert.throws(() => converters.Uint8Array(growableView, {
+    __proto__: null,
+    ...opts,
+    allowShared: true,
+  }), {
+    name: 'TypeError',
+    code: 'ERR_INVALID_ARG_TYPE',
+    message: 'Prefix: Context is backed by a growable ' +
+      'SharedArrayBuffer, which is not allowed.',
+  });
+  assert.strictEqual(converters.BufferSource(growableView, {
+    __proto__: null,
+    allowShared: true,
+    allowResizable: true,
+  }), growableView);
+  assert.strictEqual(converters.Uint8Array(growableView, {
+    __proto__: null,
+    allowShared: true,
+    allowResizable: true,
+  }), growableView);
 }