Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(webidl): derive data transfer receiver checks

ldm0147c0ef404ce
diff --git a/moli-renderer-v8/src/context_bootstrap/assets/prototype_bindings.rs b/moli-renderer-v8/src/context_bootstrap/assets/prototype_bindings.rs
index 77212be94..6f6a5f70a 100644
--- a/moli-renderer-v8/src/context_bootstrap/assets/prototype_bindings.rs
+++ b/moli-renderer-v8/src/context_bootstrap/assets/prototype_bindings.rs
@@ -214,7 +214,7 @@ struct WorkerTemplateMethodsDeclaration {
}
#[derive(WebApiFunctionTemplate)]
-#[webapi(interface = web_api_interfaces::DataTransfer, enumerable)]
+#[webapi(interface = web_api_interfaces::DataTransfer, enumerable, receiver)]
struct DataTransferTemplateMethodsDeclaration {
#[webapi(
method = "getData",
@@ -239,7 +239,7 @@ struct DataTransferTemplateMethodsDeclaration {
}
#[derive(WebApiFunctionTemplate)]
-#[webapi(interface = web_api_interfaces::DataTransferItem, enumerable)]
+#[webapi(interface = web_api_interfaces::DataTransferItem, enumerable, receiver)]
struct DataTransferItemTemplateMethodsDeclaration {
#[webapi(
method = "getAsFile",
@@ -264,7 +264,7 @@ struct DataTransferItemTemplateMethodsDeclaration {
}
#[derive(WebApiFunctionTemplate)]
-#[webapi(interface = web_api_interfaces::DataTransferItemList, enumerable)]
+#[webapi(interface = web_api_interfaces::DataTransferItemList, enumerable, receiver)]
struct DataTransferItemListTemplateMethodsDeclaration {
#[webapi(
intrinsic_data_property = v8::Intrinsic::ArrayProtoValues,
diff --git a/moli-renderer-v8/src/context_bootstrap/file_api/data_transfer.rs b/moli-renderer-v8/src/context_bootstrap/file_api/data_transfer.rs
index 6eb2c00f2..4c9839c54 100644
--- a/moli-renderer-v8/src/context_bootstrap/file_api/data_transfer.rs
+++ b/moli-renderer-v8/src/context_bootstrap/file_api/data_transfer.rs
@@ -83,7 +83,7 @@ struct DataTransferShellDeclaration {
}
#[derive(WebApiFunctionTemplate)]
-#[webapi(interface = web_api_interfaces::DataTransfer)]
+#[webapi(interface = web_api_interfaces::DataTransfer, receiver)]
struct DataTransferPrototypeAccessorsDeclaration {
#[webapi(accessor_property, getter = data_transfer_files_getter, enumerable)]
files: (),
@@ -125,7 +125,7 @@ struct DataTransferItemListObjectDeclaration<'s> {
}
#[derive(WebApiFunctionTemplate)]
-#[webapi(interface = web_api_interfaces::DataTransferItemList)]
+#[webapi(interface = web_api_interfaces::DataTransferItemList, receiver)]
struct DataTransferItemListPrototypeAccessorsDeclaration {
#[webapi(accessor_property, getter = data_transfer_item_list_length_getter, enumerable)]
length: (),
@@ -167,7 +167,7 @@ struct DataTransferStringItemObjectDeclaration<'item_type, 'data> {
}
#[derive(WebApiFunctionTemplate)]
-#[webapi(interface = web_api_interfaces::DataTransferItem)]
+#[webapi(interface = web_api_interfaces::DataTransferItem, receiver)]
struct DataTransferItemPrototypeAccessorsDeclaration {
#[webapi(accessor_property, getter = data_transfer_item_kind_getter, enumerable)]
kind: (),
diff --git a/moli-renderer-v8/src/script_vm/tests/data_transfer_native_receivers.rs b/moli-renderer-v8/src/script_vm/tests/data_transfer_native_receivers.rs
new file mode 100644
index 000000000..a356a3573
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/data_transfer_native_receivers.rs
@@ -0,0 +1,58 @@
+use super::*;
+
+#[test]
+fn data_transfer_native_receivers_reject_forgery_before_conversion_in_the_callee_realm() {
+ let mut vm = new_storage_html_test_vm("https://data-transfer-native-receivers.test/");
+ let result = vm.eval(r#"
+ document.body.innerHTML = '<iframe></iframe>';
+ const other = document.querySelector('iframe').contentWindow;
+ const transfer = new DataTransfer(); const items = transfer.items; const item = items.add('hello', 'text/plain');
+ let conversions = 0;
+ let traps = 0;
+ const poison = {
+ [Symbol.toPrimitive]() { conversions++; return '3'; },
+ get subtree() { conversions++; throw new Error('unexpected options conversion'); }
+ };
+ const cases = [
+ ["DataTransfer", "types", "get", transfer, [], [poison]],
+ ["DataTransfer", "items", "get", transfer, [], [poison]],
+ ["DataTransfer", "dropEffect", "set", transfer, ['copy'], [poison]],
+ ["DataTransfer", "setData", "method", transfer, ['text/plain', 'hello'], [poison, poison]],
+ ["DataTransfer", "getData", "method", transfer, ['text/plain'], [poison]],
+ ["DataTransferItem", "kind", "get", item, [], [poison]],
+ ["DataTransferItem", "type", "get", item, [], [poison]],
+ ["DataTransferItem", "getAsFile", "method", item, [], [poison]],
+ ["DataTransferItemList", "length", "get", items, [], [poison]],
+ ["DataTransferItemList", "clear", "method", items, [], [poison]],
+ ];
+ for (const realm of [window, other]) {
+ for (const [interfaceName, name, kind, value, validArgs, invalidArgs] of cases) {
+ const prototype = realm[interfaceName].prototype;
+ const descriptor = Object.getOwnPropertyDescriptor(prototype, name);
+ const operation = kind === 'method' ? prototype[name] : descriptor && descriptor[kind];
+ if (typeof operation !== 'function')
+ throw new Error(interfaceName + '.' + name + ': missing prototype member');
+ const result = Reflect.apply(operation, value, validArgs);
+ if (kind === 'get' && result === undefined)
+ throw new Error(interfaceName + '.' + name + ': genuine receiver lost native state');
+ const author = new Proxy(value, {
+ get() { traps++; throw new Error('unexpected receiver get'); },
+ getPrototypeOf() { traps++; throw new Error('unexpected receiver prototype'); }
+ });
+ const revoked = Proxy.revocable(value, {}); revoked.revoke();
+ for (const receiver of [null, undefined, {}, Object.create(value),
+ Object.create(prototype), author, revoked.proxy]) {
+ let error;
+ try { Reflect.apply(operation, receiver, invalidArgs); }
+ catch (caught) { error = caught; }
+ if (!error || Object.getPrototypeOf(error) !== realm.TypeError.prototype)
+ throw new Error(interfaceName + '.' + name + ': expected callee TypeError');
+ }
+ }
+ }
+ if (conversions !== 0 || traps !== 0)
+ throw new Error('receiver validation ran author code before rejection');
+ 'ok';
+ "#).unwrap();
+ assert_eq!(result, "ok");
+}
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 83a95d951..5bef2bcd6 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
@@ -502,6 +502,9 @@ fn data_transfer_declared_slots_ignore_prototype_spoofing() {
entry.__lmFileSystemEntryIsFile = false;
entry.__lmFileSystemEntryIsDirectory = true;
+ const receiverError = action => {
+ try { action(); return "no error"; } catch (error) { return error.name; }
+ };
return JSON.stringify({
ownNamesBefore,
descriptors,
@@ -520,14 +523,14 @@ fn data_transfer_declared_slots_ignore_prototype_spoofing() {
entry.isDirectory
].join('|'),
fake: [
- DataTransfer.prototype.getData.call(fakeDataTransfer, 'text/plain'),
- fakeDataTransfer.types === undefined ? 'undefined' : fakeDataTransfer.types.join(','),
- fakeDataTransfer.dropEffect,
- fakeDataTransfer.effectAllowed,
- fakeList.length,
- fakeItem.kind,
- fakeItem.type,
- fakeItem.getAsFile(),
+ receiverError(() => DataTransfer.prototype.getData.call(fakeDataTransfer, 'text/plain')),
+ receiverError(() => fakeDataTransfer.types === undefined ? 'undefined' : fakeDataTransfer.types.join(',')),
+ receiverError(() => fakeDataTransfer.dropEffect),
+ receiverError(() => fakeDataTransfer.effectAllowed),
+ receiverError(() => fakeList.length),
+ receiverError(() => fakeItem.kind),
+ receiverError(() => fakeItem.type),
+ receiverError(() => fakeItem.getAsFile()),
entryNameGetter.call(fakeEntry),
entryPathGetter.call(fakeEntry)
].map(value => value === null ? 'null' : String(value)).join('|')
@@ -539,7 +542,7 @@ fn data_transfer_declared_slots_ignore_prototype_spoofing() {
assert_eq!(
result,
- r#"{"ownNamesBefore":{"dataTransfer":[],"itemList":[],"item":[],"entry":[]},"descriptors":{"dataTransfer":["files:function:get files:0:undefined:none:none:true:true","items:function:get items:0:undefined:none:none:true:true","types:function:get types:0:undefined:none:none:true:true","dropEffect:function:get dropEffect:0:function:set dropEffect:1:true:true","effectAllowed:function:get effectAllowed:0:function:set effectAllowed:1:true:true"],"itemList":["length:function:get length:0:undefined:none:none:true:true"],"item":["kind:function:get kind:0:undefined:none:none:true:true","type:function:get type:0:undefined:none:none:true:true"],"entry":["filesystem:function:get filesystem:0:undefined:none:none:true:true","fullPath:function:get fullPath:0:undefined:none:none:true:true","isDirectory:function:get isDirectory:0:undefined:none:none:true:true","isFile:function:get isFile:0:undefined:none:none:true:true","name:function:get name:0:undefined:none:none:true:true"]},"real":"alpha|text/plain,Files|none|none|2|file|text/plain|note.txt|note.txt|/note.txt|true|false","fake":"|undefined|none|uninitialized|0|||null||"}"#
+ r#"{"ownNamesBefore":{"dataTransfer":[],"itemList":[],"item":[],"entry":[]},"descriptors":{"dataTransfer":["files:function:get files:0:undefined:none:none:true:true","items:function:get items:0:undefined:none:none:true:true","types:function:get types:0:undefined:none:none:true:true","dropEffect:function:get dropEffect:0:function:set dropEffect:1:true:true","effectAllowed:function:get effectAllowed:0:function:set effectAllowed:1:true:true"],"itemList":["length:function:get length:0:undefined:none:none:true:true"],"item":["kind:function:get kind:0:undefined:none:none:true:true","type:function:get type:0:undefined:none:none:true:true"],"entry":["filesystem:function:get filesystem:0:undefined:none:none:true:true","fullPath:function:get fullPath:0:undefined:none:none:true:true","isDirectory:function:get isDirectory:0:undefined:none:none:true:true","isFile:function:get isFile:0:undefined:none:none:true:true","name:function:get name:0:undefined:none:none:true:true"]},"real":"alpha|text/plain,Files|none|none|2|file|text/plain|note.txt|note.txt|/note.txt|true|false","fake":"TypeError|TypeError|TypeError|TypeError|TypeError|TypeError|TypeError|TypeError||"}"#
);
}
diff --git a/moli-renderer-v8/src/script_vm/tests/mod.rs b/moli-renderer-v8/src/script_vm/tests/mod.rs
index b76243026..987ec67a4 100644
--- a/moli-renderer-v8/src/script_vm/tests/mod.rs
+++ b/moli-renderer-v8/src/script_vm/tests/mod.rs
@@ -2222,6 +2222,8 @@ mod audio_event_interfaces;
mod audio_value_owner_interface_exposure_interfaces;
mod cross_origin_named_children;
mod declarative_receivers;
+
+mod data_transfer_native_receivers;
mod frame_owner_origin_access;
mod hyperlink_null_url_protocol;
mod import_meta;