Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(file-api): derive Blob, File and FileList receiver checks

ldm0f7b841dde178
diff --git a/moli-renderer-v8/src/blob.rs b/moli-renderer-v8/src/blob.rs
index 98c226c82..b1f03ce8b 100644
--- a/moli-renderer-v8/src/blob.rs
+++ b/moli-renderer-v8/src/blob.rs
@@ -34,7 +34,7 @@ struct BlobInstanceDeclaration<'scope> {
}
#[derive(WebApiFunctionTemplate)]
-#[webapi(interface = web_api_interfaces::Blob, enumerable)]
+#[webapi(interface = web_api_interfaces::Blob, enumerable, receiver)]
struct BlobPrototypeDeclaration {
#[webapi(accessor_property, getter = blob_size_attribute_getter_callback)]
size: (),
@@ -271,6 +271,7 @@ fn blob_id_from_object<'s>(
scope: &mut v8::PinScope<'s, '_>,
object: v8::Local<'s, v8::Object>,
) -> Option<BlobId> {
+ let object = moli_webapi_declare::web_api_object_target(scope, object)?;
let value = get_private_value(scope, object, BLOB_ID_SLOT)?;
blob_id_from_value(scope, value)
}
diff --git a/moli-renderer-v8/src/context_bootstrap/file_api/file.rs b/moli-renderer-v8/src/context_bootstrap/file_api/file.rs
index b483ee62f..e502439c7 100644
--- a/moli-renderer-v8/src/context_bootstrap/file_api/file.rs
+++ b/moli-renderer-v8/src/context_bootstrap/file_api/file.rs
@@ -34,7 +34,7 @@ struct FileMetadataDeclaration {
}
#[derive(WebApiFunctionTemplate)]
-#[webapi(interface = web_api_interfaces::File)]
+#[webapi(interface = web_api_interfaces::File, receiver)]
struct FilePrototypeAccessorsDeclaration {
#[webapi(accessor_property, getter = file_name_attribute_getter_callback, enumerable)]
name: (),
@@ -106,7 +106,9 @@ fn file_last_modified_attribute_getter_callback<'s>(
args: v8::FunctionCallbackArguments<'s>,
mut rv: v8::ReturnValue<'_, v8::Value>,
) {
- let last_modified = get_private_value(scope, args.this(), FILE_LAST_MODIFIED_SLOT)
+ let receiver = moli_webapi_declare::web_api_object_target(scope, args.this())
+ .expect("File receiver validated by WebIDL");
+ let last_modified = get_private_value(scope, receiver, FILE_LAST_MODIFIED_SLOT)
.and_then(|value| value.number_value(scope))
.unwrap_or_else(unix_epoch_millis);
rv.set(v8::Number::new(scope, last_modified).into());
@@ -117,6 +119,7 @@ fn private_string_value<'s>(
object: v8::Local<'s, v8::Object>,
slot: &'static str,
) -> Option<String> {
+ let object = moli_webapi_declare::web_api_object_target(scope, object)?;
get_private_value(scope, object, slot)
.and_then(|value| value.to_string(scope))
.map(|value| value.to_rust_string_lossy(scope))
diff --git a/moli-renderer-v8/src/context_bootstrap/file_api/file_list.rs b/moli-renderer-v8/src/context_bootstrap/file_api/file_list.rs
index 58ac251d9..e02c74852 100644
--- a/moli-renderer-v8/src/context_bootstrap/file_api/file_list.rs
+++ b/moli-renderer-v8/src/context_bootstrap/file_api/file_list.rs
@@ -14,7 +14,7 @@ struct FileListObjectDeclaration {
}
#[derive(WebApiFunctionTemplate)]
-#[webapi(interface = web_api_interfaces::FileList)]
+#[webapi(interface = web_api_interfaces::FileList, receiver)]
struct FileListPrototypeAccessorsDeclaration {
#[webapi(accessor_property, getter = file_list_length_getter_callback, enumerable)]
length: (),
@@ -139,7 +139,9 @@ pub(in crate::context_bootstrap) fn file_list_item_callback<'s>(
let Some(parsed) = webidl::parse_args::<FileListItemArgs>(scope, &args) else {
return;
};
- let Some(value) = args.this().get_index(scope, parsed.index) else {
+ let receiver = moli_webapi_declare::web_api_object_target(scope, args.this())
+ .expect("FileList receiver validated by WebIDL");
+ let Some(value) = receiver.get_index(scope, parsed.index) else {
rv.set(v8::null(scope).into());
return;
};
@@ -165,6 +167,7 @@ fn file_list_length_from_object<'s>(
scope: &mut v8::PinScope<'s, '_>,
object: v8::Local<'s, v8::Object>,
) -> Option<f64> {
+ let object = moli_webapi_declare::web_api_object_target(scope, object)?;
get_private_value(scope, object, FILE_LIST_LENGTH_SLOT)
.and_then(|value| value.number_value(scope))
}
diff --git a/moli-renderer-v8/src/context_bootstrap/media_file_template.rs b/moli-renderer-v8/src/context_bootstrap/media_file_template.rs
index 5006c0557..f411cd3af 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_file_template.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_file_template.rs
@@ -57,15 +57,15 @@ use crate::{blob, util::callback_data_index_value, xml_serializer};
use moli_webapi_declare::WebApiFunctionTemplate;
#[derive(WebApiFunctionTemplate)]
-#[webapi(interface = web_api_interfaces::Blob, enumerable)]
+#[webapi(interface = web_api_interfaces::Blob, enumerable, receiver)]
struct BlobTemplateMethodsDeclaration {
- #[webapi(method, length = 0, callback = blob::blob_text_callback)]
+ #[webapi(method, length = 0, returns_promise, callback = blob::blob_text_callback)]
text: (),
- #[webapi(method, length = 0, callback = blob::blob_array_buffer_callback)]
+ #[webapi(method, length = 0, returns_promise, callback = blob::blob_array_buffer_callback)]
array_buffer: (),
- #[webapi(method, length = 0, callback = blob::blob_bytes_callback)]
+ #[webapi(method, length = 0, returns_promise, callback = blob::blob_bytes_callback)]
bytes: (),
#[webapi(method, length = 0, callback = blob::blob_stream_callback)]
@@ -86,7 +86,7 @@ struct OffscreenCanvasTemplateMethodsDeclaration {
}
#[derive(WebApiFunctionTemplate)]
-#[webapi(interface = web_api_interfaces::FileList, enumerable)]
+#[webapi(interface = web_api_interfaces::FileList, enumerable, receiver)]
struct FileListTemplateMethodsDeclaration {
#[webapi(method, length = 1, callback = file_list_item_callback)]
item: (),
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/dom/files_and_transfer.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/dom/files_and_transfer.rs
index 7a899c1e9..83a95d951 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/dom/files_and_transfer.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/dom/files_and_transfer.rs
@@ -43,6 +43,14 @@ fn file_constructor_preserves_declared_metadata_slots() {
__lmFileLastModified: 99
};
const fakeFileList = { __lmFileListLength: 99 };
+ const throwsTypeError = callback => {
+ try {
+ callback();
+ return false;
+ } catch (error) {
+ return error instanceof TypeError;
+ }
+ };
return JSON.stringify({
fileDescriptors: [
descriptorReport(File.prototype, "name"),
@@ -64,9 +72,10 @@ fn file_constructor_preserves_declared_metadata_slots() {
tag: Object.prototype.toString.call(explicitFile),
ctor: explicitFile instanceof File,
weirdLastModifiedFinite: Number.isFinite(weirdFile.lastModified),
- fakeName: nameDescriptor.get.call(fakeFile),
- fakeLastModifiedFinite: Number.isFinite(lastModifiedDescriptor.get.call(fakeFile)),
- fakeLength: lengthDescriptor.get.call(fakeFileList)
+ fakeNameThrows: throwsTypeError(() => nameDescriptor.get.call(fakeFile)),
+ fakeLastModifiedThrows: throwsTypeError(() => lastModifiedDescriptor.get.call(fakeFile)),
+ fakeLengthThrows: throwsTypeError(() => lengthDescriptor.get.call(fakeFileList)),
+ fakeItemThrows: throwsTypeError(() => FileList.prototype.item.call(fakeFileList, 0))
});
})()
"#,
@@ -75,7 +84,7 @@ fn file_constructor_preserves_declared_metadata_slots() {
assert_eq!(
result,
- r#"{"fileDescriptors":["name:function:get name:0:undefined:true:true","lastModified:function:get lastModified:0:undefined:true:true"],"fileListDescriptors":["length:function:get length:0:undefined:true:true"],"fileInternalNames":[],"fileListInternalNames":[],"defaultName":"default.txt","defaultLastModifiedFinite":true,"explicitName":"note.txt","explicitLastModified":7,"explicitType":"text/plain","roundTripName":"note.txt","roundTripLastModified":7,"roundTripType":"text/plain","tag":"[object File]","ctor":true,"weirdLastModifiedFinite":true,"fakeName":"","fakeLastModifiedFinite":true,"fakeLength":0}"#
+ r#"{"fileDescriptors":["name:function:get name:0:undefined:true:true","lastModified:function:get lastModified:0:undefined:true:true"],"fileListDescriptors":["length:function:get length:0:undefined:true:true"],"fileInternalNames":[],"fileListInternalNames":[],"defaultName":"default.txt","defaultLastModifiedFinite":true,"explicitName":"note.txt","explicitLastModified":7,"explicitType":"text/plain","roundTripName":"note.txt","roundTripLastModified":7,"roundTripType":"text/plain","tag":"[object File]","ctor":true,"weirdLastModifiedFinite":true,"fakeNameThrows":true,"fakeLastModifiedThrows":true,"fakeLengthThrows":true,"fakeItemThrows":true}"#
);
}
diff --git a/moli-renderer-v8/src/script_vm/tests/file_value_receivers.js b/moli-renderer-v8/src/script_vm/tests/file_value_receivers.js
new file mode 100644
index 000000000..e8c2e1f4c
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/file_value_receivers.js
@@ -0,0 +1,74 @@
+(() => {
+ const failures = [], promises = [];
+ const check = (name, fn) => {
+ try { if (!fn()) failures.push(name); }
+ catch (error) { failures.push(name + ': ' + error); }
+ };
+ const foreign = document.querySelector('iframe').contentWindow;
+ for (const [index, callee] of [window, foreign].entries()) {
+ const blob = new foreign.Blob(['contents'], {type: 'text/plain'});
+ const file = new foreign.File(['contents'], 'file.txt', {lastModified: 123});
+ const transfer = new foreign.DataTransfer(); transfer.items.add(file);
+ for (const [name, target, properties] of [
+ ['Blob', blob, ['size', 'type']], ['File', file, ['name', 'lastModified']],
+ ['FileList', transfer.files, ['length']],
+ ]) {
+ for (const property of properties) {
+ const getter = Object.getOwnPropertyDescriptor(callee[name].prototype, property).get;
+ check(name + '/' + property + '/genuine', () => getter.call(target) === target[property]);
+ let traps = 0;
+ const proxy = new Proxy(target, {get() {traps++; throw 42;}, getPrototypeOf() {traps++; throw 42;}});
+ const revoked = Proxy.revocable(target, {}); revoked.revoke();
+ for (const receiver of [{}, Object.create(target), Object.create(callee[name].prototype), proxy, revoked.proxy]) {
+ check(name + '/' + property + '/invalid', () => {
+ try {getter.call(receiver);} catch (error) {
+ return Object.getPrototypeOf(error) === callee.TypeError.prototype && traps === 0;
+ }
+ return false;
+ });
+ }
+ }
+ if (globalThis.__fileNativeValues) {
+ const {target: original, proxy} = __fileNativeValues[name];
+ for (const property of properties) {
+ const getter = Object.getOwnPropertyDescriptor(callee[name].prototype, property).get;
+ check(name + '/' + property + '/native-proxy', () => getter.call(proxy) === original[property]);
+ }
+ }
+ }
+ for (const [fn, target] of [
+ [callee.Blob.prototype.slice, blob], [callee.FileList.prototype.item, transfer.files],
+ ]) {
+ let conversions = 0;
+ const value = {valueOf() {conversions++; throw 42;}};
+ check('method/conversion-before-invalid-receiver/' + index, () => {
+ try {fn.call(new Proxy(target, {}), value);} catch (error) {
+ return Object.getPrototypeOf(error) === callee.TypeError.prototype && conversions === 0;
+ }
+ return false;
+ });
+ }
+ for (const method of ['text', 'arrayBuffer', 'bytes']) {
+ check(method + '/promise-rejection-boundary/' + index, () => {
+ const promise = callee.Blob.prototype[method].call(new Proxy(blob, {}));
+ if (Object.getPrototypeOf(promise) !== callee.Promise.prototype) return false;
+ promises.push(promise.then(() => failures.push(method + '/resolved'), error => {
+ if (Object.getPrototypeOf(error) !== callee.TypeError.prototype) failures.push(method + '/error-realm');
+ }));
+ return true;
+ });
+ }
+ if (globalThis.__fileNativeValues) {
+ const {target, proxy} = __fileNativeValues.Blob;
+ promises.push(callee.Blob.prototype.text.call(proxy).then(value => {
+ if (value !== 'contents') failures.push('native-proxy/text-content');
+ }, error => failures.push('native-proxy/text-error/' + error)));
+ check('native-proxy/slice', () => callee.Blob.prototype.slice.call(proxy, 1, 3).size === 2);
+ const files = __fileNativeValues.FileList;
+ check('native-proxy/item', () => callee.FileList.prototype.item.call(files.proxy, 0) === files.target.item(0));
+ }
+ }
+ globalThis.__fileValueResults = {complete: false, failures};
+ Promise.all(promises).then(() => {__fileValueResults.complete = true;});
+ return true;
+})()
diff --git a/moli-renderer-v8/src/script_vm/tests/file_value_receivers.rs b/moli-renderer-v8/src/script_vm/tests/file_value_receivers.rs
new file mode 100644
index 000000000..26ec6659b
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/file_value_receivers.rs
@@ -0,0 +1,58 @@
+use super::*;
+
+fn check_file_value_receivers(vm: &mut ScriptVm) {
+ vm.eval(include_str!("file_value_receivers.js")).unwrap();
+ vm.eval("0").unwrap();
+ assert_eq!(vm.eval("__fileValueResults.complete").unwrap(), "true");
+ assert_eq!(
+ vm.eval("JSON.stringify(__fileValueResults.failures)")
+ .unwrap(),
+ "[]"
+ );
+}
+
+#[test]
+fn file_value_interfaces_use_native_receiver_and_promise_error_adapters() {
+ let mut vm = new_storage_page_task_executor_test_vm("https://file-value-receivers.test/");
+ vm.eval("document.body.innerHTML = '<iframe></iframe>'")
+ .unwrap();
+ check_file_value_receivers(&mut vm);
+}
+
+#[test]
+fn file_value_interfaces_preserve_registered_proxy_state() {
+ let mut vm = new_storage_page_task_executor_test_vm("https://file-value-native-proxies.test/");
+ vm.eval(r#"
+ document.body.innerHTML = '<iframe></iframe>';
+ const foreign = document.querySelector('iframe').contentWindow;
+ const blob = new foreign.Blob(['contents'], {type: 'text/plain'});
+ const file = new foreign.File(['contents'], 'file.txt', {lastModified: 123});
+ const transfer = new foreign.DataTransfer(); transfer.items.add(file);
+ globalThis.__fileNativeValues = {Blob: {target: blob}, File: {target: file}, FileList: {target: transfer.files}};
+ "#).unwrap();
+ vm.with_default_context_scope_and_checkpoint_for_test(|scope, _| {
+ let global = scope.get_current_context().global(scope);
+ let key = crate::util::v8str(scope, "__fileNativeValues");
+ let values = global.get(scope, key.into()).unwrap();
+ let values = v8::Local::<v8::Object>::try_from(values).unwrap();
+ for name in ["Blob", "File", "FileList"] {
+ let key = crate::util::v8str(scope, name);
+ let entry = values.get(scope, key.into()).unwrap();
+ let entry = v8::Local::<v8::Object>::try_from(entry).unwrap();
+ let key = crate::util::v8str(scope, "target");
+ let target = entry.get(scope, key.into()).unwrap();
+ let target = v8::Local::<v8::Object>::try_from(target).unwrap();
+ let handler = crate::util::new_null_prototype_object(scope);
+ let proxy = v8::Proxy::new(scope, target, handler).unwrap();
+ moli_webapi_declare::register_web_api_proxy(scope, proxy).unwrap();
+ let key = crate::util::v8str(scope, "proxy");
+ assert_eq!(
+ entry.create_data_property(scope, key.into(), proxy.into()),
+ Some(true)
+ );
+ }
+ Ok(())
+ })
+ .unwrap();
+ check_file_value_receivers(&mut vm);
+}
diff --git a/moli-renderer-v8/src/script_vm/tests/mod.rs b/moli-renderer-v8/src/script_vm/tests/mod.rs
index 2abdafc2f..8af0a1a08 100644
--- a/moli-renderer-v8/src/script_vm/tests/mod.rs
+++ b/moli-renderer-v8/src/script_vm/tests/mod.rs
@@ -2252,4 +2252,6 @@ mod resize_observer_entries;
mod payment_events;
+mod file_value_receivers;
+
mod detached_node_producer_host;