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): expose null bodies for HEAD and bodyless statuses

ldm0cc2b49438f0c
diff --git a/moli-core/tests/fixtures/runtime/fetched_null_body.js b/moli-core/tests/fixtures/runtime/fetched_null_body.js
new file mode 100644
index 000000000..f5d98e115
--- /dev/null
+++ b/moli-core/tests/fixtures/runtime/fetched_null_body.js
@@ -0,0 +1,43 @@
+async function runFetchedNullBodyProbe(url) {
+ const errors = [];
+ const check = (value, label) => { if (!value) errors.push(label); };
+ const cases = [['head', 200]];
+ for (const method of ['GET', 'POST', 'OPTIONS']) {
+ for (const status of [204, 205, 304]) cases.push([method, status]);
+ }
+ for (const [method, status] of cases) {
+ const label = method + '/' + status;
+ const controller = new AbortController();
+ const response = await fetch(url + '?code=' + status, {method, signal: controller.signal});
+ check(response.status === status, label + ': status');
+ check(response.body === null, label + ': null body');
+ if (response.body !== null) continue;
+ const clone = response.clone();
+ check(!response.bodyUsed && clone.body === null, label + ': unused clone');
+ check(await response.text() === '', label + ': empty text before abort');
+ controller.abort({reason: 'after response headers'});
+ for (const body of [response, clone]) {
+ for (let repeat = 0; repeat < 2; ++repeat) {
+ check(await body.text() === '', label + ': repeated text after abort');
+ check((await body.arrayBuffer()).byteLength === 0, label + ': empty arrayBuffer');
+ check((await body.bytes()).length === 0, label + ': empty bytes');
+ const blob = await body.blob();
+ check(blob.size === 0 && blob.type === 'application/x-www-form-urlencoded', label + ': empty blob');
+ check(Array.from((await body.formData()).entries()).length === 0, label + ': empty formData');
+ try { await body.json(); errors.push(label + ': empty JSON accepted'); }
+ catch (error) { check(error instanceof SyntaxError, label + ': JSON error'); }
+ check(!body.bodyUsed, label + ': null body remains unused');
+ check(body.clone().body === null, label + ': clone after consumption');
+ }
+ }
+ }
+ for (const empty of [false, true]) {
+ const response = await fetch(url + '?code=200&empty=' + Number(empty));
+ check(response.body instanceof ReadableStream, 'GET/200: non-null stream, empty=' + empty);
+ const clone = response.clone();
+ const expected = empty ? '' : 'name=value';
+ check(await response.text() === expected && await clone.text() === expected, 'GET/200: body bytes');
+ check(response.bodyUsed && clone.bodyUsed, 'GET/200: consumed streams become used');
+ }
+ return {errors};
+}
diff --git a/moli-core/tests/web_apis.rs b/moli-core/tests/web_apis.rs
index c91312b6e..7386320e4 100644
--- a/moli-core/tests/web_apis.rs
+++ b/moli-core/tests/web_apis.rs
@@ -4,6 +4,9 @@ mod locked_body;
#[path = "web_apis/body_utf8.rs"]
mod body_utf8;
+#[path = "web_apis/fetched_null_body.rs"]
+mod fetched_null_body;
+
#[path = "web_apis/font_queries.rs"]
mod font_queries;
diff --git a/moli-core/tests/web_apis/fetched_null_body.rs b/moli-core/tests/web_apis/fetched_null_body.rs
new file mode 100644
index 000000000..457c1a788
--- /dev/null
+++ b/moli-core/tests/web_apis/fetched_null_body.rs
@@ -0,0 +1,69 @@
+use super::*;
+
+#[tokio::test(flavor = "multi_thread")]
+async fn fetched_null_bodies_stay_unused_through_consumption_cloning_and_abort() -> Result<()> {
+ use tokio::io::{AsyncReadExt, AsyncWriteExt};
+
+ let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await?;
+ let response_url = format!("http://{}/", listener.local_addr()?);
+ let mut tasks = tokio::task::JoinSet::new();
+ tasks.spawn(async move {
+ let mut connections = tokio::task::JoinSet::new();
+ while let Ok((mut stream, _)) = listener.accept().await {
+ connections.spawn(async move {
+ let mut request = Vec::new();
+ let mut buffer = [0u8; 1024];
+ while !request.windows(4).any(|bytes| bytes == b"\r\n\r\n") {
+ let len = stream.read(&mut buffer).await.unwrap();
+ if len == 0 {
+ return;
+ }
+ request.extend_from_slice(&buffer[..len]);
+ assert!(request.len() < 8192, "unexpectedly large request headers");
+ }
+ let request = String::from_utf8(request).unwrap();
+ let preflight = request.lines().any(|line| {
+ line.to_ascii_lowercase().starts_with("access-control-request-method:")
+ });
+ let mut fields = request.split_whitespace();
+ let method = fields.next().unwrap();
+ let url = url::Url::parse(&format!("http://fixture{}", fields.next().unwrap())).unwrap();
+ let code = url.query_pairs().find(|(name, _)| name == "code")
+ .map(|(_, value)| value.into_owned()).unwrap();
+ let code = if preflight { "204" } else { &code };
+ let empty = url.query_pairs().any(|(name, value)| name == "empty" && value == "1");
+ let body = if empty || preflight { "" } else { "name=value" };
+ let head = format!(
+ "HTTP/1.1 {code} Test\r\nContent-Type: application/x-www-form-urlencoded\r\nAccess-Control-Allow-Origin: *\r\nAccess-Control-Allow-Methods: GET, HEAD, POST, OPTIONS\r\nContent-Length: {}\r\nConnection: close\r\n\r\n",
+ body.len(),
+ );
+ if stream.write_all(head.as_bytes()).await.is_ok() && method != "HEAD" {
+ // Intentionally send bytes for null-body statuses as WPT's
+ // status.py does. Delay 205 so abort can race the transport.
+ if code == "205" {
+ tokio::time::sleep(Duration::from_millis(100)).await;
+ }
+ let _ = stream.write_all(body.as_bytes()).await;
+ }
+ });
+ }
+ });
+ let server = FixtureServer::spawn().await?;
+ let browser = Browser::new(AppConfig::default())?;
+ let source = format!(
+ "{}\nrunFetchedNullBodyProbe({}).then(finish, error => finish({{error: String(error)}}));",
+ include_str!("../fixtures/runtime/fetched_null_body.js"),
+ serde_json::to_string(&response_url)?,
+ );
+ for target in ["window", "child", "worker"] {
+ let observed = tokio::time::timeout(
+ Duration::from_secs(20),
+ super::pipe_disturbed::run_probe(&browser, &server, target, &source),
+ )
+ .await??;
+ assert_eq!(observed, serde_json::json!({"errors": []}), "{target}");
+ }
+ server.shutdown().await;
+ tasks.shutdown().await;
+ Ok(())
+}
diff --git a/moli-renderer-v8/src/network_host.rs b/moli-renderer-v8/src/network_host.rs
index 70344c9ff..523cc2cb6 100644
--- a/moli-renderer-v8/src/network_host.rs
+++ b/moli-renderer-v8/src/network_host.rs
@@ -149,8 +149,8 @@ pub(crate) use self::request_scope::{
#[cfg(test)]
pub(crate) use self::response::materialize_response_object;
pub(crate) use self::response::{
- FetchResponseSecurityViolation, MaterializedResponseBody, MaterializedResponseHead,
- build_fetch_response_object_for_request_mode,
+ FetchResponseRequest, FetchResponseSecurityViolation, MaterializedResponseBody,
+ MaterializedResponseHead, build_fetch_response_object_for_request_mode,
build_fetch_response_object_from_body_source_for_request_mode,
build_fetch_response_object_from_body_source_for_request_mode_with_filter,
build_fetch_response_object_from_stream_for_request_mode,
diff --git a/moli-renderer-v8/src/network_host/fetch/bindings.rs b/moli-renderer-v8/src/network_host/fetch/bindings.rs
index 1a4de609f..9c668d788 100644
--- a/moli-renderer-v8/src/network_host/fetch/bindings.rs
+++ b/moli-renderer-v8/src/network_host/fetch/bindings.rs
@@ -293,7 +293,10 @@ fn window_fetch_callback_in_relevant_realm<'s>(
let response_obj = build_fetch_response_object_for_request_mode(
scope,
&prepared.request_origin,
- prepared.request_mode,
+ FetchResponseRequest {
+ method: &prepared.method,
+ mode: prepared.request_mode,
+ },
response,
);
resolver.resolve(scope, response_obj.into());
diff --git a/moli-renderer-v8/src/network_host/response.rs b/moli-renderer-v8/src/network_host/response.rs
index de08736da..74d810ad6 100644
--- a/moli-renderer-v8/src/network_host/response.rs
+++ b/moli-renderer-v8/src/network_host/response.rs
@@ -25,7 +25,7 @@ pub(crate) use self::cors::{
#[cfg(test)]
pub(crate) use self::materialize::materialize_response_object;
pub(crate) use self::materialize::{
- MaterializedResponseBody, MaterializedResponseHead,
+ FetchResponseRequest, MaterializedResponseBody, MaterializedResponseHead,
build_fetch_response_object_for_request_mode,
build_fetch_response_object_from_body_source_for_request_mode,
build_fetch_response_object_from_body_source_for_request_mode_with_filter,
diff --git a/moli-renderer-v8/src/network_host/response/body_methods.rs b/moli-renderer-v8/src/network_host/response/body_methods.rs
index 8f831d1c3..436ca5b01 100644
--- a/moli-renderer-v8/src/network_host/response/body_methods.rs
+++ b/moli-renderer-v8/src/network_host/response/body_methods.rs
@@ -208,9 +208,11 @@ fn begin_body_consumption<'s>(
object: v8::Local<'s, v8::Object>,
receiver: BodyReceiver,
) -> bool {
- if body_stream_object(scope, object)
- .is_some_and(|stream| readable_body_stream_unusable(scope, stream))
- {
+ let Some(body) = body_stream_object(scope, object) else {
+ // Consuming a null body performs the empty conversion without disturbing it.
+ return true;
+ };
+ if readable_body_stream_unusable(scope, body) {
return false;
}
match receiver {
diff --git a/moli-renderer-v8/src/network_host/response/materialize.rs b/moli-renderer-v8/src/network_host/response/materialize.rs
index 1f8856cdb..e4193d2cc 100644
--- a/moli-renderer-v8/src/network_host/response/materialize.rs
+++ b/moli-renderer-v8/src/network_host/response/materialize.rs
@@ -11,6 +11,18 @@ use moli_fetch::RequestMode;
use moli_url::WebOrigin;
use moli_webapi_declare::WebApiObject;
+#[derive(Clone, Copy)]
+pub(crate) struct FetchResponseRequest<'a> {
+ pub(crate) method: &'a str,
+ pub(crate) mode: RequestMode,
+}
+
+impl FetchResponseRequest<'_> {
+ fn has_null_body(self, status: u16) -> bool {
+ matches!(self.method, "HEAD" | "CONNECT") || matches!(status, 101 | 103 | 204 | 205 | 304)
+ }
+}
+
fn is_redirect_status(status: u16) -> bool {
matches!(status, 301 | 302 | 303 | 307 | 308)
}
@@ -175,7 +187,7 @@ fn filtered_response_status_text(
pub(crate) fn build_fetch_response_object_for_request_mode<'s>(
scope: &mut v8::PinScope<'s, '_>,
request_origin: impl Into<WebOrigin>,
- request_mode: RequestMode,
+ request: FetchResponseRequest<'_>,
response: Response,
) -> v8::Local<'s, v8::Object> {
let request_origin = request_origin.into();
@@ -183,7 +195,7 @@ pub(crate) fn build_fetch_response_object_for_request_mode<'s>(
build_fetch_response_object_from_body_source_for_request_mode(
scope,
&request_origin,
- request_mode,
+ request,
head,
body,
)
@@ -192,7 +204,7 @@ pub(crate) fn build_fetch_response_object_for_request_mode<'s>(
pub(crate) fn build_fetch_response_object_from_body_source_for_request_mode<'s>(
scope: &mut v8::PinScope<'s, '_>,
request_origin: impl Into<WebOrigin>,
- request_mode: RequestMode,
+ request: FetchResponseRequest<'_>,
head: moli_fetch::ResponseHead,
body: moli_fetch::ResponseBody,
) -> v8::Local<'s, v8::Object> {
@@ -200,7 +212,7 @@ pub(crate) fn build_fetch_response_object_from_body_source_for_request_mode<'s>(
build_fetch_response_object_from_body_source_for_request_mode_with_filter(
scope,
&request_origin,
- request_mode,
+ request,
head,
body,
None,
@@ -210,7 +222,7 @@ pub(crate) fn build_fetch_response_object_from_body_source_for_request_mode<'s>(
pub(crate) fn build_fetch_response_object_from_body_source_for_request_mode_with_filter<'s>(
scope: &mut v8::PinScope<'s, '_>,
request_origin: impl Into<WebOrigin>,
- request_mode: RequestMode,
+ request: FetchResponseRequest<'_>,
head: moli_fetch::ResponseHead,
body: moli_fetch::ResponseBody,
filter_override: Option<crate::types::AsyncSubresourceFetchResponseFilter>,
@@ -218,9 +230,11 @@ pub(crate) fn build_fetch_response_object_from_body_source_for_request_mode_with
let request_origin = request_origin.into();
let filter = filter_override
.map(FetchResponseFilter::from)
- .unwrap_or_else(|| response_filter(&request_origin, &head, request_mode));
+ .unwrap_or_else(|| response_filter(&request_origin, &head, request.mode));
let obj = build_fetch_response_object_head(scope, &request_origin, &head, filter, None);
- let body_stream = if filtered_response_exposes_body(filter) {
+ let body_stream = if request.has_null_body(head.status) {
+ None
+ } else if filtered_response_exposes_body(filter) {
network_body_stream_from_response_body(scope, obj, body)
} else {
set_filtered_response_internal_body_from_response_body(scope, obj, body);
@@ -232,14 +246,16 @@ pub(crate) fn build_fetch_response_object_from_body_source_for_request_mode_with
pub(crate) fn build_fetch_response_object_from_subresource_body_for_request_mode<'s>(
scope: &mut v8::PinScope<'s, '_>,
request_origin: impl Into<WebOrigin>,
- request_mode: RequestMode,
+ request: FetchResponseRequest<'_>,
head: moli_fetch::ResponseHead,
body: crate::protocol_types::SubresourceResponseBody,
) -> v8::Local<'s, v8::Object> {
let request_origin = request_origin.into();
- let filter = response_filter(&request_origin, &head, request_mode);
+ let filter = response_filter(&request_origin, &head, request.mode);
let obj = build_fetch_response_object_head(scope, &request_origin, &head, filter, None);
- let body_stream = if filtered_response_exposes_body(filter) {
+ let body_stream = if request.has_null_body(head.status) {
+ None
+ } else if filtered_response_exposes_body(filter) {
Some(network_body_stream_from_subresource_body(scope, obj, body))
} else {
set_filtered_response_internal_body_from_subresource_body(scope, obj, body);
@@ -251,7 +267,7 @@ pub(crate) fn build_fetch_response_object_from_subresource_body_for_request_mode
pub(crate) fn build_fetch_response_object_from_stream_for_request_mode<'s>(
scope: &mut v8::PinScope<'s, '_>,
request_origin: impl Into<WebOrigin>,
- request_mode: RequestMode,
+ request: FetchResponseRequest<'_>,
head: moli_fetch::ResponseHead,
body_source_id: NetworkBodySourceId,
) -> v8::Local<'s, v8::Object> {
@@ -259,7 +275,7 @@ pub(crate) fn build_fetch_response_object_from_stream_for_request_mode<'s>(
build_fetch_response_object_from_stream_for_request_mode_with_filter(
scope,
&request_origin,
- request_mode,
+ request,
head,
body_source_id,
None,
@@ -269,7 +285,7 @@ pub(crate) fn build_fetch_response_object_from_stream_for_request_mode<'s>(
pub(crate) fn build_fetch_response_object_from_stream_for_request_mode_with_filter<'s>(
scope: &mut v8::PinScope<'s, '_>,
request_origin: impl Into<WebOrigin>,
- request_mode: RequestMode,
+ request: FetchResponseRequest<'_>,
head: moli_fetch::ResponseHead,
body_source_id: NetworkBodySourceId,
filter_override: Option<crate::types::AsyncSubresourceFetchResponseFilter>,
@@ -278,7 +294,7 @@ pub(crate) fn build_fetch_response_object_from_stream_for_request_mode_with_filt
build_fetch_response_object_from_stream_for_request_mode_with_surface_url(
scope,
&request_origin,
- request_mode,
+ request,
head,
body_source_id,
None,
@@ -289,14 +305,14 @@ pub(crate) fn build_fetch_response_object_from_stream_for_request_mode_with_filt
pub(crate) fn build_navigation_preload_response_object_from_stream_for_request_mode<'s>(
scope: &mut v8::PinScope<'s, '_>,
request_url: &url::Url,
- request_mode: RequestMode,
+ request: FetchResponseRequest<'_>,
head: moli_fetch::ResponseHead,
body_source_id: NetworkBodySourceId,
) -> v8::Local<'s, v8::Object> {
build_fetch_response_object_from_stream_for_request_mode_with_surface_url(
scope,
request_url,
- request_mode,
+ request,
head,
body_source_id,
Some(request_url.as_str()),
@@ -307,7 +323,7 @@ pub(crate) fn build_navigation_preload_response_object_from_stream_for_request_m
fn build_fetch_response_object_from_stream_for_request_mode_with_surface_url<'s>(
scope: &mut v8::PinScope<'s, '_>,
request_origin: impl Into<WebOrigin>,
- request_mode: RequestMode,
+ request: FetchResponseRequest<'_>,
head: moli_fetch::ResponseHead,
body_source_id: NetworkBodySourceId,
filtered_surface_url: Option<&str>,
@@ -316,7 +332,7 @@ fn build_fetch_response_object_from_stream_for_request_mode_with_surface_url<'s>
let request_origin = request_origin.into();
let filter = filter_override
.map(FetchResponseFilter::from)
- .unwrap_or_else(|| response_filter(&request_origin, &head, request_mode));
+ .unwrap_or_else(|| response_filter(&request_origin, &head, request.mode));
let filtered_surface_url = (filter == FetchResponseFilter::OpaqueRedirect)
.then_some(filtered_surface_url)
.flatten();
@@ -327,6 +343,12 @@ fn build_fetch_response_object_from_stream_for_request_mode_with_surface_url<'s>
filter,
filtered_surface_url,
);
+ if request.has_null_body(head.status) {
+ // Fetch nulls the internal body, including for filtered responses. Do
+ // not register a body source: subsequent transport chunks and terminal
+ // events then have no stream to enqueue into or retain bytes for.
+ return finish_fetch_response_object_with_body_stream(scope, obj, &head, None);
+ }
if !filtered_response_exposes_body(filter) {
set_filtered_response_internal_body_from_pending_stream(scope, obj, body_source_id);
return finish_fetch_response_object_with_body_stream(scope, obj, &head, None);
diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/fetch_xhr/fetch.rs b/moli-renderer-v8/src/runtime/page_vm/tests/fetch_xhr/fetch.rs
index 9111fd328..92e98bf87 100644
--- a/moli-renderer-v8/src/runtime/page_vm/tests/fetch_xhr/fetch.rs
+++ b/moli-renderer-v8/src/runtime/page_vm/tests/fetch_xhr/fetch.rs
@@ -1757,7 +1757,7 @@ async fn window_fetch_manual_redirect_returns_opaqueredirect_filtered_response()
server.await.expect("manual redirect fetch server should finish");
assert_eq!(
observed,
- r#"{"type":"opaqueredirect","status":0,"ok":false,"statusText":"","redirected":false,"urlMatchesRequest":true,"bodyIsNull":true,"headers":[],"bodyUsedBefore":false,"bodyUsedAfter":true,"text":"","cloneType":"opaqueredirect","cloneStatus":0,"cloneUrlMatchesRequest":true,"cloneBodyIsNull":true,"cloneText":""}"#
+ r#"{"type":"opaqueredirect","status":0,"ok":false,"statusText":"","redirected":false,"urlMatchesRequest":true,"bodyIsNull":true,"headers":[],"bodyUsedBefore":false,"bodyUsedAfter":false,"text":"","cloneType":"opaqueredirect","cloneStatus":0,"cloneUrlMatchesRequest":true,"cloneBodyIsNull":true,"cloneText":""}"#
);
let (records, _, _) = split_network_output_items(network_output);
assert_eq!(records.len(), 1);
@@ -1852,7 +1852,7 @@ async fn window_fetch_no_cors_cross_origin_returns_opaque_filtered_response() {
.contains("sec-fetch-mode: no-cors\r\n"));
assert_eq!(
observed,
- r#"{"type":"opaque","status":0,"ok":false,"statusText":"","url":"","redirected":false,"bodyIsNull":true,"headers":[],"bodyUsedBefore":false,"bodyUsedAfter":true,"text":"","cloneType":"opaque","cloneStatus":0,"cloneBodyIsNull":true,"cloneText":""}"#
+ r#"{"type":"opaque","status":0,"ok":false,"statusText":"","url":"","redirected":false,"bodyIsNull":true,"headers":[],"bodyUsedBefore":false,"bodyUsedAfter":false,"text":"","cloneType":"opaque","cloneStatus":0,"cloneBodyIsNull":true,"cloneText":""}"#
);
let (records, _, _) = split_network_output_items(network_output);
assert_eq!(records.len(), 1);
diff --git a/moli-renderer-v8/src/script_vm/subresource_fetch/fetch_dispatch.rs b/moli-renderer-v8/src/script_vm/subresource_fetch/fetch_dispatch.rs
index 44d0cf07f..554ff9600 100644
--- a/moli-renderer-v8/src/script_vm/subresource_fetch/fetch_dispatch.rs
+++ b/moli-renderer-v8/src/script_vm/subresource_fetch/fetch_dispatch.rs
@@ -562,6 +562,7 @@ impl ScriptVm {
match result {
Ok(mut response) => {
let response_status = response.status;
+ let response_request_method = request_method.clone();
let parkable_image = (!opaque_response_blocked
&& pending.info.resource_type == SubresourceResourceType::Image)
.then(|| {
@@ -673,7 +674,10 @@ impl ScriptVm {
crate::network_host::build_fetch_response_object_from_body_source_for_request_mode_with_filter(
scope,
&pending.request_origin,
- pending.request_mode,
+ crate::network_host::FetchResponseRequest {
+ method: &response_request_method,
+ mode: pending.request_mode,
+ },
head,
body,
response_filter,
diff --git a/moli-renderer-v8/src/script_vm/subresource_fetch/streaming.rs b/moli-renderer-v8/src/script_vm/subresource_fetch/streaming.rs
index 30a04e552..2d2cf09e5 100644
--- a/moli-renderer-v8/src/script_vm/subresource_fetch/streaming.rs
+++ b/moli-renderer-v8/src/script_vm/subresource_fetch/streaming.rs
@@ -902,7 +902,10 @@ impl ScriptVm {
let response_obj = crate::network_host::build_fetch_response_object_from_stream_for_request_mode_with_filter(
scope,
&pending.request_origin,
- pending.request_mode,
+ crate::network_host::FetchResponseRequest {
+ method: &started.request_method,
+ mode: pending.request_mode,
+ },
observable_head,
started.body_source_id,
started.response_filter,
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/service_worker_events.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/service_worker_events.rs
index 4c78223c4..090ae4585 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/service_worker_events.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/service_worker_events.rs
@@ -2843,7 +2843,7 @@ async fn navigator_service_worker_respond_with_no_cors_fetch_projects_opaque_res
&browser_context_runtime,
&loader,
"String(globalThis.__serviceWorkerOpaqueRespondWithFetchProbe)",
- "opaque|0|false|||false|true|0|false|true||opaque|0|true|",
+ "opaque|0|false|||false|true|0|false|false||opaque|0|true|",
)
.await;
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
index bad4092ea..c3ba8e6a3 100644
--- 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
@@ -25,14 +25,18 @@ async fn check_data_response_modes(worker: bool) {
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.url === url.split('#')[0] && !response.redirected,'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);
- }
+ assert(!response.bodyUsed,'body initially unused');
+ assert((response.body === null) === (method === 'HEAD'),'null body for HEAD');
+ let headerError;
+ try { response.headers.set('X-Author','changed'); } catch(error) { headerError = error; }
+ assert(headerError instanceof TypeError,'immutable fetch headers');
+ const expected = method === 'HEAD' ? [] : bytes;
+ const actual = Array.from(new Uint8Array(await response.arrayBuffer()));
+ assert(JSON.stringify(actual) === JSON.stringify(expected),'body bytes '+actual);
+ assert(response.bodyUsed === (method !== 'HEAD'),'bodyUsed');
count++;
}
}
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/xhr.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/xhr.rs
index 11b4e4c27..c7b105db1 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/xhr.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/xhr.rs
@@ -2587,7 +2587,10 @@ fn install_streaming_fetch_response_fixture(
crate::network_host::build_fetch_response_object_from_stream_for_request_mode(
scope,
&document_url,
- moli_fetch::RequestMode::Cors,
+ crate::network_host::FetchResponseRequest {
+ method: "GET",
+ mode: moli_fetch::RequestMode::Cors,
+ },
moli_fetch::ResponseHead {
final_url: request_url.clone(),
status: 200,
diff --git a/moli-renderer-v8/src/script_vm/tests/webidl_fetch/url_and_initializer_semantics.rs b/moli-renderer-v8/src/script_vm/tests/webidl_fetch/url_and_initializer_semantics.rs
index 69988da69..13482c91e 100644
--- a/moli-renderer-v8/src/script_vm/tests/webidl_fetch/url_and_initializer_semantics.rs
+++ b/moli-renderer-v8/src/script_vm/tests/webidl_fetch/url_and_initializer_semantics.rs
@@ -710,7 +710,10 @@ fn response_clone_tees_pending_network_body_after_parent_consumption() {
crate::network_host::build_fetch_response_object_from_stream_for_request_mode(
scope,
&document_url,
- moli_fetch::RequestMode::Cors,
+ crate::network_host::FetchResponseRequest {
+ method: "GET",
+ mode: moli_fetch::RequestMode::Cors,
+ },
moli_fetch::ResponseHead {
final_url: response_url,
status: 200,
@@ -811,7 +814,10 @@ fn pending_fetch_body_pipe_through_text_decoder_stream_pulls_future_chunks() {
crate::network_host::build_fetch_response_object_from_stream_for_request_mode(
scope,
&document_url,
- moli_fetch::RequestMode::Cors,
+ crate::network_host::FetchResponseRequest {
+ method: "GET",
+ mode: moli_fetch::RequestMode::Cors,
+ },
moli_fetch::ResponseHead {
final_url: response_url,
status: 200,
@@ -928,7 +934,10 @@ fn materialize_response_object_preserves_redirected_slot() {
let response = crate::network_host::build_fetch_response_object_for_request_mode(
scope,
&document_url,
- moli_fetch::RequestMode::Cors,
+ crate::network_host::FetchResponseRequest {
+ method: "GET",
+ mode: moli_fetch::RequestMode::Cors,
+ },
moli_fetch::Response::from_head_and_text_body(
moli_fetch::ResponseHead {
final_url: final_url.clone(),
@@ -981,7 +990,7 @@ fn filtered_response_materialization_preserves_urls_across_clone_and_cache() {
let response = crate::network_host::build_fetch_response_object_from_body_source_for_request_mode_with_filter(
scope,
&document_url,
- moli_fetch::RequestMode::Cors,
+ crate::network_host::FetchResponseRequest { method: "GET", mode: moli_fetch::RequestMode::Cors },
moli_fetch::ResponseHead {
final_url: final_url.clone(),
status: 302,
@@ -1422,3 +1431,81 @@ fn webidl_initializer_unions_convert_platform_objects_without_iterators_as_recor
"#).unwrap();
assert_eq!(result, "ok");
}
+
+#[test]
+fn fetched_null_bodies_discard_payloads_without_registering_pending_streams() {
+ use crate::network_host::{FetchResponseRequest, MaterializedResponseBody};
+
+ let vm = new_storage_test_vm("https://null-response.test/");
+ let context_ptr: *const v8::Global<v8::Context> = &vm.page_default_context as *const _;
+ let host = vm._context_host.clone();
+ vm.renderer_document_isolate
+ .with_entered_renderer_document_isolate(move |isolate| {
+ let scope = std::pin::pin!(v8::HandleScope::new(isolate));
+ let scope = &mut scope.init();
+ let context = unsafe { v8::Local::new(scope, &*context_ptr) };
+ let scope = &mut v8::ContextScope::new(scope, context);
+ let document_url = Url::parse("https://null-response.test/").unwrap();
+ for (method, status) in [
+ ("HEAD", 200), ("HEAD", 302), ("CONNECT", 200),
+ ("GET", 101), ("GET", 103), ("GET", 204), ("GET", 205), ("GET", 304),
+ ] {
+ for opaque in [false, true] {
+ for source in ["response", "bytes", "subresource", "stream", "preload"] {
+ let request = FetchResponseRequest {
+ method,
+ mode: if opaque { moli_fetch::RequestMode::NoCors } else { moli_fetch::RequestMode::Cors },
+ };
+ let head = moli_fetch::ResponseHead {
+ final_url: Url::parse("https://cross-null-response.test/data").unwrap(),
+ status,
+ headers: vec![("content-type".to_owned(), b"text/plain".to_vec())],
+ request_cookie_report: None,
+ cookie_set_reports: Vec::new(),
+ redirected: false,
+ redirect_chain: Vec::new(),
+ from_cache: false,
+ negotiated_http_version: None,
+ };
+ let id = crate::network_host::new_network_body_source_id();
+ let response = match source {
+ "response" => crate::network_host::build_fetch_response_object_for_request_mode(
+ scope, &document_url, request,
+ moli_fetch::Response::from_head_and_text_body(head, "discard me".to_owned()),
+ ),
+ "bytes" => crate::network_host::build_fetch_response_object_from_body_source_for_request_mode_with_filter(
+ scope, &document_url, request, head,
+ moli_fetch::ResponseBody::materialized_bytes(b"discard me".to_vec()),
+ opaque.then_some(crate::types::AsyncSubresourceFetchResponseFilter::Opaque),
+ ),
+ "subresource" => crate::network_host::build_fetch_response_object_from_subresource_body_for_request_mode(
+ scope, &document_url, request, head,
+ crate::protocol_types::SubresourceResponseBody::from_bytes(b"discard me".to_vec()),
+ ),
+ "stream" => crate::network_host::build_fetch_response_object_from_stream_for_request_mode(
+ scope, &document_url, request, head, id,
+ ),
+ "preload" => crate::network_host::build_navigation_preload_response_object_from_stream_for_request_mode(
+ scope, &document_url, request, head, id,
+ ),
+ _ => unreachable!(),
+ };
+ assert!(response.get(scope, v8str(scope, "body").into()).unwrap().is_null(),
+ "{method}/{status}/{opaque}/{source}");
+ assert!(!host.borrow().pending_network_body_sources.contains_key(&id));
+ crate::network_host::enqueue_pending_network_body_chunk(scope, id, b"late bytes".to_vec());
+ crate::network_host::error_pending_network_body_stream(scope, id, "late error".to_owned());
+ crate::network_host::close_pending_network_body_stream(scope, id);
+ match crate::network_host::materialize_response_object_body(scope, response, "null body") {
+ MaterializedResponseBody::Ready(bytes) => assert!(bytes.is_empty()),
+ _ => panic!("null internal body must materialize immediately: {method}/{status}/{opaque}/{source}"),
+ }
+ assert!(host.borrow().pending_network_body_sources.is_empty());
+ assert!(host.borrow().pending_network_body_clones.is_empty());
+ }
+ }
+ }
+ Ok(())
+ })
+ .expect("null response body checks should complete");
+}
diff --git a/moli-renderer-v8/src/service_worker_runtime/events.rs b/moli-renderer-v8/src/service_worker_runtime/events.rs
index b7777acea..826ceff3f 100644
--- a/moli-renderer-v8/src/service_worker_runtime/events.rs
+++ b/moli-renderer-v8/src/service_worker_runtime/events.rs
@@ -662,6 +662,7 @@ pub(crate) struct ServiceWorkerNavigationPreloadResponseStarted {
pub(crate) event_id: ServiceWorkerEventId,
pub(crate) owner: ServiceWorkerRunOwner,
pub(crate) request_url: Url,
+ pub(crate) request_method: String,
pub(crate) request_mode: moli_fetch::RequestMode,
pub(crate) body_source_id: NetworkBodySourceId,
pub(crate) response_head: MaterializedServiceWorkerFetchResponseHead,
diff --git a/moli-renderer-v8/src/service_worker_runtime/service/event_dispatch.rs b/moli-renderer-v8/src/service_worker_runtime/service/event_dispatch.rs
index 578bec6cb..f482981ab 100644
--- a/moli-renderer-v8/src/service_worker_runtime/service/event_dispatch.rs
+++ b/moli-renderer-v8/src/service_worker_runtime/service/event_dispatch.rs
@@ -19,6 +19,7 @@ struct ServiceWorkerNavigationPreloadDispatch {
event_id: ServiceWorkerEventId,
owner: ServiceWorkerRunOwner,
request_url: url::Url,
+ request_method: String,
request_mode: moli_fetch::RequestMode,
request_client: ResourceRequestClient,
resource_task_runner: crate::network::RendererResourceTaskRunner,
@@ -122,6 +123,7 @@ async fn stream_navigation_preload_response(
event_id: dispatch.event_id,
owner: dispatch.owner.clone(),
request_url: dispatch.request_url,
+ request_method: dispatch.request_method,
request_mode: dispatch.request_mode,
body_source_id,
response_head,
@@ -1396,6 +1398,7 @@ impl ServiceWorkerRuntimeService {
let request_url = job.request.url.clone();
let request_mode = job.request.request_mode;
+ let request_method = job.request.method.clone();
let request_client = job.request_client.clone();
let resource_task_runner = job.resource_task_runner.clone();
let cancel_handle = moli_fetch::FetchCancelHandle::new();
@@ -1414,6 +1417,7 @@ impl ServiceWorkerRuntimeService {
event_id: event.event_id,
owner: event.owner.clone(),
request_url,
+ request_method,
request_mode,
request_client,
resource_task_runner,
diff --git a/moli-renderer-v8/src/worker/global_scope/fetch.rs b/moli-renderer-v8/src/worker/global_scope/fetch.rs
index 9f7c8042b..7041b7608 100644
--- a/moli-renderer-v8/src/worker/global_scope/fetch.rs
+++ b/moli-renderer-v8/src/worker/global_scope/fetch.rs
@@ -2624,6 +2624,7 @@ pub(in crate::worker) fn start_worker_streaming_fetch(
pending.resolver.clone(),
pending.document_url.clone(),
pending.request_mode,
+ pending.request_method.clone(),
observable_head,
))
}
@@ -2639,11 +2640,16 @@ pub(in crate::worker) fn start_worker_streaming_fetch(
}
return;
}
- if let Some((resolver, document_url, request_mode, observable_head)) = response_input {
+ if let Some((resolver, document_url, request_mode, request_method, observable_head)) =
+ response_input
+ {
let response_obj = build_fetch_response_object_from_stream_for_request_mode(
scope,
&document_url,
- request_mode,
+ crate::network_host::FetchResponseRequest {
+ method: &request_method,
+ mode: request_mode,
+ },
observable_head,
started.body_source_id,
);
@@ -3019,7 +3025,10 @@ pub(in crate::worker) fn drain_worker_fetch_completion_result(
build_fetch_response_object_from_body_source_for_request_mode(
scope,
&pending.document_url,
- pending.request_mode,
+ crate::network_host::FetchResponseRequest {
+ method: &pending.request_method,
+ mode: pending.request_mode,
+ },
head,
body,
)
@@ -3034,7 +3043,10 @@ pub(in crate::worker) fn drain_worker_fetch_completion_result(
build_fetch_response_object_from_subresource_body_for_request_mode(
scope,
&pending.document_url,
- pending.request_mode,
+ crate::network_host::FetchResponseRequest {
+ method: &pending.request_method,
+ mode: pending.request_mode,
+ },
head,
body,
)
diff --git a/moli-renderer-v8/src/worker/thread/dispatch.rs b/moli-renderer-v8/src/worker/thread/dispatch.rs
index bae55df84..744a263f5 100644
--- a/moli-renderer-v8/src/worker/thread/dispatch.rs
+++ b/moli-renderer-v8/src/worker/thread/dispatch.rs
@@ -3568,7 +3568,10 @@ fn start_service_worker_navigation_preload_response_in_context(
let response_object = build_navigation_preload_response_object_from_stream_for_request_mode(
scope,
&started.request_url,
- started.request_mode,
+ crate::network_host::FetchResponseRequest {
+ method: &started.request_method,
+ mode: started.request_mode,
+ },
head,
started.body_source_id,
);
diff --git a/moli-renderer-v8/src/worker/thread/tests/lifecycle/worker_and_fetch_lifecycle.rs b/moli-renderer-v8/src/worker/thread/tests/lifecycle/worker_and_fetch_lifecycle.rs
index cc01c9bd4..f0ad41593 100644
--- a/moli-renderer-v8/src/worker/thread/tests/lifecycle/worker_and_fetch_lifecycle.rs
+++ b/moli-renderer-v8/src/worker/thread/tests/lifecycle/worker_and_fetch_lifecycle.rs
@@ -755,6 +755,7 @@ async fn service_worker_fetch_event_preload_response_resolves_network_response()
run.clone(),
),
request_url,
+ request_method: "GET".to_owned(),
request_mode: moli_fetch::RequestMode::Navigate,
body_source_id,
response_head: MaterializedServiceWorkerFetchResponseHead {
@@ -869,6 +870,7 @@ async fn service_worker_fetch_event_preload_response_opaqueredirect_exposes_requ
run.clone(),
),
request_url: request_url.clone(),
+ request_method: "GET".to_owned(),
request_mode: moli_fetch::RequestMode::Navigate,
body_source_id,
response_head: MaterializedServiceWorkerFetchResponseHead {
@@ -1039,6 +1041,7 @@ async fn service_worker_fetch_event_preload_response_body_errors_after_response(
run.clone(),
),
request_url,
+ request_method: "GET".to_owned(),
request_mode: moli_fetch::RequestMode::Navigate,
body_source_id,
response_head: MaterializedServiceWorkerFetchResponseHead {
@@ -1152,6 +1155,7 @@ async fn service_worker_fetch_event_preload_response_body_completes_after_fetch_
run.clone(),
),
request_url,
+ request_method: "GET".to_owned(),
request_mode: moli_fetch::RequestMode::Navigate,
body_source_id,
response_head: MaterializedServiceWorkerFetchResponseHead {
diff --git a/moli-renderer-v8/src/worker/thread/tests/network/fetch_network.rs b/moli-renderer-v8/src/worker/thread/tests/network/fetch_network.rs
index 38408e6df..a24e85bf9 100644
--- a/moli-renderer-v8/src/worker/thread/tests/network/fetch_network.rs
+++ b/moli-renderer-v8/src/worker/thread/tests/network/fetch_network.rs
@@ -1452,7 +1452,7 @@ async fn worker_fetch_manual_redirect_returns_opaqueredirect_filtered_response()
.expect("worker fetch manual-redirect server should finish");
assert_eq!(
post,
- r#"{"type":"opaqueredirect","status":0,"ok":false,"statusText":"","redirected":false,"urlMatchesRequest":true,"bodyIsNull":true,"headers":[],"bodyUsedBefore":false,"bodyUsedAfter":true,"text":"","cloneType":"opaqueredirect","cloneStatus":0,"cloneUrlMatchesRequest":true,"cloneBodyIsNull":true,"cloneText":""}"#
+ r#"{"type":"opaqueredirect","status":0,"ok":false,"statusText":"","redirected":false,"urlMatchesRequest":true,"bodyIsNull":true,"headers":[],"bodyUsedBefore":false,"bodyUsedAfter":false,"text":"","cloneType":"opaqueredirect","cloneStatus":0,"cloneUrlMatchesRequest":true,"cloneBodyIsNull":true,"cloneText":""}"#
);
}
@@ -1532,7 +1532,7 @@ async fn worker_fetch_no_cors_cross_origin_returns_opaque_filtered_response() {
assert!(request.contains("Sec-Fetch-Mode: no-cors\r\n"));
assert_eq!(
post,
- r#"{"type":"opaque","status":0,"ok":false,"statusText":"","url":"","redirected":false,"bodyIsNull":true,"headers":[],"bodyUsedBefore":false,"bodyUsedAfter":true,"text":"","cloneType":"opaque","cloneStatus":0,"cloneBodyIsNull":true,"cloneText":""}"#
+ r#"{"type":"opaque","status":0,"ok":false,"statusText":"","url":"","redirected":false,"bodyIsNull":true,"headers":[],"bodyUsedBefore":false,"bodyUsedAfter":false,"text":"","cloneType":"opaque","cloneStatus":0,"cloneBodyIsNull":true,"cloneText":""}"#
);
}