Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions lib/internal/crypto/webidl.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

const {
ArrayBufferIsView,
ArrayBufferPrototype,
ArrayPrototypeIncludes,
ArrayPrototypePush,
ArrayPrototypeSort,
Expand Down Expand Up @@ -48,6 +47,7 @@ const {
validateMaxBufferLength,
kNamedCurveAliases,
} = require('internal/crypto/util');
const { isArrayBuffer } = require('internal/util/types');

// https://tc39.es/ecma262/#sec-tonumber
function toNumber(value, opts = kEmptyObject) {
Expand Down Expand Up @@ -193,9 +193,7 @@ converters.object = (V, opts) => {
return V;
};

function isNonSharedArrayBuffer(V) {
return ObjectPrototypeIsPrototypeOf(ArrayBufferPrototype, V);
}
const isNonSharedArrayBuffer = isArrayBuffer;

function isSharedArrayBuffer(V) {
// SharedArrayBuffers can be disabled with --no-harmony-sharedarraybuffer.
Expand Down
153 changes: 153 additions & 0 deletions test/parallel/test-crypto-subtle-cross-realm.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
'use strict';
// Flags: --expose-internals
const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const assert = require('assert');
const { subtle } = globalThis.crypto;
const vm = require('vm');
const { isArrayBuffer } = require('internal/util/types');

// Test with same-realm ArrayBuffer
{
const samerealmData = new Uint8Array([1, 2, 3, 4]).buffer;

subtle.digest('SHA-256', samerealmData)
.then(common.mustCall((result) => {
assert(isArrayBuffer(result));
assert.strictEqual(result.byteLength, 32); // SHA-256 is 32 bytes
}));
}

// Test with cross-realm ArrayBuffer
{
const context = vm.createContext({});
const crossrealmUint8Array = vm.runInContext('new Uint8Array([1, 2, 3, 4])', context);
const crossrealmBuffer = crossrealmUint8Array.buffer;

// Verify it's truly cross-realm
assert.notStrictEqual(
Object.getPrototypeOf(crossrealmBuffer),
ArrayBuffer.prototype
);

// This should still work, since we're checking structural type
subtle.digest('SHA-256', crossrealmBuffer)
.then(common.mustCall((result) => {
assert(isArrayBuffer(result));
assert.strictEqual(result.byteLength, 32); // SHA-256 is 32 bytes
}));
}

// Test with both TypedArray buffer methods
{
const context = vm.createContext({});
const crossrealmUint8Array = vm.runInContext('new Uint8Array([1, 2, 3, 4])', context);

// Test the .buffer property
subtle.digest('SHA-256', crossrealmUint8Array.buffer)
.then(common.mustCall((result) => {
assert(isArrayBuffer(result));
assert.strictEqual(result.byteLength, 32);
}));

// Test passing the TypedArray directly (should work both before and after the fix)
subtle.digest('SHA-256', crossrealmUint8Array)
.then(common.mustCall((result) => {
assert(isArrayBuffer(result));
assert.strictEqual(result.byteLength, 32);
}));
}

// Test with AES-GCM encryption/decryption using cross-realm ArrayBuffer
{
const context = vm.createContext({});
const crossRealmBuffer = vm.runInContext('new ArrayBuffer(16)', context);

// Fill the buffer with some data
const dataView = new Uint8Array(crossRealmBuffer);
for (let i = 0; i < dataView.length; i++) {
dataView[i] = i % 256;
}

// Generate a key
subtle.generateKey({
name: 'AES-GCM',
length: 256
}, true, ['encrypt', 'decrypt'])
.then(common.mustCall((key) => {
// Create an initialization vector
const iv = crypto.getRandomValues(new Uint8Array(12));

// Encrypt using the cross-realm ArrayBuffer
return subtle.encrypt(
{ name: 'AES-GCM', iv },
key,
crossRealmBuffer
).then((ciphertext) => {
// Decrypt
return subtle.decrypt(
{ name: 'AES-GCM', iv },
key,
ciphertext
);
}).then(common.mustCall((plaintext) => {
// Verify the decrypted content matches original
const decryptedView = new Uint8Array(plaintext);
for (let i = 0; i < dataView.length; i++) {
assert.strictEqual(
decryptedView[i],
dataView[i],
`Byte at position ${i} doesn't match`
);
}
}));
}));
}

// Test with AES-GCM using TypedArray view of cross-realm ArrayBuffer
{
const context = vm.createContext({});
const crossRealmBuffer = vm.runInContext('new ArrayBuffer(16)', context);

// Fill the buffer with some data
const dataView = new Uint8Array(crossRealmBuffer);
for (let i = 0; i < dataView.length; i++) {
dataView[i] = i % 256;
}

// Generate a key
subtle.generateKey({
name: 'AES-GCM',
length: 256
}, true, ['encrypt', 'decrypt'])
.then(common.mustCall((key) => {
// Create an initialization vector
const iv = crypto.getRandomValues(new Uint8Array(12));

// Encrypt using the TypedArray view of cross-realm ArrayBuffer
return subtle.encrypt(
{ name: 'AES-GCM', iv },
key,
dataView
).then((ciphertext) => {
// Decrypt
return subtle.decrypt(
{ name: 'AES-GCM', iv },
key,
ciphertext
);
}).then(common.mustCall((plaintext) => {
// Verify the decrypted content matches original
const decryptedView = new Uint8Array(plaintext);
for (let i = 0; i < dataView.length; i++) {
assert.strictEqual(
decryptedView[i],
dataView[i],
`Byte at position ${i} doesn't match`
);
}
}));
}));
}
Loading