Skip to content

Lightpanda: the headless browser designed for AI and automation

webapi: a SharedArrayBuffer keyData is a TypeError

orezraey7d4df82817a0
diff --git a/src/browser/js/Local.zig b/src/browser/js/Local.zig
index fdd129b8e..73de48db9 100644
--- a/src/browser/js/Local.zig
+++ b/src/browser/js/Local.zig
@@ -798,7 +798,7 @@ fn jsValueToStruct(self: *const Local, comptime T: type, js_val: js.Value) !?T {
return .{ .values = arr };
},
js.BufferSource => {
- if (v8.v8__Value__IsSharedArrayBuffer(js_val.handle)) {
+ if (js_val.isSharedArrayBuffer()) {
return error.TypeError;
}
if (js_val.isArrayBufferView() and !js_val.isBufferSource()) {
diff --git a/src/browser/js/Value.zig b/src/browser/js/Value.zig
index 134c6a196..0f4c0300c 100644
--- a/src/browser/js/Value.zig
+++ b/src/browser/js/Value.zig
@@ -153,6 +153,10 @@ pub fn isArrayBuffer(self: Value) bool {
return v8.v8__Value__IsArrayBuffer(self.handle);
}
+pub fn isSharedArrayBuffer(self: Value) bool {
+ return v8.v8__Value__IsSharedArrayBuffer(self.handle);
+}
+
/// Whether this converts to a WebIDL BufferSource: an ArrayBuffer, or a view
/// onto one. Without [AllowShared], a SharedArrayBuffer, or a view onto one,
/// doesn't.
diff --git a/src/browser/tests/crypto.html b/src/browser/tests/crypto.html
index 18f4c6dde..b837a608e 100644
--- a/src/browser/tests/crypto.html
+++ b/src/browser/tests/crypto.html
@@ -3049,6 +3049,11 @@
results["publicExponent shared"] = await rsa(new Uint8Array(new SharedArrayBuffer(3)));
// A shared keyData is a TypeError of its conversion, before the algorithm.
results["import view, unknown algorithm"] = await outcome(() => subtle.importKey("raw", view, "NOPE", false, ["encrypt"]));
+ // A SharedArrayBuffer is a BufferSource that fails its conversion, not a
+ // JsonWebKey, in any format.
+ results["import jwk sab"] = await outcome(() => subtle.importKey("jwk", sab, "AES-GCM", false, ["encrypt"]));
+ results["import jwk sab, unknown algorithm"] = await outcome(() => subtle.importKey("jwk", sab, "NOPE", false, ["encrypt"]));
+ results["import jwk {}"] = await outcome(() => subtle.importKey("jwk", {}, "AES-GCM", false, ["encrypt"]));
// getRandomValues' ArrayBufferView isn't [AllowShared] either.
const random = (array) => { try { return crypto.getRandomValues(array) === array; } catch (err) { return err.name; } };
results["getRandomValues view"] = random(view);
@@ -3076,6 +3081,9 @@
expected["publicExponent ArrayBuffer"] = "TypeError";
expected["publicExponent shared"] = "TypeError";
expected["import view, unknown algorithm"] = "TypeError";
+ expected["import jwk sab"] = "TypeError";
+ expected["import jwk sab, unknown algorithm"] = "TypeError";
+ expected["import jwk {}"] = "DataError";
expected["getRandomValues view"] = "TypeError";
expected["getRandomValues plain"] = true;
diff --git a/src/browser/webapi/SubtleCrypto.zig b/src/browser/webapi/SubtleCrypto.zig
index 6cad24989..b4fe58ce6 100644
--- a/src/browser/webapi/SubtleCrypto.zig
+++ b/src/browser/webapi/SubtleCrypto.zig
@@ -125,8 +125,10 @@ pub fn importKey(
// keyData converts first (a JWK's members are read then), but a buffer's
// bytes are only read after the algorithm is normalized (bufferBytes).
// Any ArrayBuffer or view is the BufferSource (a Uint16Array too, which
- // KeyData's Uint8Array wouldn't take); any other object a JsonWebKey.
- var key_data: algorithm.KeyData = if (key_data_value.isArrayBuffer() or key_data_value.isArrayBufferView()) blk: {
+ // KeyData's Uint8Array wouldn't take); a shared one is one that fails its
+ // conversion (TypeError), not a JsonWebKey. Any other object is a JWK.
+ const is_buffer = key_data_value.isArrayBuffer() or key_data_value.isArrayBufferView() or key_data_value.isSharedArrayBuffer();
+ var key_data: algorithm.KeyData = if (is_buffer) blk: {
try checkBufferSource(key_data_value, local);
break :blk .{ .bytes = .{ .values = &.{} } };
} else local.jsValueToZig(algorithm.KeyData, key_data_value) catch |err| {