Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(fetch): keep data URL responses basic across request modes

ldm0faa73d360ed5
diff --git a/moli-renderer-v8/src/network_host/response/materialize.rs b/moli-renderer-v8/src/network_host/response/materialize.rs
index 26609feab..c67185acb 100644
--- a/moli-renderer-v8/src/network_host/response/materialize.rs
+++ b/moli-renderer-v8/src/network_host/response/materialize.rs
@@ -100,6 +100,7 @@ pub(crate) fn network_response_filter(
if is_redirect_status(head.status) {
Some(AsyncSubresourceFetchResponseFilter::OpaqueRedirect)
} else if request_mode == RequestMode::NoCors
+ && head.final_url.scheme() != "data"
&& head.url_list().has_cross_origin_url(&request_origin)
{
Some(AsyncSubresourceFetchResponseFilter::Opaque)
@@ -114,16 +115,20 @@ fn compute_fetch_response_type(
filter: FetchResponseFilter,
) -> &'static str {
let request_origin = request_origin.into();
- // Returning to the initiating origin does not undo response tainting.
+ // Main fetch selects basic tainting for data URLs regardless of request mode.
+ // HTTP responses retain cross-origin taint after a redirect back to the client.
match filter {
FetchResponseFilter::Basic => "basic",
FetchResponseFilter::Cors => "cors",
FetchResponseFilter::Opaque => "opaque",
FetchResponseFilter::OpaqueRedirect => "opaqueredirect",
- FetchResponseFilter::None if head.url_list().has_cross_origin_url(&request_origin) => {
- "cors"
+ FetchResponseFilter::None
+ if head.final_url.scheme() == "data"
+ || !head.url_list().has_cross_origin_url(&request_origin) =>
+ {
+ "basic"
}
- FetchResponseFilter::None => "basic",
+ FetchResponseFilter::None => "cors",
}
}
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/data_response.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/data_response.rs
new file mode 100644
index 000000000..bad4092ea
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/data_response.rs
@@ -0,0 +1,78 @@
+use super::*;
+
+async fn check_data_response_modes(worker: bool) {
+ let loader = static_http_loader(std::iter::empty::<String>());
+ let mut vm = new_page_task_executor_test_vm_with_loader("https://data-response.test/", &loader);
+ let probe = r#"(async () => {
+ const cases = [
+ ['data:,local%20body#fragment', 'text/plain;charset=US-ASCII', [108,111,99,97,108,32,98,111,100,121]],
+ ['data:application/octet-stream;base64,AP+A', 'application/octet-stream', [0,255,128]],
+ ['data:text/plain;charset=utf-8,%E4%B8%AD', 'text/plain;charset=utf-8', [228,184,173]]
+ ];
+ let count = 0;
+ for (const [url,mime,bytes] of cases) {
+ if (new URL(url).origin !== 'null') throw new Error('data URL origin must remain opaque');
+ for (const mode of ['cors','same-origin','no-cors']) {
+ for (const redirect of ['follow','manual','error']) {
+ for (const method of ['GET','HEAD','POST']) {
+ for (const input of ['url','request']) {
+ const label = [url,mode,redirect,method,input].join('/');
+ const assert = (condition,message) => { if (!condition) throw new Error(label+': '+message); };
+ const init = {mode,redirect,method};
+ const response = input === 'url'
+ ? await fetch(url,init)
+ : await fetch(new Request(url,{mode,method,redirect:'follow'}).clone(),{redirect});
+ assert(response instanceof Response,'Response');
+ assert(response.type === 'basic','type='+response.type);
+ assert(response.status === 200 && response.statusText === 'OK' && response.ok,'status');
+ assert(response.url.split('#')[0] === url.split('#')[0] && !response.redirected,'resource URL and redirected');
+ assert(response.headers.get('Content-Type') === mime,'Content-Type='+response.headers.get('Content-Type'));
+ assert(response.headers.get('Content-Length') === null,'no synthesized Content-Length');
+ // Basic tainting exposes the data URL's original body bytes.
+ if (method !== 'HEAD') {
+ const actual = Array.from(new Uint8Array(await response.arrayBuffer()));
+ assert(JSON.stringify(actual) === JSON.stringify(bytes),'body bytes '+actual);
+ }
+ count++;
+ }
+ }
+ }
+ }
+ }
+ return String(count);
+})()"#;
+ let script = if worker {
+ let worker_source = format!(
+ "Promise.resolve().then(() => {probe}).then(value => {{ postMessage(value); close(); }}, error => {{ postMessage(String(error.stack || error)); close(); }});"
+ );
+ format!(
+ "globalThis.dataResponseResult = 'pending'; const worker = new Worker('data:text/javascript,' + encodeURIComponent({})); worker.onmessage = event => {{ dataResponseResult = event.data; }}; worker.onerror = event => {{ dataResponseResult = event.message; event.preventDefault(); }};",
+ serde_json::to_string(&worker_source).unwrap()
+ )
+ } else {
+ format!(
+ "globalThis.dataResponseResult = 'pending'; Promise.resolve().then(() => {probe}).then(value => {{ dataResponseResult = value; }}, error => {{ dataResponseResult = String(error.stack || error); }});"
+ )
+ };
+ vm.eval(&script).unwrap();
+ tokio::time::timeout(std::time::Duration::from_secs(5), async {
+ while vm.eval("dataResponseResult === 'pending'").unwrap() == "true" {
+ wait_for_one_selected_page_task_executor_test_turn(&mut vm, &loader)
+ .await
+ .unwrap();
+ }
+ })
+ .await
+ .expect("data URL fetch matrix should settle locally");
+ assert_eq!(vm.eval("dataResponseResult").unwrap(), "162");
+}
+
+#[tokio::test]
+async fn data_response_preserves_basic_filter_in_window() {
+ check_data_response_modes(false).await;
+}
+
+#[tokio::test]
+async fn data_response_preserves_basic_filter_in_opaque_origin_worker() {
+ check_data_response_modes(true).await;
+}
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/mod.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/mod.rs
index dbb3ae0bb..0e7db3fc3 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/mod.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/mod.rs
@@ -3,6 +3,7 @@ use super::*;
mod blob_mime;
mod computed_style;
mod cssom;
+mod data_response;
mod dom;
mod file_input;
mod forms;