Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

fix(indexeddb): preserve factory conversion and request ownership

ldm04c264b2d92ca
diff --git a/moli-core/tests/web_apis/fixtures/indexeddb-factory-receivers.js b/moli-core/tests/web_apis/fixtures/indexeddb-factory-receivers.js
index 90e52197f..6ba6080e6 100644
--- a/moli-core/tests/web_apis/fixtures/indexeddb-factory-receivers.js
+++ b/moli-core/tests/web_apis/fixtures/indexeddb-factory-receivers.js
@@ -7,6 +7,10 @@ async function factoryReceiverProbe(prefix = 'factory-receivers') {
try { action(); } catch (error) { caught = error; }
check(label, caught !== undefined && Object.getPrototypeOf(caught) === prototype, caught);
};
+ const result = request => new Promise((resolve, reject) => {
+ request.onsuccess = () => resolve(request.result);
+ request.onerror = () => reject(request.error);
+ });
const exercise = async (label, Callee, Receiver) => {
const prototype = Callee.IDBFactory.prototype;
const factory = Receiver.indexedDB;
@@ -56,7 +60,7 @@ async function factoryReceiverProbe(prefix = 'factory-receivers') {
check(label + ': databases rejection is asynchronous for ' + kind, !rejection.synchronous);
}
check(label + ': brand checks do not invoke Proxy traps', traps === 0, traps);
- for (const [method, args] of methods.slice(0, 2)) {
+ for (const [method, args] of methods) {
reads = 0;
let caught;
try { Reflect.apply(prototype[method], factory, args); } catch (error) { caught = error; }
@@ -69,23 +73,44 @@ async function factoryReceiverProbe(prefix = 'factory-receivers') {
}
throws(label + ': open rejects zero version in callee realm',
() => prototype.open.call(factory, prefix, 0), Callee.TypeError.prototype);
+ throws(label + ': cmp rejects invalid keys in callee realm',
+ () => prototype.cmp.call(factory, null, 1), Callee.DOMException.prototype);
check(label + ': genuine receiver compares keys', prototype.cmp.call(factory, [1], [2]) === -1);
for (const [method, length] of [['open', 1], ['deleteDatabase', 1], ['databases', 0], ['cmp', 2]]) {
check(label + ': ' + method + ' length', prototype[method].length === length, prototype[method].length);
}
- // Native receiver identity survives public prototype mutation. Keep promise
- // allocation and settlement with the factory when borrowing a foreign method.
+ // Changing an author's prototype cannot remove native identity. Preserve the
+ // genuine receiver's storage ownership while borrowing another realm's API.
const originalPrototype = Object.getPrototypeOf(factory);
+ let request;
+ const conversionOrder = [];
+ const databaseName = prefix + '-' + label;
try {
Object.setPrototypeOf(factory, null);
check(label + ': native brand survives prototype removal', prototype.cmp.call(factory, 1, 2) === -1);
- const ignored = new Proxy({}, {get() { throw new Error('databases ignores arguments'); }});
- const databases = prototype.databases.call(factory, ignored);
- check(label + ': successful databases Promise belongs to receiver', Object.getPrototypeOf(databases) === Receiver.Promise.prototype);
- const infos = await databases;
- check(label + ': genuine databases receiver settles', Array.isArray(infos));
+ request = prototype.open.call(factory,
+ {toString() { conversionOrder.push('name'); return databaseName; }},
+ {valueOf() { conversionOrder.push('version'); return 1; }});
} finally { Object.setPrototypeOf(factory, originalPrototype); }
+ check(label + ': valid open conversion order', conversionOrder.join(',') === 'name,version', conversionOrder);
+ check(label + ': open request belongs to receiver', Object.getPrototypeOf(request) === Receiver.IDBOpenDBRequest.prototype);
+ check(label + ': open request source is null', request.source === null);
+ check(label + ': open request starts pending', request.readyState === 'pending');
+ const db = await result(request);
+ check(label + ': open preserves database name', db.name === databaseName, db.name);
+ check(label + ': open preserves version', db.version === 1, db.version);
+ const ignored = new Proxy({}, {get() { throw new Error('databases ignores arguments'); }});
+ const databases = prototype.databases.call(factory, ignored);
+ check(label + ': successful databases Promise belongs to receiver', Object.getPrototypeOf(databases) === Receiver.Promise.prototype);
+ const infos = await databases;
+ check(label + ': databases uses receiver storage', infos.some(info => info.name === databaseName && info.version === 1));
+ db.close();
+ const deletion = prototype.deleteDatabase.call(factory, databaseName);
+ check(label + ': delete request belongs to receiver', Object.getPrototypeOf(deletion) === Receiver.IDBOpenDBRequest.prototype);
+ check(label + ': delete request source is null', deletion.source === null);
+ check(label + ': delete succeeds', await result(deletion) === undefined);
+ check(label + ': database was deleted', !(await prototype.databases.call(factory)).some(info => info.name === databaseName));
};
await exercise('local', globalThis, globalThis);
if (typeof document !== 'undefined') {
diff --git a/moli-core/tests/web_apis/indexed_db_transaction.rs b/moli-core/tests/web_apis/indexed_db_transaction.rs
index e6689b72c..f827ae4b9 100644
--- a/moli-core/tests/web_apis/indexed_db_transaction.rs
+++ b/moli-core/tests/web_apis/indexed_db_transaction.rs
@@ -37,7 +37,7 @@ async fn indexed_db_factory_checks_native_receivers_and_rejects_promises_in_call
assert_eq!(result["state"], "pass", "{target}: {result}");
assert_eq!(
result["checks"].as_array().unwrap().len(),
- if target == "worker" { 149 } else { 447 },
+ if target == "worker" { 162 } else { 486 },
"{target}: {result}"
);
}
diff --git a/moli-renderer-v8/src/context_bootstrap/indexed_db/database/factory/cmp.rs b/moli-renderer-v8/src/context_bootstrap/indexed_db/database/factory/cmp.rs
index dfdf0952d..a0e9b8ed4 100644
--- a/moli-renderer-v8/src/context_bootstrap/indexed_db/database/factory/cmp.rs
+++ b/moli-renderer-v8/src/context_bootstrap/indexed_db/database/factory/cmp.rs
@@ -1,5 +1,6 @@
use super::*;
use crate::webidl;
+use moli_indexeddb::Key;
#[derive(webidl::WebIdlArgs)]
#[webidl(prefix = "IDBFactory.cmp")]
@@ -19,19 +20,39 @@ pub(in crate::context_bootstrap::indexed_db) fn idb_factory_cmp_callback<'s>(
return;
};
let _ = indexed_db_runtime_factory(scope);
- let left = match parse_idb_key(scope, parsed.first) {
- Ok(Some(key)) => key,
- _ => {
- throw_type_error(scope, "Failed to execute 'cmp': invalid key.");
- return;
- }
+ let Some(left) = comparison_key_or_throw(scope, parsed.first) else {
+ return;
};
- let right = match parse_idb_key(scope, parsed.second) {
- Ok(Some(key)) => key,
- _ => {
- throw_type_error(scope, "Failed to execute 'cmp': invalid key.");
- return;
- }
+ let Some(right) = comparison_key_or_throw(scope, parsed.second) else {
+ return;
};
rv.set_int32(compare_idb_keys(&left, &right));
}
+
+// Key conversion can invoke array getters. Preserve an author's exception and
+// report only genuine invalid-key results as DataError in the binding's realm.
+fn comparison_key_or_throw<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ value: v8::Local<'s, v8::Value>,
+) -> Option<Key> {
+ let try_catch = std::pin::pin!(v8::TryCatch::new(scope));
+ let mut scope = try_catch.init();
+ let parsed = parse_idb_key(&mut scope, value);
+ if scope.has_caught() {
+ scope.rethrow();
+ return None;
+ }
+ match parsed {
+ Ok(Some(key)) => Some(key),
+ Ok(None) | Err(_) => {
+ let exception = dom_exception_value(
+ &mut scope,
+ "The value is not a valid IndexedDB key.",
+ "DataError",
+ );
+ scope.throw_exception(exception);
+ scope.rethrow();
+ None
+ }
+ }
+}
diff --git a/moli-renderer-v8/src/context_bootstrap/indexed_db/database/factory/delete_database.rs b/moli-renderer-v8/src/context_bootstrap/indexed_db/database/factory/delete_database.rs
index 718b02436..931499a4e 100644
--- a/moli-renderer-v8/src/context_bootstrap/indexed_db/database/factory/delete_database.rs
+++ b/moli-renderer-v8/src/context_bootstrap/indexed_db/database/factory/delete_database.rs
@@ -36,6 +36,12 @@ pub(in crate::context_bootstrap::indexed_db) fn idb_factory_delete_database_call
scope.throw_exception(exception);
return;
};
+ // Argument conversions and synchronous exceptions belong to the callee.
+ // Allocate and schedule the resulting request in the factory's own realm.
+ let Some(relevant_context) = args.this().get_creation_context(scope) else {
+ return;
+ };
+ let scope = &mut v8::ContextScope::new(scope, relevant_context);
let _ = ensure_indexed_db_runtime_state(scope);
let origin = storage_scope.storage_key().to_owned();
let request_storage_scope = storage_scope.clone();
diff --git a/moli-renderer-v8/src/context_bootstrap/indexed_db/database/factory/open.rs b/moli-renderer-v8/src/context_bootstrap/indexed_db/database/factory/open.rs
index 0aaee2b41..2fbdc2c18 100644
--- a/moli-renderer-v8/src/context_bootstrap/indexed_db/database/factory/open.rs
+++ b/moli-renderer-v8/src/context_bootstrap/indexed_db/database/factory/open.rs
@@ -48,6 +48,12 @@ pub(in crate::context_bootstrap::indexed_db) fn idb_factory_open_callback<'s>(
};
let origin = storage_scope.storage_key().to_owned();
let request_storage_scope = storage_scope.clone();
+ // Argument conversions and synchronous exceptions belong to the callee.
+ // Allocate and schedule the resulting request in the factory's own realm.
+ let Some(relevant_context) = args.this().get_creation_context(scope) else {
+ return;
+ };
+ let scope = &mut v8::ContextScope::new(scope, relevant_context);
let _ = ensure_indexed_db_runtime_state(scope);
let Some(request) =
diff --git a/moli-wpt-compat/fixtures/wpt/ported/indexeddb/idb-query-boundary-conversion-basic.html b/moli-wpt-compat/fixtures/wpt/ported/indexeddb/idb-query-boundary-conversion-basic.html
index 8fd814125..dd7128850 100644
--- a/moli-wpt-compat/fixtures/wpt/ported/indexeddb/idb-query-boundary-conversion-basic.html
+++ b/moli-wpt-compat/fixtures/wpt/ported/indexeddb/idb-query-boundary-conversion-basic.html
@@ -39,7 +39,7 @@ promise_test(async () => {
"cmp second key is required"
);
assert_throws_name(
- "TypeError",
+ "DataError",
() => indexedDB.cmp(undefined, "a"),
"cmp validates present undefined as an IndexedDB key"
);