Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(storage): reuse Window accessors for popup Storage

ldm0789d6a9b23b7
diff --git a/moli-renderer-v8/src/context_bootstrap/web_storage/install.rs b/moli-renderer-v8/src/context_bootstrap/web_storage/install.rs
index 991881b28..d4ab7350e 100644
--- a/moli-renderer-v8/src/context_bootstrap/web_storage/install.rs
+++ b/moli-renderer-v8/src/context_bootstrap/web_storage/install.rs
@@ -44,13 +44,13 @@ struct StoragePrototypeMetadataDeclaration {
to_string_tag: (),
}
-#[derive(WebApiObject)]
-#[webapi(plain)]
-struct StorageAliasesDeclaration<'scope> {
- #[webapi(data_property = "localStorage")]
- local_storage: v8::Local<'scope, v8::Object>,
- #[webapi(data_property = "sessionStorage")]
- session_storage: v8::Local<'scope, v8::Object>,
+#[derive(Default, WebApiObject)]
+#[webapi(plain, enumerable)]
+struct StorageAliasesDeclaration {
+ #[webapi(accessor_property = "localStorage", getter = window_local_storage_getter)]
+ local_storage: (),
+ #[webapi(accessor_property = "sessionStorage", getter = window_session_storage_getter)]
+ session_storage: (),
}
#[derive(WebApiObject)]
@@ -91,17 +91,13 @@ pub(crate) fn install_storage_aliases_for_window<'s>(
scope: &mut v8::PinScope<'s, '_>,
window: v8::Local<'s, v8::Object>,
) -> Result<()> {
- let local_storage =
- ensure_storage_runtime_state_for_window(scope, window, WINDOW_LOCAL_STORAGE_SLOT, "local")
- .ok_or_else(|| anyhow!("failed to install localStorage object"))?;
- let session_storage = ensure_storage_runtime_state_for_window(
- scope,
- window,
- WINDOW_SESSION_STORAGE_SLOT,
- "session",
- )
- .ok_or_else(|| anyhow!("failed to install sessionStorage object"))?;
- StorageAliasesDeclaration::new(local_storage, session_storage)
+ ensure_storage_runtime_state_for_window(scope, window, WINDOW_LOCAL_STORAGE_SLOT, "local")
+ .ok_or_else(|| anyhow!("failed to install localStorage object"))?;
+ ensure_storage_runtime_state_for_window(scope, window, WINDOW_SESSION_STORAGE_SLOT, "session")
+ .ok_or_else(|| anyhow!("failed to install sessionStorage object"))?;
+ // Popup aliases must use the same receiver and origin checks as other
+ // Windows, even though their Storage objects are already initialized.
+ StorageAliasesDeclaration::default()
.initialize(scope, window)
.map_err(|error| anyhow!("failed to initialize storage aliases: {error}"))
}
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/clipboard_storage.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/clipboard_storage.rs
index 0bfbea568..1f26a7ece 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/clipboard_storage.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/clipboard_storage.rs
@@ -586,3 +586,28 @@ async fn clipboard_storage_survives_page_teardown_and_keeps_browser_contexts_sep
"#,
);
}
+
+#[test]
+fn popup_storage_aliases_reuse_window_getters_and_native_identity() {
+ let mut vm = new_storage_test_vm("https://popup-storage.test/");
+ assert_eq!(vm.eval(r#"(() => {
+ const check = (value, label) => { if (!value) throw new Error(label); };
+ const popup = open();
+ try {
+ for (const name of ['localStorage', 'sessionStorage']) {
+ const descriptor = Object.getOwnPropertyDescriptor(popup, name);
+ check(typeof descriptor.get === 'function' && descriptor.set === undefined &&
+ descriptor.enumerable && descriptor.configurable && !('value' in descriptor), name + ' descriptor');
+ const storage = popup[name];
+ check(storage === popup[name] && descriptor.get.call(popup) === storage, name + ' identity');
+ const globalGetter = Object.getOwnPropertyDescriptor(self, name).get;
+ check(globalGetter.call(popup) === storage, name + ' borrowed getter');
+ check(descriptor.get.call(self) === self[name], name + ' borrowed receiver');
+ let error;
+ try { descriptor.get.call({}); } catch (caught) { error = caught; }
+ check(error instanceof TypeError, name + ' receiver validation');
+ }
+ return true;
+ } finally { popup.close(); }
+ })()"#).expect("popup Storage getter fixture should evaluate"), "true");
+}