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): require browser origins and unify SW request state

ldm053f790c13a3b
diff --git a/moli-core/src/runtime/mod.rs b/moli-core/src/runtime/mod.rs
index 642a39b28..024ac9bac 100644
--- a/moli-core/src/runtime/mod.rs
+++ b/moli-core/src/runtime/mod.rs
@@ -229,6 +229,19 @@ pub enum FetchedDocument {
Raw(Box<RawDocument>),
}
+// Browser's public page-loading API starts a new navigation without a caller
+// Document. An HTTP request supplied here enters browser semantics with that
+// opaque initiator; renderer subresources must already carry their environment.
+fn initial_navigation_request(request: Request) -> Request {
+ if request.request_origin().is_none() {
+ request
+ .with_request_origin(moli_url::WebOrigin::Opaque)
+ .with_request_mode(moli_fetch::RequestMode::Navigate)
+ } else {
+ request
+ }
+}
+
impl Browser {
fn resource_request_client(&self) -> ResourceRequestClient {
ResourceRequestClient::from_browser_resource_runtime_with_page_network_policy(
@@ -484,6 +497,7 @@ impl Browser {
lifecycle_decider: Option<RendererLifecycleDecider>,
raw_document_policy: RawDocumentFetchPolicy,
) -> Result<FetchedDocument> {
+ let request = initial_navigation_request(request);
let timeout = deadline.timeout();
let stage = wait_until.base_stage();
@@ -835,6 +849,7 @@ impl Browser {
}
async fn fetch_internal(&self, request: Request, stage: PageVmInitStage) -> Result<Page> {
+ let request = initial_navigation_request(request);
let raw_url = request.url.as_str().to_owned();
let requested_url = request.url.clone();
if is_about_blank_url(&requested_url) {
@@ -904,6 +919,7 @@ impl Browser {
request: Request,
stage: PageVmInitStage,
) -> Result<Page> {
+ let request = initial_navigation_request(request);
let raw_url = request.url.as_str().to_owned();
let requested_url = request.url.clone();
if is_about_blank_url(&requested_url) {
@@ -968,6 +984,7 @@ impl Browser {
stage: PageVmInitStage,
reply_boundary: RendererReplyBoundary,
) -> Result<FetchedDocument> {
+ let request = initial_navigation_request(request);
let raw_url = request.url.as_str().to_owned();
let requested_url = request.url.clone();
if is_about_blank_url(&requested_url) {
diff --git a/moli-core/src/runtime/navigation_engine.rs b/moli-core/src/runtime/navigation_engine.rs
index 4c8613ada..0105a8a5a 100644
--- a/moli-core/src/runtime/navigation_engine.rs
+++ b/moli-core/src/runtime/navigation_engine.rs
@@ -946,20 +946,28 @@ impl NavigationEngine {
request_headers: Vec<(String, String)>,
auth: Option<SubresourceAuthCredentials>,
) -> Result<NetworkFetchResult<NavigationResponse>> {
- let mut request = Request::new_bytes(method, raw_url, body, request_headers)
- .map(|request| {
- let request = request.with_top_level_navigation_cookie_context();
- let mut request = request.with_browser_navigation_kind(browser_navigation_kind);
- if !infer_referrer_from_initiator {
- request = request.without_inferred_referrer();
- }
- if let Some(initiator_url) = initiator_url {
- request.with_initiator_url(initiator_url)
- } else {
- request
- }
- })
- .context("failed to build request")?;
+ let mut request = Request::new_browser_bytes(
+ method,
+ raw_url,
+ body,
+ request_headers,
+ initiator_url.map_or(moli_url::WebOrigin::Opaque, moli_url::WebOrigin::from_url),
+ )
+ .map(|request| {
+ let request = request.with_top_level_navigation_cookie_context();
+ let mut request = request.with_browser_navigation_kind(browser_navigation_kind);
+ if !infer_referrer_from_initiator {
+ request = request.without_inferred_referrer();
+ }
+ if let Some(initiator_url) = initiator_url {
+ request
+ .with_initiator_url(initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(initiator_url))
+ } else {
+ request
+ }
+ })
+ .context("failed to build request")?;
request.set_auth(auth.map(Into::into));
let navigation_loader = self.navigation_resource_loader(
cookie_store,
@@ -1012,20 +1020,28 @@ impl NavigationEngine {
auth: Option<SubresourceAuthCredentials>,
cancel_handle: FetchCancelHandle,
) -> Result<NavigationStreamingRawResponse> {
- let mut request = Request::new_bytes(method, raw_url, body, request_headers)
- .map(|request| {
- let request = request.with_top_level_navigation_cookie_context();
- let mut request = request.with_browser_navigation_kind(browser_navigation_kind);
- if !infer_referrer_from_initiator {
- request = request.without_inferred_referrer();
- }
- if let Some(initiator_url) = initiator_url {
- request.with_initiator_url(initiator_url)
- } else {
- request
- }
- })
- .context("failed to build request")?;
+ let mut request = Request::new_browser_bytes(
+ method,
+ raw_url,
+ body,
+ request_headers,
+ initiator_url.map_or(moli_url::WebOrigin::Opaque, moli_url::WebOrigin::from_url),
+ )
+ .map(|request| {
+ let request = request.with_top_level_navigation_cookie_context();
+ let mut request = request.with_browser_navigation_kind(browser_navigation_kind);
+ if !infer_referrer_from_initiator {
+ request = request.without_inferred_referrer();
+ }
+ if let Some(initiator_url) = initiator_url {
+ request
+ .with_initiator_url(initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(initiator_url))
+ } else {
+ request
+ }
+ })
+ .context("failed to build request")?;
request.set_auth(auth.map(Into::into));
let navigation_loader =
self.navigation_resource_loader(cookie_store, request.url.clone(), cancel_handle)?;
diff --git a/moli-core/src/runtime/tests.rs b/moli-core/src/runtime/tests.rs
index 3fcd9c053..951601317 100644
--- a/moli-core/src/runtime/tests.rs
+++ b/moli-core/src/runtime/tests.rs
@@ -42,6 +42,10 @@ use tokio::{
};
use url::Url;
+fn browser_navigation_request(url: &str) -> Result<Request> {
+ Ok(Request::get(url)?.with_request_origin(moli_url::WebOrigin::Opaque))
+}
+
#[test]
fn browser_clone_keeps_shared_renderer_and_fetch_owners_live_after_source_drop() -> Result<()> {
let browser = Browser::new(AppConfig::default())?;
@@ -2082,7 +2086,7 @@ async fn fetch_deadline_spans_lifecycle_selector_and_script_without_reset() -> R
let deadline = FetchDeadline::new(Duration::from_millis(600))?;
let fetched = browser
.fetch_request_document_allow_http_error_with_wait_until_deadline(
- Request::get(&server.url("/static"))?,
+ browser_navigation_request(&server.url("/static"))?,
RenderedDomWaitUntil::Load,
deadline,
RawDocumentFetchPolicy::Materialize,
@@ -2147,7 +2151,7 @@ async fn best_effort_page_readiness_consumes_only_the_remaining_fetch_deadline()
let started = std::time::Instant::now();
let fetched = browser
.fetch_request_document_allow_http_error_with_wait_until_deadline(
- Request::get(&server.url(path))?,
+ browser_navigation_request(&server.url(path))?,
wait_until,
deadline,
RawDocumentFetchPolicy::Materialize,
@@ -2240,7 +2244,7 @@ async fn best_effort_readiness_does_not_soften_a_base_lifecycle_timeout() -> Res
let started = std::time::Instant::now();
let error = browser
.fetch_request_document_allow_http_error_with_wait_until(
- Request::get(&server.url("/wait-until-slow-static"))?,
+ browser_navigation_request(&server.url("/wait-until-slow-static"))?,
wait_until,
Duration::from_millis(200),
)
@@ -3547,7 +3551,7 @@ async fn renderer_owner_create_page_command_produces_page() -> Result<()> {
let browser = Browser::new(AppConfig::default())?;
let renderer_owner = browser.js_runtime.renderer_owner_handle();
- let request = Request::get(&server.url("/static"))?;
+ let request = browser_navigation_request(&server.url("/static"))?;
let requested_url = request.url.clone();
let response = browser.resource_request_client().fetch(request).await?;
let (response_head, response_body) = response.into_text_parts();
@@ -3609,7 +3613,7 @@ async fn renderer_owner_created_page_runs_common_page_commands() -> Result<()> {
let browser = Browser::new(AppConfig::default())?;
let renderer_owner = browser.js_runtime.renderer_owner_handle();
- let request = Request::get(&server.url("/static"))?;
+ let request = browser_navigation_request(&server.url("/static"))?;
let requested_url = request.url.clone();
let response = browser.resource_request_client().fetch(request).await?;
let (response_head, response_body) = response.into_text_parts();
@@ -4595,7 +4599,7 @@ async fn renderer_owner_created_page_runs_runtime_protocol_commands() -> Result<
let browser = Browser::new(AppConfig::default())?;
let renderer_owner = browser.js_runtime.renderer_owner_handle();
- let request = Request::get(&server.url("/static"))?;
+ let request = browser_navigation_request(&server.url("/static"))?;
let response = browser.resource_request_client().fetch(request).await?;
let (response_head, response_body) = response.into_text_parts();
let create_page_request = renderer_owner.build_create_html_page_request(
@@ -4660,7 +4664,7 @@ async fn renderer_owner_created_page_runs_document_start_commands() -> Result<()
let browser = Browser::new(AppConfig::default())?;
let renderer_owner = browser.js_runtime.renderer_owner_handle();
- let request = Request::get(&server.url("/static"))?;
+ let request = browser_navigation_request(&server.url("/static"))?;
let response = browser.resource_request_client().fetch(request).await?;
let (response_head, response_body) = response.into_text_parts();
let create_page_request = renderer_owner.build_create_html_page_request(
@@ -5427,7 +5431,7 @@ async fn renderer_owner_created_page_runs_subresource_interception_commands() ->
.set_renderer_output_transport_sender(output_tx);
let renderer_owner = browser.js_runtime.renderer_owner_handle();
- let request = Request::get(&server.url("/static"))?;
+ let request = browser_navigation_request(&server.url("/static"))?;
let requested_url = request.url.clone();
let response = browser.resource_request_client().fetch(request).await?;
let (response_head, response_body) = response.into_text_parts();
diff --git a/moli-core/tests/fetch/fixtures/blob-origin.js b/moli-core/tests/fetch/fixtures/blob-origin.js
new file mode 100644
index 000000000..fccbadab4
--- /dev/null
+++ b/moli-core/tests/fetch/fixtures/blob-origin.js
@@ -0,0 +1,45 @@
+async function(cross) {
+ const frame = document.createElement('iframe');
+ const created = new Promise(resolve => {
+ const handler = event => {
+ if (event.source !== frame.contentWindow || !event.data.blob) return;
+ removeEventListener('message', handler);
+ resolve(event.data);
+ };
+ addEventListener('message', handler);
+ });
+ frame.src = cross + '/blob-creator';
+ document.body.append(frame);
+ const foreign = await created;
+ const local = URL.createObjectURL(new Blob(['local']));
+ const cases = {foreign: foreign.blob, local, data: 'data:text/plain,data'};
+ const results = {creator: foreign.text};
+ for (const [name, url] of Object.entries(cases)) {
+ try {
+ results['window-' + name] = await (await fetch(url, {mode: 'same-origin'})).text();
+ } catch (error) { results['window-' + name] = error.name; }
+ }
+ const script = URL.createObjectURL(new Blob([`
+ onmessage = async event => {
+ const results = {};
+ for (const [name, url] of Object.entries(event.data)) {
+ try {
+ results['worker-' + name] = await (await fetch(url, {mode: 'same-origin'})).text();
+ } catch (error) { results['worker-' + name] = error.name; }
+ }
+ postMessage(results);
+ };
+ `], {type: 'text/javascript'}));
+ const worker = new Worker(script);
+ const workerResults = new Promise((resolve, reject) => {
+ worker.onmessage = event => resolve(event.data);
+ worker.onerror = reject;
+ });
+ worker.postMessage(cases);
+ Object.assign(results, await workerResults);
+ worker.terminate();
+ URL.revokeObjectURL(script);
+ URL.revokeObjectURL(local);
+ frame.remove();
+ return JSON.stringify(results);
+}
diff --git a/moli-core/tests/fetch/fixtures/srcdoc-origin.js b/moli-core/tests/fetch/fixtures/srcdoc-origin.js
new file mode 100644
index 000000000..2ea6767fe
--- /dev/null
+++ b/moli-core/tests/fetch/fixtures/srcdoc-origin.js
@@ -0,0 +1,50 @@
+async function(cross) {
+ const results = {};
+ const local = URL.createObjectURL(new Blob(['local']));
+ for (const opaque of [false, true]) {
+ const kind = opaque ? 'opaque' : 'inherited';
+ const cases = [
+ {name: 'relative', url: './forbidden-' + kind, mode: 'same-origin'},
+ {name: 'home', url: location.origin + (opaque ? '/forbidden-opaque-home' : '/allowed-home'), mode: 'same-origin'},
+ {name: 'redirect', url: location.origin + '/redirect-allowed?to=' + encodeURIComponent(cross + '/forbidden-redirect-' + kind), mode: 'same-origin'},
+ {name: 'blob', url: local, mode: 'same-origin'},
+ {name: 'data', url: 'data:text/plain,data', mode: 'same-origin'},
+ {name: 'cors', url: './cors-' + kind, mode: 'cors'},
+ {name: 'preflight', url: './preflight-' + kind, mode: 'cors', method: 'PUT', headers: {'X-Probe': 'yes'}}
+ ];
+ const frame = document.createElement('iframe');
+ if (opaque) frame.setAttribute('sandbox', 'allow-scripts');
+ const terminal = new Promise(resolve => {
+ const handler = event => {
+ if (event.source !== frame.contentWindow || event.data.kind !== kind) return;
+ removeEventListener('message', handler);
+ resolve(event.data.results);
+ };
+ addEventListener('message', handler);
+ });
+ frame.srcdoc = `<base href='${cross}/'><script>
+ (async () => {
+ const results = {};
+ for (const test of ${JSON.stringify(cases)}) {
+ try {
+ results[test.name] = await (await fetch(test.url, test)).text();
+ } catch (error) { results[test.name] = error.name; }
+ }
+ parent.postMessage({kind: '${kind}', results}, '*');
+ })();
+ <\/script>`;
+ document.body.append(frame);
+ results[kind] = await terminal;
+ frame.remove();
+ }
+ URL.revokeObjectURL(local);
+ const base = document.createElement('base');
+ base.href = cross + '/';
+ document.head.append(base);
+ try {
+ await fetch('./forbidden-top-base', {mode: 'same-origin'});
+ results.topBase = 'unexpected-success';
+ } catch (error) { results.topBase = error.name; }
+ base.remove();
+ return JSON.stringify(results);
+}
diff --git a/moli-core/tests/fetch/security.rs b/moli-core/tests/fetch/security.rs
index 47bab262b..d1d583275 100644
--- a/moli-core/tests/fetch/security.rs
+++ b/moli-core/tests/fetch/security.rs
@@ -15,6 +15,7 @@ struct IncomingRequest {
method: String,
path: String,
origin: Option<String>,
+ cookie: Option<String>,
}
struct SecurityServers {
@@ -61,7 +62,10 @@ impl SecurityServers {
let origin = text.lines().filter_map(|line| line.split_once(':'))
.find(|(key, _)| key.eq_ignore_ascii_case("Origin"))
.map(|(_, value)| value.trim().to_owned());
- let request = IncomingRequest { method, path, origin };
+ let cookie = text.lines().filter_map(|line| line.split_once(':'))
+ .find(|(key, _)| key.eq_ignore_ascii_case("Cookie"))
+ .map(|(_, value)| value.trim().to_owned());
+ let request = IncomingRequest { method, path, origin, cookie };
let (status, headers, body) = fixture_response(&request);
requests.lock().push(request);
let response = format!("HTTP/1.1 {status} Fixture\r\n{headers}Content-Length: {}\r\nConnection: close\r\n\r\n{body}", body.len());
@@ -96,10 +100,22 @@ fn fixture_response(request: &IncomingRequest) -> (u16, String, String) {
if url.path() == "/page" {
return (
200,
- "Content-Type: text/html\r\n".to_owned(),
+ "Content-Type: text/html\r\nSet-Cookie: originSession=present; Path=/; SameSite=Lax\r\n".to_owned(),
"<!doctype html><body>fetch security</body>".to_owned(),
);
}
+ if url.path() == "/blob-creator" {
+ return (
+ 200,
+ "Content-Type: text/html\r\n".to_owned(),
+ r#"<!doctype html><script>
+ const blob = URL.createObjectURL(new Blob(['foreign']));
+ fetch(blob, {mode: 'same-origin'}).then(response => response.text()).then(text =>
+ parent.postMessage({blob, text}, '*'));
+ </script>"#
+ .to_owned(),
+ );
+ }
if url.path() == "/sw.js" {
return (
200,
@@ -445,3 +461,86 @@ async fn text_track_without_crossorigin_blocks_cross_origin_before_network() ->
);
Ok(())
}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn window_and_worker_same_origin_mode_checks_blob_before_local_resolution() -> Result<()> {
+ let server = SecurityServers::spawn().await?;
+ let browser = Browser::new(BrowserConfig::default())?;
+ let mut page = browser.fetch(&format!("{}/page", server.origin)).await?;
+ let expression = format!(
+ "({})({})",
+ include_str!("fixtures/blob-origin.js"),
+ json!(server.cross)
+ );
+ let observed = results(
+ page.evaluate_runtime_expression_with_await_async(&expression, true)
+ .await?,
+ )?;
+ assert_eq!(
+ observed,
+ json!({
+ "creator": "foreign",
+ "window-foreign": "TypeError", "window-local": "local", "window-data": "data",
+ "worker-foreign": "TypeError", "worker-local": "local", "worker-data": "data"
+ })
+ );
+ Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn srcdoc_fetch_uses_inherited_or_opaque_origin_independently_of_base_url() -> Result<()> {
+ let server = SecurityServers::spawn().await?;
+ let browser = Browser::new(BrowserConfig::default())?;
+ let mut page = browser.fetch(&format!("{}/page", server.origin)).await?;
+ let expression = format!(
+ "({})({})",
+ include_str!("fixtures/srcdoc-origin.js"),
+ json!(server.cross)
+ );
+ let observed = results(
+ page.evaluate_runtime_expression_with_await_async(&expression, true)
+ .await?,
+ )?;
+ assert_eq!(
+ observed,
+ json!({
+ "inherited": {"relative":"TypeError", "home":"ok", "redirect":"TypeError", "blob":"local", "data":"data", "cors":"ok", "preflight":"ok"},
+ "opaque": {"relative":"TypeError", "home":"TypeError", "redirect":"TypeError", "blob":"TypeError", "data":"data", "cors":"ok", "preflight":"ok"},
+ "topBase":"TypeError"
+ })
+ );
+ let requests = server.requests.lock();
+ assert!(
+ !requests
+ .iter()
+ .any(|request| request.path.starts_with("/forbidden-")),
+ "{requests:?}"
+ );
+ let home = requests
+ .iter()
+ .find(|request| request.path == "/allowed-home")
+ .expect("same-origin control");
+ assert_eq!(
+ home.cookie.as_deref(),
+ Some("originSession=present"),
+ "{home:?}"
+ );
+ for (kind, expected_origin) in [("inherited", server.origin.as_str()), ("opaque", "null")] {
+ for (method, path) in [
+ ("GET", format!("/cors-{kind}")),
+ ("OPTIONS", format!("/preflight-{kind}")),
+ ("PUT", format!("/preflight-{kind}")),
+ ] {
+ let request = requests
+ .iter()
+ .find(|request| request.method == method && request.path == path)
+ .expect("expected allowed request");
+ assert_eq!(
+ request.origin.as_deref(),
+ Some(expected_origin),
+ "{request:?}"
+ );
+ }
+ }
+ Ok(())
+}
diff --git a/moli-fetch/src/blocking/mod.rs b/moli-fetch/src/blocking/mod.rs
index 76de311f3..e695e6cbd 100644
--- a/moli-fetch/src/blocking/mod.rs
+++ b/moli-fetch/src/blocking/mod.rs
@@ -14,7 +14,7 @@ use moli_cookie_jar::{
NetworkCookieRequestContext, SharedBrowserCookieStore, StoredCookieQueryReport,
StoredCookieSetReport, same_site_urls,
};
-use moli_url::{is_potentially_trustworthy_url, tuple_origin_url};
+use moli_url::is_potentially_trustworthy_url;
use moli_url_policy::ensure_http_network_transport_url;
use tracing::debug;
use url::Url;
@@ -398,6 +398,7 @@ fn append_browser_subresource_headers(
}
fn request_origin_header_value(request: &Request, request_url: &Url) -> Option<String> {
+ request.request_origin()?;
if !matches!(request_url.scheme(), "http" | "https") {
return None;
}
@@ -405,8 +406,7 @@ fn request_origin_header_value(request: &Request, request_url: &Url) -> Option<S
request.method.eq_ignore_ascii_case("GET") || request.method.eq_ignore_ascii_case("HEAD");
if safe_method
&& (request.request_mode != crate::RequestMode::Cors
- || (request.cookie_context.initiator_url.is_some()
- && !request.has_cross_origin_url(request_url)))
+ || !request.has_cross_origin_url(request_url))
{
return None;
}
@@ -460,15 +460,19 @@ fn append_browser_storage_access_header(
}
fn request_sec_fetch_site(request: &Request, request_url: &Url) -> String {
- let Some(initiator_url) = request.cookie_context.initiator_url.as_ref() else {
+ if request.is_navigation_request() && request.cookie_context.initiator_url.is_none() {
return "none".to_owned();
+ }
+ let Some(origin) = request.request_origin() else {
+ return "none".to_owned();
+ };
+ let Ok(initiator_url) = Url::parse(origin.ascii_serialization()) else {
+ return "cross-site".to_owned();
};
- let initiator_url =
- tuple_origin_url(initiator_url).unwrap_or(std::borrow::Cow::Borrowed(initiator_url));
let urls = request.url_list(request_url);
- if !urls.has_cross_origin_url(initiator_url.as_ref()) {
+ if !urls.has_cross_origin_url(origin) {
"same-origin".to_owned()
- } else if urls.has_cross_site_url(initiator_url.as_ref()) {
+ } else if urls.has_cross_site_url(&initiator_url) {
"cross-site".to_owned()
} else {
"same-site".to_owned()
@@ -1240,10 +1244,13 @@ mod tests {
let request_url = url(case.request_url);
let mut request = Request::new(case.method, case.request_url, None, Vec::new())
.unwrap()
+ .with_request_origin(moli_url::WebOrigin::Opaque)
.with_request_mode(case.mode)
.with_browser_request_metadata(BrowserRequestMetadata::Fetch);
if let Some(initiator) = case.initiator {
- request = request.with_initiator_url(&url(initiator));
+ request = request
+ .with_initiator_url(&url(initiator))
+ .with_request_origin(moli_url::WebOrigin::from_url(&url(initiator)));
}
let headers = outgoing_request_headers_for_url(&config, &request, &request_url, None);
@@ -1268,6 +1275,7 @@ mod tests {
)
.unwrap()
.with_initiator_url(&url("https://app.test/page"))
+ .with_request_origin(moli_url::WebOrigin::from_url(&url("https://app.test/page")))
.with_browser_request_metadata(BrowserRequestMetadata::Xhr);
let headers = outgoing_request_headers_for_url(&config, &request, &request_url, None);
@@ -1287,10 +1295,15 @@ mod tests {
let request_url = url("https://app.test/submit");
let request = Request::new("POST", request_url.as_str(), None, Vec::new())
.unwrap()
+ .with_request_origin(moli_url::WebOrigin::Opaque)
.with_top_level_navigation_cookie_context();
let headers = outgoing_request_headers_for_url(&config, &request, &request_url, None);
assert_eq!(header_value(&headers, "origin").as_deref(), Some("null"));
+ assert_eq!(
+ header_value(&headers, "sec-fetch-site").as_deref(),
+ Some("none")
+ );
}
#[test]
@@ -1302,6 +1315,7 @@ mod tests {
let request = Request::new("GET", original_url.as_str(), None, Vec::new())
.unwrap()
.with_initiator_url(&initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&initiator_url))
.with_browser_request_metadata(BrowserRequestMetadata::Fetch);
let redirect_chain = vec![redirect(&original_url, &redirected_url)];
let request = request.with_redirect_chain(redirect_chain);
@@ -1331,6 +1345,7 @@ mod tests {
)
.unwrap()
.with_initiator_url(&initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&initiator_url))
.with_browser_request_metadata(BrowserRequestMetadata::Xhr);
let headers = outgoing_request_headers_for_url(&config, &request, &request_url, None);
@@ -1354,6 +1369,7 @@ mod tests {
let request = Request::new("GET", original_url.as_str(), None, Vec::new())
.unwrap()
.with_initiator_url(&initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&initiator_url))
.with_browser_request_metadata(BrowserRequestMetadata::Fetch);
let redirect_chain = vec![redirect(&original_url, &redirected_url)];
let request = request.with_redirect_chain(redirect_chain);
@@ -1377,6 +1393,7 @@ mod tests {
let request = Request::new("GET", original_url.as_str(), None, Vec::new())
.unwrap()
.with_initiator_url(&initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&initiator_url))
.with_browser_request_metadata(BrowserRequestMetadata::Fetch);
let redirect_chain = vec![
redirect(&original_url, &intermediate_url),
@@ -1404,6 +1421,7 @@ mod tests {
let request = Request::new("GET", original_url.as_str(), None, Vec::new())
.unwrap()
.with_initiator_url(&initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&initiator_url))
.with_browser_request_metadata(BrowserRequestMetadata::Fetch);
let redirect_chain = vec![
redirect(&original_url, &cross_site_url),
@@ -1431,6 +1449,7 @@ mod tests {
let request = Request::new("GET", original_url.as_str(), None, Vec::new())
.unwrap()
.with_initiator_url(&initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&initiator_url))
.with_browser_request_metadata(BrowserRequestMetadata::Fetch);
let redirect_chain = vec![
redirect(&original_url, &cross_site_redirect_url),
@@ -1481,6 +1500,7 @@ mod tests {
let request = Request::new(method, target, None, Vec::new())
.unwrap()
.with_initiator_url(&initiator)
+ .with_request_origin(moli_url::WebOrigin::from_url(&initiator))
.with_request_mode(mode);
assert_eq!(request.browser_request_metadata(), None);
let headers = outgoing_request_headers_for_url(&config, &request, &request.url, None);
@@ -1500,6 +1520,7 @@ mod tests {
.unwrap()
.with_request_mode(RequestMode::NoCors)
.with_initiator_url(&url("https://app.test/page"))
+ .with_request_origin(moli_url::WebOrigin::from_url(&url("https://app.test/page")))
.with_browser_request_metadata(BrowserRequestMetadata::Fetch);
let headers = outgoing_request_headers_for_url(&config, &request, &request_url, None);
@@ -1517,6 +1538,7 @@ mod tests {
let request = Request::new("GET", request_url.as_str(), None, Vec::new())
.unwrap()
.with_initiator_url(&url("https://page.test/"))
+ .with_request_origin(moli_url::WebOrigin::from_url(&url("https://page.test/")))
.with_subframe_navigation_cookie_context();
let headers = outgoing_request_headers_for_url(&config, &request, &request_url, None);
@@ -1566,6 +1588,9 @@ mod tests {
let request = Request::new("POST", request_url.as_str(), None, Vec::new())
.unwrap()
.with_initiator_url(&url("https://frame.test/challenge"))
+ .with_request_origin(moli_url::WebOrigin::from_url(&url(
+ "https://frame.test/challenge",
+ )))
.with_site_for_cookies_url(&url("https://page.test/"))
.with_browser_request_metadata(BrowserRequestMetadata::Fetch)
.with_credentials_mode(crate::RequestCredentialsMode::Include)
@@ -1590,6 +1615,9 @@ mod tests {
let request = Request::new("POST", request_url.as_str(), None, Vec::new())
.unwrap()
.with_initiator_url(&url("https://frame.test/challenge"))
+ .with_request_origin(moli_url::WebOrigin::from_url(&url(
+ "https://frame.test/challenge",
+ )))
.with_site_for_cookies_url(&url("https://page.test/"))
.with_browser_request_metadata(BrowserRequestMetadata::Xhr)
.with_credentials_mode(crate::RequestCredentialsMode::SameOrigin)
@@ -1611,6 +1639,9 @@ mod tests {
let request = Request::new("POST", request_url.as_str(), None, Vec::new())
.unwrap()
.with_initiator_url(&url("http://frame.test/challenge"))
+ .with_request_origin(moli_url::WebOrigin::from_url(&url(
+ "http://frame.test/challenge",
+ )))
.with_site_for_cookies_url(&url("http://page.test/"))
.with_browser_request_metadata(BrowserRequestMetadata::Xhr)
.with_credentials_mode(crate::RequestCredentialsMode::Include);
diff --git a/moli-fetch/src/fetch_url_list.rs b/moli-fetch/src/fetch_url_list.rs
index b2f1c2da0..f046dca01 100644
--- a/moli-fetch/src/fetch_url_list.rs
+++ b/moli-fetch/src/fetch_url_list.rs
@@ -1,5 +1,5 @@
use moli_cookie_jar::same_site_urls;
-use moli_url::{origin_ascii_serialization, same_origin};
+use moli_url::{WebOrigin, same_origin};
use url::Url;
use crate::{RedirectInfo, RedirectSource, RequestMode};
@@ -28,14 +28,18 @@ impl<'a> FetchUrlList<'a> {
}
/// Returning to the initiating origin cannot restore basic response tainting.
- pub fn has_cross_origin_url(self, origin: &Url) -> bool {
- self.urls().any(|url| !same_origin(origin, url))
+ pub fn has_cross_origin_url(self, origin: &WebOrigin) -> bool {
+ self.urls().any(|url| !origin.same_origin(&url.into()))
}
/// Enforces same-origin mode before dispatch, including after redirects.
/// Main fetch permits data URLs regardless of mode. CORS response checks
/// are separate: permission from a server cannot relax same-origin mode.
- pub fn validate_request_mode(self, mode: RequestMode, origin: &Url) -> Result<(), String> {
+ pub fn validate_request_mode(
+ self,
+ mode: RequestMode,
+ origin: &WebOrigin,
+ ) -> Result<(), String> {
if mode == RequestMode::SameOrigin
&& self.current_url.scheme() != "data"
&& self.has_cross_origin_url(origin)
@@ -54,14 +58,14 @@ impl<'a> FetchUrlList<'a> {
/// A first hop out of the initiating origin retains that origin. Crossing
/// origins from an already cross-origin URL serializes the origin as null.
- pub fn serialized_origin(self, origin: &Url) -> String {
+ pub fn serialized_origin(self, origin: &WebOrigin) -> String {
if self.redirects.iter().any(|redirect| {
!same_origin(&redirect.from_url, &redirect.to_url)
- && !same_origin(origin, &redirect.from_url)
+ && !origin.same_origin(&(&redirect.from_url).into())
}) {
"null".to_owned()
} else {
- origin_ascii_serialization(origin)
+ origin.ascii_serialization().to_owned()
}
}
diff --git a/moli-fetch/src/request.rs b/moli-fetch/src/request.rs
index 25494cbc6..9157aa99c 100644
--- a/moli-fetch/src/request.rs
+++ b/moli-fetch/src/request.rs
@@ -9,13 +9,21 @@ use moli_cookie_jar::{
NetworkSiteContextMetadata, NetworkSiteContextTrackMetadata, redirect_types_for_request,
site_context_downgrade_type,
};
-use moli_url::same_origin;
+use moli_url::{WebOrigin, same_origin};
use url::Url;
use crate::{
FetchConfig, FetchUrlList, RedirectInfo, network_fetch_result::NetworkObservationRecorder,
};
+/// Plain HTTP exchanges and browser Fetch requests have different security
+/// contracts. A browser request always carries its environment's origin.
+#[derive(Debug, Clone)]
+enum RequestContext {
+ Http,
+ Browser(WebOrigin),
+}
+
#[derive(Debug, Clone)]
pub struct Request {
pub url: Url,
@@ -30,6 +38,7 @@ pub struct Request {
pub browser_request_metadata: Option<BrowserRequestMetadata>,
browser_navigation_kind: BrowserNavigationRequestKind,
infer_referrer_from_initiator: bool,
+ context: RequestContext,
pub use_page_network_policy: bool,
pub follow_redirects: bool,
pub request_mode: RequestMode,
@@ -366,6 +375,8 @@ impl RequestAuth {
}
impl Request {
+ /// Constructs a plain HTTP GET. Browser callers must supply an environment
+ /// origin using `new_browser` or `with_request_origin`.
pub fn get(raw_url: &str) -> Result<Self> {
let url = Url::parse(raw_url)
.with_context(|| anyhow!("failed to parse request url `{raw_url}`"))?;
@@ -382,6 +393,7 @@ impl Request {
browser_request_metadata: None,
browser_navigation_kind: BrowserNavigationRequestKind::Navigate,
infer_referrer_from_initiator: true,
+ context: RequestContext::Http,
use_page_network_policy: false,
follow_redirects: true,
request_mode: RequestMode::Navigate,
@@ -396,6 +408,7 @@ impl Request {
})
}
+ /// Constructs a plain HTTP GET from an already parsed URL.
pub fn get_with_url(url: Url) -> Self {
Self {
url,
@@ -410,6 +423,7 @@ impl Request {
browser_request_metadata: None,
browser_navigation_kind: BrowserNavigationRequestKind::Navigate,
infer_referrer_from_initiator: true,
+ context: RequestContext::Http,
use_page_network_policy: false,
follow_redirects: true,
request_mode: RequestMode::Navigate,
@@ -438,6 +452,8 @@ impl Request {
)
}
+ /// Constructs a plain HTTP request without browser origin policy.
+ /// Browser callers use `new_browser_bytes` instead.
pub fn new_bytes(
method: &str,
raw_url: &str,
@@ -446,7 +462,16 @@ impl Request {
) -> Result<Self> {
let url = Url::parse(raw_url)
.with_context(|| anyhow!("failed to parse request url `{raw_url}`"))?;
- Ok(Self {
+ Ok(Self::new_http_with_url(method, url, body, request_headers))
+ }
+
+ fn new_http_with_url(
+ method: &str,
+ url: Url,
+ body: Option<Vec<u8>>,
+ request_headers: Vec<(String, String)>,
+ ) -> Self {
+ Self {
url,
method: method.to_owned(),
body,
@@ -459,6 +484,7 @@ impl Request {
browser_request_metadata: None,
browser_navigation_kind: BrowserNavigationRequestKind::Navigate,
infer_referrer_from_initiator: true,
+ context: RequestContext::Http,
use_page_network_policy: false,
follow_redirects: true,
request_mode: RequestMode::Cors,
@@ -470,7 +496,7 @@ impl Request {
cookie_context: NetworkCookieRequestContext::subresource(method),
timeout_policy: RequestTimeoutPolicy::default(),
network_observation_recorder: None,
- })
+ }
}
pub fn with_min_request_timeout(mut self, minimum_request_timeout: Duration) -> Self {
@@ -627,6 +653,49 @@ impl Request {
self
}
+ /// Constructs a browser Fetch request with an explicit environment origin.
+ /// URL resolution and referrer/cookie context are supplied independently.
+ pub fn new_browser_bytes(
+ method: &str,
+ raw_url: &str,
+ body: Option<Vec<u8>>,
+ headers: Vec<(String, String)>,
+ origin: WebOrigin,
+ ) -> Result<Self> {
+ Ok(Self::new_bytes(method, raw_url, body, headers)?.with_request_origin(origin))
+ }
+
+ pub fn new_browser(
+ method: &str,
+ url: Url,
+ body: Option<Vec<u8>>,
+ headers: Vec<(String, String)>,
+ origin: WebOrigin,
+ ) -> Self {
+ Self::new_http_with_url(method, url, body, headers).with_request_origin(origin)
+ }
+
+ /// Explicitly enters browser Fetch semantics. Setting an initiator/referrer
+ /// URL alone never supplies a browser origin.
+ pub fn with_request_origin(mut self, origin: WebOrigin) -> Self {
+ self.context = RequestContext::Browser(origin);
+ self
+ }
+
+ pub fn request_origin(&self) -> Option<&WebOrigin> {
+ match &self.context {
+ RequestContext::Http => None,
+ RequestContext::Browser(origin) => Some(origin),
+ }
+ }
+
+ /// Renderer entry points require browser semantics even when the request
+ /// happens to use a mode that would not otherwise run a CORS check.
+ pub fn browser_origin(&self) -> Result<&WebOrigin> {
+ self.request_origin()
+ .context("browser fetch requires an explicit environment origin")
+ }
+
pub fn apply_redirect_status(&mut self, status: u16) {
if redirect_status_rewrites_to_get(status, &self.method) {
self.method = "GET".to_owned();
@@ -659,6 +728,15 @@ impl Request {
self.redirect_chain.push(redirect);
}
+ /// Follows an authorized redirect without rebuilding the Fetch request.
+ pub fn follow_redirect(&mut self, redirect: RedirectInfo) -> Result<()> {
+ self.validate_request_mode_for_url(&redirect.to_url)?;
+ self.apply_redirect_status(redirect.status);
+ self.url = redirect.to_url.clone();
+ self.record_redirect(redirect);
+ Ok(())
+ }
+
pub fn redirect_count(&self) -> usize {
self.url_list(&self.url).redirect_count()
}
@@ -673,9 +751,7 @@ impl Request {
return Ok(());
}
let origin = self
- .cookie_context
- .initiator_url
- .as_ref()
+ .request_origin()
.context("same-origin request mode requires an initiating origin")?;
self.url_list(request_url)
.validate_request_mode(self.request_mode, origin)
@@ -694,7 +770,7 @@ impl Request {
{
return Ok(());
}
- let Some(origin) = self.cookie_context.initiator_url.as_ref() else {
+ let Some(origin) = self.request_origin() else {
// Standalone HTTP clients have no browser request origin.
return Ok(());
};
@@ -712,23 +788,20 @@ impl Request {
/// Whether the URL list has left the initiating origin. For subresource
/// fetches, returning to that origin cannot restore basic response tainting.
pub fn has_cross_origin_url(&self, request_url: &Url) -> bool {
- self.cookie_context
- .initiator_url
- .as_ref()
- .is_some_and(|initiator| {
- !same_origin(initiator, &self.url)
- || self.url_list(request_url).has_cross_origin_url(initiator)
- })
+ self.request_origin().is_some_and(|origin| {
+ !origin.same_origin(&(&self.url).into())
+ || self.url_list(request_url).has_cross_origin_url(origin)
+ })
}
/// Fetch's serialized request origin, including redirect taint. A first
/// same-origin-to-cross-origin hop retains the origin; crossing origins
/// again after leaving it serializes as null.
pub fn serialized_origin(&self) -> String {
- let Some(initiator) = self.cookie_context.initiator_url.as_ref() else {
+ let Some(origin) = self.request_origin() else {
return "null".to_owned();
};
- self.url_list(&self.url).serialized_origin(initiator)
+ self.url_list(&self.url).serialized_origin(origin)
}
pub fn with_network_partition_key(mut self, key: Option<String>) -> Self {
@@ -755,6 +828,29 @@ impl Request {
}
}
+ /// Cookie policy uses the environment origin, independently of the URL used
+ /// to produce Referer. Adapt tuple origins to the cookie layer's URL-based
+ /// initiator API without replacing the request's referrer context.
+ pub(crate) fn network_cookie_context(&self) -> NetworkCookieRequestContext {
+ let mut context = self.cookie_context.clone();
+ if let Some(WebOrigin::Tuple(origin)) = self.request_origin() {
+ let origin_url =
+ Url::parse(origin.ascii_serialization()).expect("a tuple origin is a valid URL");
+ if context
+ .initiator_url
+ .as_ref()
+ .is_none_or(|url| !same_origin(url, &origin_url))
+ {
+ // Keep the embedding page's site-for-cookies/partition.
+ let browser_context = context.browser_context.clone();
+ context = context.with_initiator_url(&self.url, &origin_url);
+ context.browser_context = browser_context;
+ context = context.recompute_site_context_for_request(&self.url);
+ }
+ }
+ context
+ }
+
pub fn auth(&self) -> Option<&RequestAuth> {
self.auth.as_ref()
}
diff --git a/moli-fetch/src/runtime.rs b/moli-fetch/src/runtime.rs
index 6eef2e4c4..a44ea631c 100644
--- a/moli-fetch/src/runtime.rs
+++ b/moli-fetch/src/runtime.rs
@@ -2475,7 +2475,7 @@ impl RuntimeJob {
let origin_key = origin_key(&request);
Self {
current_url: request.url.clone(),
- current_cookie_context: request.cookie_context.clone(),
+ current_cookie_context: request.network_cookie_context(),
redirect_count: request.redirect_count(),
request,
origin_key,
@@ -2515,7 +2515,7 @@ impl StreamingRuntimeJob {
let origin_key = origin_key(&request);
Self {
current_url: request.url.clone(),
- current_cookie_context: request.cookie_context.clone(),
+ current_cookie_context: request.network_cookie_context(),
redirect_count: request.redirect_count(),
request,
origin_key,
@@ -2558,7 +2558,7 @@ impl StreamingRawRuntimeJob {
let origin_key = origin_key(&request);
Self {
current_url: request.url.clone(),
- current_cookie_context: request.cookie_context.clone(),
+ current_cookie_context: request.network_cookie_context(),
redirect_count: request.redirect_count(),
request,
origin_key,
diff --git a/moli-fetch/src/tests/cookie_context.rs b/moli-fetch/src/tests/cookie_context.rs
index 3c880332d..4919eea64 100644
--- a/moli-fetch/src/tests/cookie_context.rs
+++ b/moli-fetch/src/tests/cookie_context.rs
@@ -53,6 +53,7 @@ fn browser_site_context_overlay_downgrades_but_never_relaxes_same_site_context()
let computed = Request::new("GET", child_url.as_str(), None, vec![])
.unwrap()
.with_initiator_url(&child_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&child_url))
.with_browser_site_context(browser_context.clone());
assert!(
computed.cookie_context.site_context.is_cross_site(),
@@ -65,6 +66,7 @@ fn browser_site_context_overlay_downgrades_but_never_relaxes_same_site_context()
let explicitly_cross_site = Request::new("GET", child_url.as_str(), None, vec![])
.unwrap()
.with_initiator_url(&child_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&child_url))
.with_cross_site_cookie_context()
.with_browser_site_context(same_site_browser_context);
assert!(
@@ -84,7 +86,8 @@ fn request_credentials_mode_controls_cross_origin_cookie_access() {
let default_request = Request::new("GET", same_origin_url.as_str(), None, vec![])
.unwrap()
- .with_initiator_url(&initiator_url);
+ .with_initiator_url(&initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&initiator_url));
assert_eq!(
default_request.credentials_mode,
RequestCredentialsMode::Include
@@ -94,6 +97,7 @@ fn request_credentials_mode_controls_cross_origin_cookie_access() {
let same_origin_request = Request::new("GET", same_origin_url.as_str(), None, vec![])
.unwrap()
.with_initiator_url(&initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&initiator_url))
.with_credentials_mode(RequestCredentialsMode::SameOrigin);
assert!(same_origin_request.allows_credentials_for_url(&same_origin_url));
assert!(!same_origin_request.allows_credentials_for_url(&cross_origin_url));
@@ -101,6 +105,7 @@ fn request_credentials_mode_controls_cross_origin_cookie_access() {
let omit_request = Request::new("GET", same_origin_url.as_str(), None, vec![])
.unwrap()
.with_initiator_url(&initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&initiator_url))
.with_credentials_mode(RequestCredentialsMode::Omit);
assert!(!omit_request.allows_credentials_for_url(&same_origin_url));
}
@@ -202,7 +207,10 @@ fn request_with_initiator_url_marks_cross_site_subresource_requests() {
let response_url = Url::parse("https://example.com/app/index.html").unwrap();
let request = Request::new("GET", "https://example.com/app/panel", None, vec![])
.unwrap()
- .with_initiator_url(&Url::parse("https://other.test/index.html").unwrap());
+ .with_initiator_url(&Url::parse("https://other.test/index.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://other.test/index.html").unwrap(),
+ ));
{
let mut jar = cookie_store.lock();
@@ -237,7 +245,10 @@ fn request_with_initiator_url_treats_same_scheme_subdomains_as_same_site() {
let response_url = Url::parse("https://sub.example.com/app/index.html").unwrap();
let request = Request::new("GET", "https://sub.example.com/app/panel", None, vec![])
.unwrap()
- .with_initiator_url(&Url::parse("https://example.com/index.html").unwrap());
+ .with_initiator_url(&Url::parse("https://example.com/index.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://example.com/index.html").unwrap(),
+ ));
{
let mut jar = cookie_store.lock();
@@ -262,7 +273,10 @@ fn request_with_initiator_url_treats_same_scheme_sibling_subdomains_as_same_site
let response_url = Url::parse("https://api.example.com/app/index.html").unwrap();
let request = Request::new("GET", "https://api.example.com/app/panel", None, vec![])
.unwrap()
- .with_initiator_url(&Url::parse("https://www.example.com/index.html").unwrap());
+ .with_initiator_url(&Url::parse("https://www.example.com/index.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://www.example.com/index.html").unwrap(),
+ ));
{
let mut jar = cookie_store.lock();
@@ -295,7 +309,10 @@ fn request_with_initiator_url_respects_public_suffix_boundaries() {
let response_url = Url::parse("https://foo.co.uk/app/index.html").unwrap();
let request = Request::new("GET", "https://foo.co.uk/app/panel", None, vec![])
.unwrap()
- .with_initiator_url(&Url::parse("https://bar.co.uk/index.html").unwrap());
+ .with_initiator_url(&Url::parse("https://bar.co.uk/index.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://bar.co.uk/index.html").unwrap(),
+ ));
{
let mut jar = cookie_store.lock();
@@ -334,7 +351,10 @@ fn request_with_initiator_url_treats_multi_label_registrable_domains_as_same_sit
let response_url = Url::parse("https://api.example.co.uk/app/index.html").unwrap();
let request = Request::new("GET", "https://api.example.co.uk/app/panel", None, vec![])
.unwrap()
- .with_initiator_url(&Url::parse("https://www.example.co.uk/index.html").unwrap());
+ .with_initiator_url(&Url::parse("https://www.example.co.uk/index.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://www.example.co.uk/index.html").unwrap(),
+ ));
{
let mut jar = cookie_store.lock();
@@ -361,7 +381,10 @@ fn request_with_initiator_url_treats_multi_label_registrable_domains_as_same_sit
fn request_with_initiator_url_tracks_schemeless_and_schemeful_site_context_separately() {
let request = Request::new("GET", "https://example.com/app/panel", None, vec![])
.unwrap()
- .with_initiator_url(&Url::parse("http://example.com/index.html").unwrap());
+ .with_initiator_url(&Url::parse("http://example.com/index.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("http://example.com/index.html").unwrap(),
+ ));
assert_eq!(
request.cookie_context.site_context.context,
@@ -485,7 +508,10 @@ fn request_with_cross_scheme_initiator_uses_schemeful_cross_site_semantics() {
let response_url = Url::parse("https://example.com/app/index.html").unwrap();
let request = Request::new("GET", "https://example.com/app/panel", None, vec![])
.unwrap()
- .with_initiator_url(&Url::parse("http://example.com/index.html").unwrap());
+ .with_initiator_url(&Url::parse("http://example.com/index.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("http://example.com/index.html").unwrap(),
+ ));
{
let mut jar = cookie_store.lock();
@@ -526,7 +552,10 @@ fn request_effective_cookie_context_recomputes_same_site_for_redirect_targets()
let redirected_url = Url::parse("https://other.test/app/panel").unwrap();
let request = Request::new("GET", "https://example.com/start", None, vec![])
.unwrap()
- .with_initiator_url(&Url::parse("https://example.com/index.html").unwrap());
+ .with_initiator_url(&Url::parse("https://example.com/index.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://example.com/index.html").unwrap(),
+ ));
{
let mut jar = cookie_store.lock();
@@ -566,7 +595,10 @@ fn request_effective_cookie_context_marks_cross_site_redirect_downgrade_in_repor
let response_url = Url::parse("https://other.test/app/index.html").unwrap();
let request = Request::new("GET", "https://example.com/start", None, vec![])
.unwrap()
- .with_initiator_url(&Url::parse("https://example.com/index.html").unwrap());
+ .with_initiator_url(&Url::parse("https://example.com/index.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://example.com/index.html").unwrap(),
+ ));
let mut jar = BrowserCookieStore::default();
jar.store_response_headers(
@@ -621,7 +653,10 @@ fn request_effective_cookie_context_marks_cross_site_redirect_downgrade_in_repor
fn request_effective_cookie_context_records_strict_to_lax_redirect_downgrade() {
let request = Request::get("https://same.test/app/panel")
.unwrap()
- .with_initiator_url(&Url::parse("https://same.test/index.html").unwrap());
+ .with_initiator_url(&Url::parse("https://same.test/index.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://same.test/index.html").unwrap(),
+ ));
let redirected_context =
request.effective_cookie_context(&Url::parse("https://cross.test/app/panel").unwrap());
@@ -664,7 +699,10 @@ fn request_effective_cookie_context_records_strict_to_lax_redirect_downgrade() {
fn request_effective_cookie_context_tracks_schemeful_only_redirect_downgrade() {
let request = Request::get("https://example.com/app/panel")
.unwrap()
- .with_initiator_url(&Url::parse("https://example.com/index.html").unwrap());
+ .with_initiator_url(&Url::parse("https://example.com/index.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://example.com/index.html").unwrap(),
+ ));
let redirected_context =
request.effective_cookie_context(&Url::parse("http://example.com/app/panel").unwrap());
@@ -714,7 +752,10 @@ fn redirect_chain_cookie_context_preserves_cross_site_downgrade_across_later_sam
let final_url = Url::parse("https://same.test/final").unwrap();
let request = Request::new("GET", "https://same.test/start", None, Vec::new())
.unwrap()
- .with_initiator_url(&Url::parse("https://same.test/index.html").unwrap());
+ .with_initiator_url(&Url::parse("https://same.test/index.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://same.test/index.html").unwrap(),
+ ));
{
let mut jar = cookie_store.lock();
@@ -757,7 +798,10 @@ fn top_level_request_with_initiator_url_uses_cross_site_lax_navigation_semantics
let response_url = Url::parse("https://other.test/app/index.html").unwrap();
let request = Request::get("https://other.test/app/panel")
.unwrap()
- .with_initiator_url(&Url::parse("https://example.com/index.html").unwrap());
+ .with_initiator_url(&Url::parse("https://example.com/index.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://example.com/index.html").unwrap(),
+ ));
{
let mut jar = cookie_store.lock();
@@ -792,7 +836,10 @@ fn top_level_post_with_initiator_url_uses_lax_method_unsafe_context() {
let request = Request::new("POST", "https://other.test/app/panel", None, vec![])
.unwrap()
.with_top_level_navigation_cookie_context()
- .with_initiator_url(&Url::parse("https://example.com/index.html").unwrap());
+ .with_initiator_url(&Url::parse("https://example.com/index.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://example.com/index.html").unwrap(),
+ ));
let effective_context = request.effective_cookie_context(&request.url);
diff --git a/moli-fetch/src/tests/cookie_store.rs b/moli-fetch/src/tests/cookie_store.rs
index 639c75c5a..e4c708116 100644
--- a/moli-fetch/src/tests/cookie_store.rs
+++ b/moli-fetch/src/tests/cookie_store.rs
@@ -276,7 +276,6 @@ fn outgoing_request_headers_skip_manual_cookie_when_store_cookie_exists() {
vec![
("Cookie".to_owned(), "sid=server".to_owned()),
("X-Test".to_owned(), "ok".to_owned()),
- ("Origin".to_owned(), "null".to_owned()),
]
);
}
@@ -302,7 +301,6 @@ fn outgoing_request_headers_include_default_config_headers() {
("X-Test".to_owned(), "one".to_owned()),
("X-Trace".to_owned(), "two".to_owned()),
("X-Request".to_owned(), "three".to_owned()),
- ("Origin".to_owned(), "null".to_owned()),
]
);
}
@@ -321,7 +319,6 @@ fn outgoing_request_headers_skip_default_cookie_when_store_cookie_exists() {
vec![
("Cookie".to_owned(), "sid=server".to_owned()),
("X-Test".to_owned(), "ok".to_owned()),
- ("Origin".to_owned(), "null".to_owned()),
]
);
}
@@ -340,7 +337,6 @@ fn outgoing_request_headers_keep_default_cookie_without_store_cookie() {
vec![
("Cookie".to_owned(), "manual=1".to_owned()),
("X-Test".to_owned(), "ok".to_owned()),
- ("Origin".to_owned(), "null".to_owned()),
]
);
}
@@ -388,7 +384,6 @@ fn outgoing_request_headers_preserve_duplicate_default_headers_in_order() {
("X-Test".to_owned(), "one".to_owned()),
("X-Test".to_owned(), "two".to_owned()),
("X-Test".to_owned(), "three".to_owned()),
- ("Origin".to_owned(), "null".to_owned()),
]
);
}
@@ -396,7 +391,11 @@ fn outgoing_request_headers_preserve_duplicate_default_headers_in_order() {
fn top_level_navigation_request(request_url: &str, initiator_url: Option<&str>) -> Request {
let request = Request::get(request_url).unwrap();
if let Some(initiator_url) = initiator_url {
- request.with_initiator_url(&Url::parse(initiator_url).unwrap())
+ request
+ .with_initiator_url(&Url::parse(initiator_url).unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse(initiator_url).unwrap(),
+ ))
} else {
request
}
@@ -570,7 +569,10 @@ fn generic_subresource_requests_do_not_inherit_browser_headers_without_metadata(
let config = FetchConfig::default();
let request = Request::new("GET", "https://example.com/app.js", None, vec![])
.unwrap()
- .with_initiator_url(&Url::parse("https://example.com/docs").unwrap());
+ .with_initiator_url(&Url::parse("https://example.com/docs").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://example.com/docs").unwrap(),
+ ));
let headers = outgoing_request_headers(&config, &request, None);
@@ -596,6 +598,9 @@ fn browser_fetch_and_xhr_subresource_headers_match_chromium_same_origin_shape()
.with_initiator_url(
&Url::parse("https://example.com/docs/page.html?x=1#section").unwrap(),
)
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://example.com/").unwrap(),
+ ))
.with_browser_request_metadata(metadata);
let headers = outgoing_request_headers(&config, &request, None);
@@ -635,6 +640,9 @@ fn browser_audio_worklet_subresource_headers_use_audioworklet_destination() {
let request = Request::new("GET", "https://example.com/worklet.js", None, vec![])
.unwrap()
.with_initiator_url(&Url::parse("https://example.com/docs/page.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://example.com/docs/page.html").unwrap(),
+ ))
.with_browser_request_metadata(BrowserRequestMetadata::AudioWorklet);
let headers = outgoing_request_headers(&config, &request, None);
@@ -662,6 +670,9 @@ fn browser_media_subresource_headers_preserve_audio_video_destinations() {
let request = Request::new("GET", "https://cdn.example/media", None, vec![])
.unwrap()
.with_initiator_url(&Url::parse("https://example.com/page").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://example.com/page").unwrap(),
+ ))
.with_request_mode(RequestMode::NoCors)
.with_resource_type(RequestResourceType::Media)
.with_browser_request_metadata(metadata);
@@ -681,6 +692,9 @@ fn browser_image_subresource_headers_use_image_accept_and_destination() {
let request = Request::new("GET", "https://cdn.example/hero.png", None, vec![])
.unwrap()
.with_initiator_url(&Url::parse("https://example.com/page").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://example.com/page").unwrap(),
+ ))
.with_request_mode(RequestMode::NoCors)
.with_resource_type(RequestResourceType::Image)
.with_browser_request_metadata(BrowserRequestMetadata::Image);
@@ -702,6 +716,9 @@ fn browser_font_subresource_headers_use_cors_font_destination() {
let request = Request::new("GET", "https://cdn.example/demo.woff2", None, vec![])
.unwrap()
.with_initiator_url(&Url::parse("https://example.com/page").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://example.com/page").unwrap(),
+ ))
.with_request_mode(RequestMode::Cors)
.with_credentials_mode(RequestCredentialsMode::SameOrigin)
.with_resource_type(RequestResourceType::Font)
@@ -725,6 +742,9 @@ fn browser_text_track_headers_use_vtt_accept_and_track_destination() {
let request = Request::new("GET", "https://cdn.example/captions.vtt", None, vec![])
.unwrap()
.with_initiator_url(&Url::parse("https://cdn.example/page").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://cdn.example/page").unwrap(),
+ ))
.with_request_mode(RequestMode::SameOrigin)
.with_resource_type(RequestResourceType::TextTrack)
.with_browser_request_metadata(BrowserRequestMetadata::TextTrack);
@@ -749,6 +769,9 @@ fn browser_json_module_subresource_headers_use_json_destination() {
let request = Request::new("GET", "https://example.com/data.json", None, vec![])
.unwrap()
.with_initiator_url(&Url::parse("https://example.com/docs/page.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://example.com/docs/page.html").unwrap(),
+ ))
.with_browser_request_metadata(BrowserRequestMetadata::JsonModule);
let headers = outgoing_request_headers(&config, &request, None);
@@ -769,6 +792,9 @@ fn browser_manifest_subresource_headers_match_chromium() {
let request = Request::new("GET", "https://example.com/app.webmanifest", None, vec![])
.unwrap()
.with_initiator_url(&Url::parse("https://example.com/docs/page.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://example.com/docs/page.html").unwrap(),
+ ))
.with_request_mode(RequestMode::Cors)
.with_credentials_mode(RequestCredentialsMode::Omit)
.with_resource_type(RequestResourceType::Manifest)
@@ -792,6 +818,9 @@ fn browser_style_module_subresource_headers_use_style_destination() {
let request = Request::new("GET", "https://example.com/sheet.css", None, vec![])
.unwrap()
.with_initiator_url(&Url::parse("https://example.com/docs/page.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://example.com/docs/page.html").unwrap(),
+ ))
.with_browser_request_metadata(BrowserRequestMetadata::StyleModule);
let headers = outgoing_request_headers(&config, &request, None);
@@ -813,6 +842,7 @@ fn browser_stylesheet_subresource_headers_follow_request_mode() {
let plain = Request::new("GET", "https://cdn.example.test/plain.css", None, vec![])
.unwrap()
.with_initiator_url(&initiator)
+ .with_request_origin(moli_url::WebOrigin::from_url(&initiator))
.with_request_mode(crate::RequestMode::NoCors)
.with_browser_request_metadata(BrowserRequestMetadata::Style);
let anonymous = Request::new(
@@ -823,6 +853,7 @@ fn browser_stylesheet_subresource_headers_follow_request_mode() {
)
.unwrap()
.with_initiator_url(&initiator)
+ .with_request_origin(moli_url::WebOrigin::from_url(&initiator))
.with_request_mode(crate::RequestMode::Cors)
.with_credentials_mode(crate::RequestCredentialsMode::SameOrigin)
.with_browser_request_metadata(BrowserRequestMetadata::Style);
@@ -860,6 +891,9 @@ fn browser_fetch_subresource_headers_use_cross_site_sec_fetch_site_when_needed()
let request = Request::new("GET", "https://www.zhihu.com/api/v4/feed", None, vec![])
.unwrap()
.with_initiator_url(&Url::parse("https://sub.example.com/docs/page.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://sub.example.com/docs/page.html").unwrap(),
+ ))
.with_browser_request_metadata(BrowserRequestMetadata::Fetch);
let headers = outgoing_request_headers(&config, &request, None);
@@ -883,6 +917,9 @@ fn browser_fetch_subresource_headers_use_request_mode_for_sec_fetch_mode() {
let request = Request::new("GET", "https://www.zhihu.com/api/v4/feed", None, vec![])
.unwrap()
.with_initiator_url(&Url::parse("https://sub.example.com/docs/page.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://sub.example.com/docs/page.html").unwrap(),
+ ))
.with_request_mode(RequestMode::NoCors)
.with_browser_request_metadata(BrowserRequestMetadata::Fetch);
@@ -904,6 +941,9 @@ fn browser_beacon_subresource_headers_use_no_cors_shape() {
)
.unwrap()
.with_initiator_url(&Url::parse("https://sub.example.com/docs/page.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://sub.example.com/docs/page.html").unwrap(),
+ ))
.with_resource_type(crate::RequestResourceType::Beacon)
.with_request_mode(RequestMode::NoCors)
.with_browser_request_metadata(BrowserRequestMetadata::Beacon);
@@ -933,6 +973,9 @@ fn browser_ping_subresource_headers_use_no_cors_shape() {
)
.unwrap()
.with_initiator_url(&Url::parse("https://sub.example.com/docs/page.html").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://sub.example.com/docs/page.html").unwrap(),
+ ))
.with_resource_type(crate::RequestResourceType::Ping)
.with_request_mode(RequestMode::NoCors)
.with_browser_request_metadata(BrowserRequestMetadata::Ping);
@@ -956,6 +999,9 @@ fn explicit_navigation_headers_override_browser_defaults() {
let mut request = Request::get("https://example.com/docs")
.unwrap()
.with_initiator_url(&Url::parse("https://example.com/source").unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse("https://example.com/source").unwrap(),
+ ))
.with_top_level_navigation_cookie_context();
request.request_headers = vec![
("Accept-Language".to_owned(), "zh-CN,zh;q=0.9".to_owned()),
@@ -1000,6 +1046,9 @@ fn script_request_with_referrer_policies(
Request::new("GET", request_url, None, request_headers)
.unwrap()
.with_initiator_url(&Url::parse(initiator_url).unwrap())
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &Url::parse(initiator_url).unwrap(),
+ ))
.with_script_fetch_metadata(ScriptFetchRequestMetadata {
referrer_policy: referrer_policy.map(str::to_owned),
document_referrer_policy: document_referrer_policy.map(str::to_owned),
diff --git a/moli-fetch/src/tests/mod.rs b/moli-fetch/src/tests/mod.rs
index 79a04c5e8..cc2df9f15 100644
--- a/moli-fetch/src/tests/mod.rs
+++ b/moli-fetch/src/tests/mod.rs
@@ -1276,7 +1276,8 @@ fn web_bot_auth_resigns_restarts_redirects_and_subresources() -> Result<()> {
Vec::new(),
)?
.with_browser_request_metadata(BrowserRequestMetadata::Fetch)
- .with_initiator_url(&final_url);
+ .with_initiator_url(&final_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&final_url));
assert_eq!(
fetch_response_for_test(&client, subresource)?.body_text(),
"asset"
@@ -2483,7 +2484,8 @@ fn fetch_client_cache_vary_referer_partitions_hits() {
Request::new("GET", &server.url(), None, Vec::new())
.unwrap()
.with_browser_request_metadata(BrowserRequestMetadata::Fetch)
- .with_initiator_url(referrer),
+ .with_initiator_url(referrer)
+ .with_request_origin(moli_url::WebOrigin::from_url(referrer)),
)
.unwrap()
};
@@ -2677,7 +2679,8 @@ fn critical_client_hints_restart_navigation_before_exposing_the_first_response()
let navigation_url = Url::parse(&server.url())?;
let subresource = Request::new("POST", &server.url(), Some("probe".to_owned()), Vec::new())?
.with_browser_request_metadata(BrowserRequestMetadata::Fetch)
- .with_initiator_url(&navigation_url);
+ .with_initiator_url(&navigation_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&navigation_url));
let subresource = fetch_response_for_test(&client, subresource)?;
assert_eq!(subresource.body_text(), "subresource");
@@ -3074,6 +3077,7 @@ fn fetch_client_stylesheet_referrer_policy_uses_vary_referer_on_cache_hits() {
},
)
.with_initiator_url(&document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&document_url))
};
let first = fetch_with_config_for_test(&config, request("origin")).unwrap();
@@ -3231,6 +3235,7 @@ fn fetch_client_skips_stylesheet_cache_for_vary_origin() {
.with_request_mode(RequestMode::Cors)
.with_credentials_mode(RequestCredentialsMode::SameOrigin)
.with_initiator_url(&initiator)
+ .with_request_origin(moli_url::WebOrigin::from_url(&initiator))
};
let first = fetch_with_config_for_test(&config, request()).unwrap();
@@ -4009,7 +4014,8 @@ fn fetch_response_stores_partitioned_cookie_under_request_top_level_site() -> Re
let response = fetch_response_for_test(
&client,
Request::new("GET", request_url.as_str(), None, Vec::new())?
- .with_initiator_url(&first_top_level),
+ .with_initiator_url(&first_top_level)
+ .with_request_origin(moli_url::WebOrigin::from_url(&first_top_level)),
)?;
assert_eq!(response.status, 200);
@@ -4291,7 +4297,8 @@ fn fetch_client_cache_revalidates_same_document_reload() {
Request::get(&server.url())
.unwrap()
.with_browser_navigation_kind(BrowserNavigationRequestKind::Reload)
- .with_initiator_url(&reload_url),
+ .with_initiator_url(&reload_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&reload_url)),
)
.unwrap();
@@ -4333,7 +4340,8 @@ fn fetch_client_cache_immutable_ignores_same_document_reload_validation_when_fre
Request::get(&server.url())
.unwrap()
.with_browser_navigation_kind(BrowserNavigationRequestKind::Reload)
- .with_initiator_url(&reload_url),
+ .with_initiator_url(&reload_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&reload_url)),
)
.unwrap();
@@ -4369,7 +4377,8 @@ fn fetch_client_cache_immutable_revalidates_after_expiry() {
Request::get(&server.url())
.unwrap()
.with_browser_navigation_kind(BrowserNavigationRequestKind::Reload)
- .with_initiator_url(&reload_url),
+ .with_initiator_url(&reload_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&reload_url)),
)
.unwrap();
diff --git a/moli-fetch/src/tests/request_security.rs b/moli-fetch/src/tests/request_security.rs
index aebfc8fc3..788610d4d 100644
--- a/moli-fetch/src/tests/request_security.rs
+++ b/moli-fetch/src/tests/request_security.rs
@@ -55,6 +55,26 @@ fn synthetic_redirect(from: &Url, to: &Url) -> RedirectInfo {
}
}
+#[tokio::test]
+async fn plain_http_requests_do_not_infer_browser_origin_from_referrer() -> Result<()> {
+ let server = ScriptedHttpServer::spawn(vec![ScriptedResponse::ok("http"); 3]);
+ let url = Url::parse(&server.url())?;
+ let referrer = Url::parse("http://other.test/page")?;
+ let client = FetchClient::new(&FetchConfig::default(), new_shared_browser_cookie_store());
+ for transport in Transport::ALL {
+ let request = Request::new_bytes("GET", url.as_str(), None, Vec::new())?
+ .with_initiator_url(&referrer);
+ assert!(request.request_origin().is_none());
+ transport.fetch(&client, request).await?;
+ }
+ assert_eq!(server.hits(), 3);
+ for request in server.requests() {
+ assert!(!request.to_ascii_lowercase().contains("\r\norigin:"));
+ }
+ server.shutdown();
+ Ok(())
+}
+
#[tokio::test]
async fn same_origin_mode_blocks_cross_origin_before_every_transport() -> Result<()> {
let server = ScriptedHttpServer::spawn(vec![
@@ -66,7 +86,9 @@ async fn same_origin_mode_blocks_cross_origin_before_every_transport() -> Result
let mut request =
Request::get(&server.url())?.with_request_mode(RequestMode::SameOrigin);
if let Some(origin) = origin {
- request = request.with_initiator_url(&origin);
+ request = request
+ .with_initiator_url(&origin)
+ .with_request_origin(moli_url::WebOrigin::from_url(&origin));
}
let error = transport.fetch(&client, request).await.unwrap_err();
assert!(
@@ -98,6 +120,9 @@ async fn same_origin_mode_checks_redirects_in_every_transport() -> Result<()> {
let client = FetchClient::new(&FetchConfig::default(), new_shared_browser_cookie_store());
let request = Request::get(&server.url())?
.with_initiator_url(&Url::parse(&server.origin())?)
+ .with_request_origin(moli_url::WebOrigin::from_url(&Url::parse(
+ &server.origin(),
+ )?))
.with_request_mode(RequestMode::SameOrigin);
transport.fetch(&client, request.clone()).await?;
let error = transport.fetch(&client, request).await.unwrap_err();
@@ -123,6 +148,7 @@ async fn same_origin_mode_rejects_inherited_cross_origin_history() -> Result<()>
let url = Url::parse(&server.url())?;
let request = Request::get_with_url(url.clone())
.with_initiator_url(&url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&url))
.with_request_mode(RequestMode::SameOrigin)
.with_redirect_chain(vec![synthetic_redirect(
&Url::parse("http://other.test/start")?,
@@ -174,6 +200,7 @@ async fn cors_redirect_rejection_never_contacts_next_hop() -> Result<()> {
FetchClient::new(&FetchConfig::default(), new_shared_browser_cookie_store());
let request = Request::get(&server.url())?
.with_initiator_url(&origin)
+ .with_request_origin(moli_url::WebOrigin::from_url(&origin))
.with_request_mode(RequestMode::Cors)
.with_credentials_mode(credentials);
let error = transport.fetch(&client, request).await.unwrap_err();
@@ -209,6 +236,7 @@ async fn cors_redirect_validates_the_origin_before_recording_the_hop() -> Result
FetchClient::new(&FetchConfig::default(), new_shared_browser_cookie_store());
let request = Request::get(&server.url())?
.with_initiator_url(&origin)
+ .with_request_origin(moli_url::WebOrigin::from_url(&origin))
.with_request_mode(RequestMode::Cors)
.with_credentials_mode(credentials);
transport.fetch(&client, request).await?;
@@ -245,6 +273,7 @@ async fn cors_redirect_inherits_synthetic_redirect_taint_without_checking_synthe
let url = Url::parse(&server.url())?;
let request = Request::get_with_url(url.clone())
.with_initiator_url(&url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&url))
.with_request_mode(RequestMode::Cors)
.with_credentials_mode(RequestCredentialsMode::SameOrigin)
.with_redirect_chain(vec![synthetic_redirect(
@@ -293,6 +322,7 @@ async fn cached_redirects_enforce_cors_and_same_origin_before_follow() -> Result
};
let request = Request::get(&server.url())?
.with_initiator_url(&origin)
+ .with_request_origin(moli_url::WebOrigin::from_url(&origin))
.with_request_mode(RequestMode::NoCors);
let client = FetchClient::new(&config, new_shared_browser_cookie_store());
transport.fetch(&client, request.clone()).await?;
@@ -323,3 +353,38 @@ async fn cached_redirects_enforce_cors_and_same_origin_before_follow() -> Result
}
Ok(())
}
+
+#[tokio::test]
+async fn explicit_request_origin_controls_every_transport_independently_of_initiator_url()
+-> Result<()> {
+ let server = ScriptedHttpServer::spawn(vec![ScriptedResponse::ok("allowed"); 3]);
+ let url = Url::parse(&server.url())?;
+ let unrelated = Url::parse("http://unrelated.test/base/")?;
+ let client = FetchClient::new(&FetchConfig::default(), new_shared_browser_cookie_store());
+ for transport in Transport::ALL {
+ let opaque = Request::get_with_url(url.clone())
+ .with_initiator_url(&url)
+ .with_request_origin(moli_url::WebOrigin::Opaque)
+ .with_request_mode(RequestMode::SameOrigin)
+ .with_credentials_mode(RequestCredentialsMode::SameOrigin);
+ assert!(!opaque.allows_credentials_for_url(&url));
+ assert_eq!(opaque.serialized_origin(), "null");
+ let error = transport.fetch(&client, opaque).await.unwrap_err();
+ assert!(
+ error.to_string().contains("same-origin request mode"),
+ "{error:#}"
+ );
+ let allowed = Request::get_with_url(url.clone())
+ .with_initiator_url(&unrelated)
+ .with_request_origin((&url).into())
+ .with_request_mode(RequestMode::SameOrigin);
+ transport.fetch(&client, allowed).await?;
+ }
+ assert_eq!(
+ server.hits(),
+ 3,
+ "only requests with the matching origin are dispatched"
+ );
+ server.shutdown();
+ Ok(())
+}
diff --git a/moli-fetch/src/tests/tls_credentials.rs b/moli-fetch/src/tests/tls_credentials.rs
index 7b3173d2f..fe7e5553c 100644
--- a/moli-fetch/src/tests/tls_credentials.rs
+++ b/moli-fetch/src/tests/tls_credentials.rs
@@ -254,6 +254,7 @@ async fn tls_client_certificate_respects_credentials_in_every_transport() -> Res
);
let request = Request::get(server.url.as_str())?
.with_initiator_url(initiator)
+ .with_request_origin(moli_url::WebOrigin::from_url(initiator))
.with_credentials_mode(mode);
transport.fetch(&client, request).await?;
let observed = server.requests.lock().pop().unwrap();
@@ -291,6 +292,7 @@ async fn tls_client_certificate_isolated_on_reused_connections() -> Result<()> {
] {
let request = Request::get(server.url.as_str())?
.with_initiator_url(initiator)
+ .with_request_origin(moli_url::WebOrigin::from_url(initiator))
.with_credentials_mode(mode);
transport.fetch(&client, request).await?;
}
@@ -330,6 +332,7 @@ async fn tls_client_certificate_preserves_cross_origin_redirect_taint() -> Resul
);
let request = Request::get(server.url.join("/redirect-cross")?.as_str())?
.with_initiator_url(&server.url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&server.url))
.with_request_mode(RequestMode::Cors)
.with_credentials_mode(mode);
transport.fetch(&client, request).await?;
@@ -376,6 +379,7 @@ async fn tls_client_certificate_preserves_service_worker_redirect_taint() -> Res
.await?;
let request = Request::get(server.url.as_str())?
.with_initiator_url(&server.url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&server.url))
.with_request_mode(RequestMode::Cors)
.with_credentials_mode(RequestCredentialsMode::SameOrigin)
.with_redirect_chain(vec![RedirectInfo {
diff --git a/moli-protocol/src/conn/downloads.rs b/moli-protocol/src/conn/downloads.rs
index 9022b7113..8dc9d6e80 100644
--- a/moli-protocol/src/conn/downloads.rs
+++ b/moli-protocol/src/conn/downloads.rs
@@ -414,9 +414,17 @@ impl CdpConnection {
request.request_headers = owner.request_headers;
request = request
.with_top_level_navigation_cookie_context()
- .with_page_network_policy();
+ .with_page_network_policy()
+ .with_request_origin(
+ owner
+ .initiator_url
+ .as_ref()
+ .map_or(moli_url::WebOrigin::Opaque, moli_url::WebOrigin::from_url),
+ );
if let Some(ref initiator_url) = owner.initiator_url {
- request = request.with_initiator_url(initiator_url);
+ request = request
+ .with_initiator_url(initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(initiator_url));
}
let loader = self.ensure_resource_request_client()?.clone();
diff --git a/moli-protocol/src/conn/runtime_load.rs b/moli-protocol/src/conn/runtime_load.rs
index ad135ab05..cf0d82e24 100644
--- a/moli-protocol/src/conn/runtime_load.rs
+++ b/moli-protocol/src/conn/runtime_load.rs
@@ -3013,16 +3013,27 @@ impl CdpConnection {
return Err("Network emulation offline".to_owned());
}
- let mut request = Request::new_bytes(method, raw_url, body, request_headers)
- .map_err(|error| format!("failed to build request for `{raw_url}`: {error}"))?
- .with_top_level_navigation_cookie_context()
- .with_page_network_policy()
- .with_browser_navigation_kind(load_inputs.browser_navigation_kind);
+ let mut request = Request::new_browser_bytes(
+ method,
+ raw_url,
+ body,
+ request_headers,
+ load_inputs
+ .navigation_initiator_url
+ .as_ref()
+ .map_or(moli_url::WebOrigin::Opaque, moli_url::WebOrigin::from_url),
+ )
+ .map_err(|error| format!("failed to build request for `{raw_url}`: {error}"))?
+ .with_top_level_navigation_cookie_context()
+ .with_page_network_policy()
+ .with_browser_navigation_kind(load_inputs.browser_navigation_kind);
if !load_inputs.infer_navigation_referrer {
request = request.without_inferred_referrer();
}
if let Some(initiator_url) = load_inputs.navigation_initiator_url.as_ref() {
- request = request.with_initiator_url(initiator_url);
+ request = request
+ .with_initiator_url(initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(initiator_url));
}
request.set_auth(Some(auth.into()));
@@ -3094,16 +3105,27 @@ impl CdpConnection {
return Err("Network emulation offline".to_owned());
}
- let mut request = Request::new_bytes(method, raw_url, body, request_headers)
- .map_err(|error| format!("failed to build request for `{raw_url}`: {error}"))?
- .with_top_level_navigation_cookie_context()
- .with_page_network_policy()
- .with_browser_navigation_kind(load_inputs.browser_navigation_kind);
+ let mut request = Request::new_browser_bytes(
+ method,
+ raw_url,
+ body,
+ request_headers,
+ load_inputs
+ .navigation_initiator_url
+ .as_ref()
+ .map_or(moli_url::WebOrigin::Opaque, moli_url::WebOrigin::from_url),
+ )
+ .map_err(|error| format!("failed to build request for `{raw_url}`: {error}"))?
+ .with_top_level_navigation_cookie_context()
+ .with_page_network_policy()
+ .with_browser_navigation_kind(load_inputs.browser_navigation_kind);
if !load_inputs.infer_navigation_referrer {
request = request.without_inferred_referrer();
}
if let Some(initiator_url) = load_inputs.navigation_initiator_url.as_ref() {
- request = request.with_initiator_url(initiator_url);
+ request = request
+ .with_initiator_url(initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(initiator_url));
}
request.set_auth(auth.map(Into::into));
diff --git a/moli-renderer-v8/src/content_security_policy.rs b/moli-renderer-v8/src/content_security_policy.rs
index cd619d355..94e855392 100644
--- a/moli-renderer-v8/src/content_security_policy.rs
+++ b/moli-renderer-v8/src/content_security_policy.rs
@@ -590,6 +590,7 @@ fn append_content_security_policy_report_requests(
pub(crate) fn send_content_security_policy_reports(
loader: &ResourceRequestClient,
+ origin: moli_url::WebOrigin,
fields: &ContentSecurityPolicyViolationEventFields<'_>,
report_uri_endpoints: &[String],
report_to_endpoints: &[String],
@@ -597,7 +598,10 @@ pub(crate) fn send_content_security_policy_reports(
for request in
content_security_policy_report_requests(fields, report_uri_endpoints, report_to_endpoints)
{
- send_content_security_policy_report_request(loader, request);
+ send_content_security_policy_report_request(
+ loader,
+ request.with_request_origin(origin.clone()),
+ );
}
}
diff --git a/moli-renderer-v8/src/context_bootstrap/worker_host/constructor.rs b/moli-renderer-v8/src/context_bootstrap/worker_host/constructor.rs
index 481bafee5..15e2509cc 100644
--- a/moli-renderer-v8/src/context_bootstrap/worker_host/constructor.rs
+++ b/moli-renderer-v8/src/context_bootstrap/worker_host/constructor.rs
@@ -867,7 +867,8 @@ fn materialize_nested_worker_script_source(
.map_err(|error| error.to_string())?
.with_page_network_policy()
.with_network_partition_key(context.network_policy.network_partition_key.clone())
- .with_initiator_url(&context.base_url);
+ .with_initiator_url(&context.base_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&context.base_url));
let response = loader
.request_client()
.fetch_text_for_worker_blocking_boundary(request)
diff --git a/moli-renderer-v8/src/module_runtime/graph.rs b/moli-renderer-v8/src/module_runtime/graph.rs
index 160833d26..de154bec4 100644
--- a/moli-renderer-v8/src/module_runtime/graph.rs
+++ b/moli-renderer-v8/src/module_runtime/graph.rs
@@ -353,6 +353,7 @@ impl NativeModuleGraphFetchRequest {
.expect("module graph URL should already be parsed")
.with_page_network_policy()
.with_initiator_url(&self.initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&self.initiator_url))
.with_credentials_mode(self.fetch_metadata.credentials_mode)
.with_script_fetch_metadata(self.fetch_metadata.request_metadata.clone());
Ok(match self.kind {
diff --git a/moli-renderer-v8/src/native_bridge/context_host/child_documents.rs b/moli-renderer-v8/src/native_bridge/context_host/child_documents.rs
index 50900c9f4..b5077d647 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/child_documents.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/child_documents.rs
@@ -37,6 +37,7 @@ fn configure_child_document_navigation_request(
.with_browser_site_context(browser_context.clone())
.with_subframe_navigation_cookie_context()
.with_initiator_url(initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(initiator_url))
}
#[derive(Debug, Clone)]
diff --git a/moli-renderer-v8/src/native_bridge/context_host/child_documents/loads.rs b/moli-renderer-v8/src/native_bridge/context_host/child_documents/loads.rs
index 46389fb7c..5dd1589de 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/child_documents/loads.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/child_documents/loads.rs
@@ -430,6 +430,7 @@ impl JsContextHost {
ContentSecurityPolicyViolationEventFields::from_url_violation(violation);
send_content_security_policy_reports(
pending.resource_loader.request_client(),
+ moli_url::WebOrigin::from_url(&loaded.final_url),
&fields,
&violation.report_uri_endpoints,
&violation.report_to_endpoints,
diff --git a/moli-renderer-v8/src/native_bridge/context_host/popups.rs b/moli-renderer-v8/src/native_bridge/context_host/popups.rs
index 6f5cf5651..e533c1d8d 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/popups.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/popups.rs
@@ -2153,18 +2153,23 @@ impl JsContextHost {
self.next_lightweight_popup_document_load_id.wrapping_add(1);
let target = LightweightPopupDocumentFetchTarget::new(load_id, task);
let local_snapshot = self.materialize_local_child_snapshot_for_url(&target_url);
- let resource_loader = if local_snapshot.is_none() {
+ let (resource_loader, request_origin) = if local_snapshot.is_none() {
let source_owner = self.current_lightweight_popup_document_owner(popup_id)?;
let initiating_loader = self.document_resource_loader_for_window_owner(
super::WindowDocumentOwner::LightweightPopup(source_owner),
)?;
- Some(crate::network::navigation::NavigationResourceLoader::new(
- initiating_loader.request_client().clone(),
- target_url.clone(),
- initiating_loader.task_runner(),
- ))
+ let origin =
+ moli_url::WebOrigin::from_serialized(initiating_loader.fetch_context().origin());
+ (
+ Some(crate::network::navigation::NavigationResourceLoader::new(
+ initiating_loader.request_client().clone(),
+ target_url.clone(),
+ initiating_loader.task_runner(),
+ )),
+ origin,
+ )
} else {
- None
+ (None, moli_url::WebOrigin::Opaque)
};
self.pending_lightweight_popup_document_loads.insert(
load_id,
@@ -2218,6 +2223,7 @@ impl JsContextHost {
let response = task_resource_loader
.fetch(
Request::get_with_url(target_url.clone())
+ .with_request_origin(request_origin)
.with_page_network_policy()
.with_top_level_navigation_cookie_context(),
)
@@ -3137,6 +3143,7 @@ impl JsContextHost {
.ok()?
.with_page_network_policy()
.with_initiator_url(&continuation.document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&continuation.document_url))
.with_script_fetch_metadata(Default::default());
Some((loader, request))
}
diff --git a/moli-renderer-v8/src/native_bridge/context_host/resource_loading.rs b/moli-renderer-v8/src/native_bridge/context_host/resource_loading.rs
index a47020801..4a6c97dfa 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/resource_loading.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/resource_loading.rs
@@ -564,6 +564,7 @@ impl JsContextHost {
csp_report_context: crate::network_host::WindowCspReportRequestContext,
credentials_mode: moli_fetch::RequestCredentialsMode,
request_mode: moli_fetch::RequestMode,
+ request_origin: moli_url::WebOrigin,
network_partition_key: Option<String>,
policy_context: crate::types::SubresourcePolicyContext,
mut info: PendingSubresourceFetchInfo,
@@ -584,6 +585,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
info.internal_id,
PendingSubresourceFetchState {
+ request_origin,
info,
load,
execution_context: PendingSubresourceExecutionContext::window_fetch(fetch_context),
@@ -621,6 +623,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
info.internal_id,
PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
info,
load,
execution_context: PendingSubresourceExecutionContext::adapter(
@@ -656,6 +659,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
info.internal_id,
PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
info,
load,
execution_context: PendingSubresourceExecutionContext::adapter(
@@ -689,6 +693,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
info.internal_id,
PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
info,
load,
execution_context: PendingSubresourceExecutionContext::adapter(
@@ -725,6 +730,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
info.internal_id,
PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
info,
load,
execution_context: PendingSubresourceExecutionContext::adapter(
@@ -760,6 +766,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
info.internal_id,
PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
info,
load,
execution_context: PendingSubresourceExecutionContext::adapter(
@@ -796,6 +803,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
info.internal_id,
PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
info,
load,
execution_context: PendingSubresourceExecutionContext::adapter(
@@ -826,6 +834,7 @@ impl JsContextHost {
cancel_handle: Option<moli_fetch::FetchCancelHandle>,
credentials_mode: moli_fetch::RequestCredentialsMode,
request_mode: moli_fetch::RequestMode,
+ request_origin: moli_url::WebOrigin,
network_partition_key: Option<String>,
policy_context: crate::types::SubresourcePolicyContext,
mut info: PendingSubresourceFetchInfo,
@@ -850,6 +859,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
internal_id,
PendingSubresourceFetchState {
+ request_origin,
info,
load,
execution_context: PendingSubresourceExecutionContext::window_fetch(fetch_context),
@@ -902,6 +912,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
internal_id,
PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
info,
load: load.clone(),
execution_context: PendingSubresourceExecutionContext::window(execution_context),
@@ -954,6 +965,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
internal_id,
PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
info,
load,
execution_context: PendingSubresourceExecutionContext::adapter(owner, context),
@@ -1023,6 +1035,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
internal_id,
PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
info,
load,
execution_context: PendingSubresourceExecutionContext::adapter(owner, context),
@@ -1138,6 +1151,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
internal_id,
PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
info,
load,
execution_context: PendingSubresourceExecutionContext::adapter(owner, context),
@@ -1192,6 +1206,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
internal_id,
PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
info,
load,
execution_context: PendingSubresourceExecutionContext::adapter(owner, context),
@@ -1230,6 +1245,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
internal_id,
PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
info,
load,
execution_context: PendingSubresourceExecutionContext::window_network_only(
@@ -1267,6 +1283,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
internal_id,
PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
info,
load,
execution_context: PendingSubresourceExecutionContext::window_document_network_only(
@@ -1302,6 +1319,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
internal_id,
PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
info,
load,
execution_context: PendingSubresourceExecutionContext::window_network_only(
@@ -1339,6 +1357,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
internal_id,
PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
info,
load,
execution_context: PendingSubresourceExecutionContext::window_document_network_only(
@@ -1377,6 +1396,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
internal_id,
PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
info,
load,
execution_context: PendingSubresourceExecutionContext::window(execution_context),
@@ -1411,6 +1431,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
info.internal_id,
PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
info,
load,
execution_context: PendingSubresourceExecutionContext::adapter(owner, context),
@@ -1448,6 +1469,7 @@ impl JsContextHost {
self.pending_subresource_fetches.insert(
internal_id,
PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
info,
load,
execution_context: PendingSubresourceExecutionContext::window(execution_context),
diff --git a/moli-renderer-v8/src/native_bridge/context_host/workers/registration.rs b/moli-renderer-v8/src/native_bridge/context_host/workers/registration.rs
index 53b032cc9..4937ea105 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/workers/registration.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/workers/registration.rs
@@ -1433,6 +1433,7 @@ async fn fetch_worker_script_source(
.with_page_network_policy()
.with_network_partition_key(network_partition_key.clone())
.with_initiator_url(initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(initiator_url))
.with_credentials_mode(match script_kind {
WorkerScriptKind::Classic => moli_fetch::RequestCredentialsMode::SameOrigin,
WorkerScriptKind::Module => module_credentials_mode,
diff --git a/moli-renderer-v8/src/network/backend/memory_cache.rs b/moli-renderer-v8/src/network/backend/memory_cache.rs
index a832b0bad..ec4bfaff9 100644
--- a/moli-renderer-v8/src/network/backend/memory_cache.rs
+++ b/moli-renderer-v8/src/network/backend/memory_cache.rs
@@ -46,6 +46,8 @@ pub(in crate::network) struct ScriptTextCacheKey {
page_cache_partition_id: u64,
url: String,
credentials_mode: String,
+ request_origin: Option<String>,
+ request_mode: String,
site_context: String,
site_for_cookies_origin: String,
top_frame_origin: String,
@@ -61,6 +63,8 @@ pub(in crate::network) struct RawSubresourceCacheKey {
url: String,
resource_type: &'static str,
credentials_mode: String,
+ request_origin: Option<String>,
+ request_mode: String,
network_partition_key: Option<String>,
cookie_context: String,
}
@@ -591,6 +595,10 @@ pub(in crate::network) fn script_text_cache_key(request: &Request) -> ScriptText
page_cache_partition_id: 0,
url: request.url.as_str().to_owned(),
credentials_mode: request.credentials_mode.as_ref().to_owned(),
+ request_origin: request
+ .request_origin()
+ .map(|origin| origin.ascii_serialization().to_owned()),
+ request_mode: request.request_mode.as_ref().to_owned(),
site_context: format!("{:?}", request.cookie_context.site_context),
site_for_cookies_origin: script_cache_partition_url_component(
browser_context.site_for_cookies_url.as_ref(),
@@ -628,6 +636,10 @@ pub(in crate::network) fn raw_subresource_memory_cache_key(
url: request.url.as_str().to_owned(),
resource_type: raw_subresource_cache_resource_type_key(request.resource_type),
credentials_mode: request.credentials_mode.as_ref().to_owned(),
+ request_origin: request
+ .request_origin()
+ .map(|origin| origin.ascii_serialization().to_owned()),
+ request_mode: request.request_mode.as_ref().to_owned(),
network_partition_key: request.network_partition_key().map(str::to_owned),
cookie_context: format!("{:?}", request.cookie_context),
})
@@ -771,6 +783,8 @@ fn script_text_key_retained_bytes(key: &ScriptTextCacheKey) -> usize {
key.url
.len()
.saturating_add(key.credentials_mode.len())
+ .saturating_add(key.request_origin.as_deref().map_or(0, str::len))
+ .saturating_add(key.request_mode.len())
.saturating_add(key.site_context.len())
.saturating_add(key.site_for_cookies_origin.len())
.saturating_add(key.top_frame_origin.len())
@@ -785,6 +799,8 @@ fn raw_subresource_key_retained_bytes(key: &RawSubresourceCacheKey) -> usize {
.len()
.saturating_add(key.resource_type.len())
.saturating_add(key.credentials_mode.len())
+ .saturating_add(key.request_origin.as_deref().map_or(0, str::len))
+ .saturating_add(key.request_mode.len())
.saturating_add(key.network_partition_key.as_deref().map_or(0, str::len))
.saturating_add(key.cookie_context.len())
}
diff --git a/moli-renderer-v8/src/network/backend/runtime.rs b/moli-renderer-v8/src/network/backend/runtime.rs
index 6e8eb96b6..4849b7049 100644
--- a/moli-renderer-v8/src/network/backend/runtime.rs
+++ b/moli-renderer-v8/src/network/backend/runtime.rs
@@ -667,7 +667,8 @@ mod tests {
let callback_runtime = old_runtime.clone();
let (callback_tx, callback_rx) = std_mpsc::channel();
client.fetch_text_callback(
- Request::get(&format!("http://{addr}/callback"))?,
+ Request::get(&format!("http://{addr}/callback"))?
+ .with_request_origin(moli_url::WebOrigin::Opaque),
move |result| {
let thread_name = std::thread::current()
.name()
@@ -775,7 +776,8 @@ mod tests {
let client = ResourceRequestClient::from_browser_resource_runtime(old_runtime.clone());
let mut response = client
.fetch_raw_stream_with_cancel(
- Request::get(&format!("http://{addr}/stream"))?,
+ Request::get(&format!("http://{addr}/stream"))?
+ .with_request_origin(moli_url::WebOrigin::Opaque),
FetchCancelHandle::new(),
)
.await?;
diff --git a/moli-renderer-v8/src/network/context/document.rs b/moli-renderer-v8/src/network/context/document.rs
index b1d344b89..3fa5c1e04 100644
--- a/moli-renderer-v8/src/network/context/document.rs
+++ b/moli-renderer-v8/src/network/context/document.rs
@@ -250,6 +250,10 @@ impl DocumentResourceLoader {
&self.request_client
}
+ pub(crate) fn fetch_context(&self) -> DocumentFetchContext {
+ self.authority.lifecycle.lock().context.clone()
+ }
+
#[cfg(test)]
pub(crate) fn owner(&self) -> crate::native_bridge::WindowDocumentOwner {
self.authority.lifecycle.lock().context.owner()
diff --git a/moli-renderer-v8/src/network/request_client.rs b/moli-renderer-v8/src/network/request_client.rs
index fef50311e..937b242fc 100644
--- a/moli-renderer-v8/src/network/request_client.rs
+++ b/moli-renderer-v8/src/network/request_client.rs
@@ -1052,6 +1052,7 @@ impl ResourceRequestClient {
}
fn apply_network_policy(&self, mut request: Request) -> Result<Request> {
+ request.browser_origin()?;
if let Some(browser_site_context) = self.browser_site_context.as_deref() {
request = request.with_browser_site_context(browser_site_context.clone());
}
diff --git a/moli-renderer-v8/src/network/request_client/tests.rs b/moli-renderer-v8/src/network/request_client/tests.rs
index 4748079d1..2f076e64e 100644
--- a/moli-renderer-v8/src/network/request_client/tests.rs
+++ b/moli-renderer-v8/src/network/request_client/tests.rs
@@ -31,6 +31,26 @@ use crate::network::{BrowserResourceRuntimeOwner, BrowserResourceRuntimeOwnerRoo
use crate::protocol_types::OptionalResourceFetchMask;
use crate::types::SubresourceResourceType;
+// These transport/cache tests use browser navigation semantics; origin policy
+// tests below construct their own explicit origin.
+fn browser_navigation_request(url: &str) -> Result<Request> {
+ Ok(Request::get(url)?.with_request_origin(moli_url::WebOrigin::Opaque))
+}
+
+#[test]
+fn browser_client_rejects_http_requests_even_with_an_initiator() -> Result<()> {
+ let owner = ResourceRequestClient::new(&FetchConfig::default())?;
+ let url = Url::parse("https://example.test/")?;
+ let http = Request::get_with_url(url.clone()).with_initiator_url(&url);
+ assert!(http.request_origin().is_none());
+ let error = owner.handle().apply_network_policy(http).unwrap_err();
+ assert!(error.to_string().contains("explicit environment origin"));
+
+ let browser = Request::new_browser("GET", url.clone(), None, Vec::new(), (&url).into());
+ owner.handle().apply_network_policy(browser)?;
+ Ok(())
+}
+
#[test]
fn loader_clones_share_one_browser_resource_runtime() {
let loader = ResourceRequestClient::new(&FetchConfig::default()).expect("loader");
@@ -137,7 +157,7 @@ async fn memory_cache_tee_drop_after_body_eof_cancels_pending_completion_and_rel
let registrar = root.registrar();
let old_runtime = binding.current();
let client = ResourceRequestClient::from_browser_resource_runtime(old_runtime.clone());
- let request = Request::get("https://cache.test/last-chunk.css")?
+ let request = browser_navigation_request("https://cache.test/last-chunk.css")?
.with_resource_type(RequestResourceType::CssStyleSheet);
let cache_key = raw_subresource_memory_cache_key(&request)
.expect("stylesheet request should use the raw subresource memory cache");
@@ -253,7 +273,7 @@ async fn dropping_cacheable_stream_stalled_between_chunks_cancels_real_fetch_and
let old_runtime = binding.current();
let client = ResourceRequestClient::from_browser_resource_runtime(old_runtime.clone());
let cancel_handle = FetchCancelHandle::new();
- let request = Request::get(&format!("http://{addr}/stalled.css"))?
+ let request = browser_navigation_request(&format!("http://{addr}/stalled.css"))?
.with_resource_type(RequestResourceType::CssStyleSheet);
assert!(
raw_subresource_memory_cache_key(&request).is_some(),
@@ -344,7 +364,7 @@ fn merge_loader_network_policy_headers_uses_header_name_keys_and_request_order()
("X-Test".to_owned(), "context".to_owned()),
("Accept".to_owned(), "text/html".to_owned()),
]);
- let mut request = Request::get("https://example.test/headers")
+ let mut request = browser_navigation_request("https://example.test/headers")
.unwrap()
.with_page_network_policy();
request.request_headers = vec![
@@ -496,11 +516,39 @@ fn loader_image_compatibility_switch_preserves_other_resource_bits() {
assert_eq!(loader.optional_resource_fetch_mask(), preserved);
}
+#[test]
+fn memory_caches_partition_explicit_origin_independently_of_referrer() -> Result<()> {
+ let url = Url::parse("https://scripts.test/app.js")?;
+ let origin = moli_url::WebOrigin::from_url(&url);
+ let request = Request::new_browser("GET", url.clone(), None, Vec::new(), origin)
+ .with_initiator_url(&url)
+ .with_resource_type(RequestResourceType::CssStyleSheet)
+ .with_script_fetch_metadata(ScriptFetchRequestMetadata::default());
+ let opaque = request
+ .clone()
+ .with_request_origin(moli_url::WebOrigin::Opaque);
+ let no_cors = request
+ .clone()
+ .with_request_mode(moli_fetch::RequestMode::NoCors);
+ for other in [opaque, no_cors] {
+ assert_ne!(
+ super::script_text_cache_key(&request),
+ super::script_text_cache_key(&other)
+ );
+ assert_ne!(
+ raw_subresource_memory_cache_key(&request),
+ raw_subresource_memory_cache_key(&other)
+ );
+ }
+ Ok(())
+}
+
#[test]
fn script_text_memory_cache_key_partitions_credentials_and_cookie_context() -> Result<()> {
let url = Url::parse("https://scripts.test/app.js")?;
let base_request = || {
- Request::get_with_url(url.clone())
+ browser_navigation_request(url.as_str())
+ .unwrap()
.with_script_fetch_metadata(ScriptFetchRequestMetadata::default())
};
@@ -603,7 +651,7 @@ async fn streaming_fetch_commits_set_cookie_before_body_completion() -> Result<(
&FetchConfig::default(),
Arc::clone(&cookie_store),
)?;
- let request = Request::get(&format!("http://{addr}/stream"))?;
+ let request = browser_navigation_request(&format!("http://{addr}/stream"))?;
let mut response = loader
.fetch_raw_stream_with_cancel(request, FetchCancelHandle::new())
.await?;
@@ -660,7 +708,7 @@ async fn dropping_streaming_response_cancels_the_source_transfer() -> Result<()>
});
let loader = ResourceRequestClient::new(&FetchConfig::default())?;
- let request = Request::get(&format!("http://{addr}/stream"))?;
+ let request = browser_navigation_request(&format!("http://{addr}/stream"))?;
let mut response = loader
.fetch_raw_stream_with_cancel(request, FetchCancelHandle::new())
.await?;
@@ -700,10 +748,10 @@ async fn text_stream_fetch_uses_disk_cache_for_safe_gets() -> Result<()> {
let url = format!("http://{addr}/cacheable.txt");
let first = loader
- .fetch_text_stream(Request::get(&url)?.with_page_network_policy())
+ .fetch_text_stream(browser_navigation_request(&url)?.with_page_network_policy())
.await?;
let second = loader
- .fetch_text_stream(Request::get(&url)?.with_page_network_policy())
+ .fetch_text_stream(browser_navigation_request(&url)?.with_page_network_policy())
.await?;
assert_eq!(first.body_text(), "cached-renderer-text-stream");
@@ -741,7 +789,7 @@ async fn script_text_fetch_uses_shared_memory_resource_cache_with_fresh_cache_he
let loader = ResourceRequestClient::new(&FetchConfig::default())?;
let url = format!("http://{addr}/app.js");
let request = || {
- Request::get(&url).map(|request| {
+ browser_navigation_request(&url).map(|request| {
request.with_script_fetch_metadata(ScriptFetchRequestMetadata::default())
})
};
@@ -793,7 +841,7 @@ async fn cache_bypass_replaces_script_text_memory_entry() -> Result<()> {
let peer = loader.fork_with_isolated_page_network_policy();
let url = format!("http://{addr}/app.js");
let request = || {
- Request::get(&url).map(|request| {
+ browser_navigation_request(&url).map(|request| {
request
.with_page_network_policy()
.with_script_fetch_metadata(ScriptFetchRequestMetadata::default())
@@ -853,8 +901,8 @@ async fn unique_script_text_fetches_stay_within_one_loader_memory_budget() -> Re
let loader = ResourceRequestClient::new(&FetchConfig::default())?;
for index in 0..SCRIPT_COUNT {
let url = format!("http://{addr}/script-{index}.js");
- let request =
- Request::get(&url)?.with_script_fetch_metadata(ScriptFetchRequestMetadata::default());
+ let request = browser_navigation_request(&url)?
+ .with_script_fetch_metadata(ScriptFetchRequestMetadata::default());
let response = loader.fetch_cacheable_script_text_stream(request).await?;
assert_eq!(response.body_bytes().len(), SCRIPT_BYTES);
}
@@ -900,7 +948,7 @@ async fn stylesheet_text_stream_uses_shared_memory_resource_cache_without_http_c
let loader = ResourceRequestClient::new(&FetchConfig::default())?;
let url = format!("http://{addr}/cached.css");
let request = || {
- Request::get(&url).map(|request| {
+ browser_navigation_request(&url).map(|request| {
request
.with_page_network_policy()
.with_resource_type(RequestResourceType::CssStyleSheet)
@@ -924,7 +972,7 @@ async fn text_stream_fetch_handles_local_data_stylesheet_urls() -> Result<()> {
let loader = ResourceRequestClient::new(&FetchConfig::default())?;
let response = loader
.fetch_text_stream(
- Request::get("data:text/css,:root%7Bbackground:green%7D")?
+ browser_navigation_request("data:text/css,:root%7Bbackground:green%7D")?
.with_page_network_policy()
.with_resource_type(RequestResourceType::CssStyleSheet),
)
@@ -974,7 +1022,7 @@ async fn concurrent_script_text_waiter_preserves_owner_cache_state() -> Result<(
let loader = ResourceRequestClient::new(&FetchConfig::default())?;
let url = format!("http://{addr}/module.js");
let request = || {
- Request::get(&url).map(|request| {
+ browser_navigation_request(&url).map(|request| {
request.with_script_fetch_metadata(ScriptFetchRequestMetadata::default())
})
};
@@ -1048,7 +1096,7 @@ async fn script_text_fetch_respects_configured_request_timeout() -> Result<()> {
let mut config = FetchConfig::default();
config.set_request_timeout_ms(100);
let loader = ResourceRequestClient::new(&config)?;
- let request = Request::get(&format!("http://{addr}/slow-script.js"))?
+ let request = browser_navigation_request(&format!("http://{addr}/slow-script.js"))?
.with_script_fetch_metadata(ScriptFetchRequestMetadata::default());
let error = timeout(
Duration::from_secs(2),
@@ -1091,10 +1139,10 @@ async fn compatibility_fetch_uses_streaming_disk_cache_for_safe_gets() -> Result
let url = format!("http://{addr}/cacheable.txt");
let first = loader
- .fetch(Request::get(&url)?.with_page_network_policy())
+ .fetch(browser_navigation_request(&url)?.with_page_network_policy())
.await?;
let second = loader
- .fetch(Request::get(&url)?.with_page_network_policy())
+ .fetch(browser_navigation_request(&url)?.with_page_network_policy())
.await?;
assert_eq!(first.body_text(), "cached-renderer-compat-fetch");
@@ -1128,10 +1176,10 @@ async fn compatibility_raw_fetch_uses_streaming_disk_cache_for_safe_gets() -> Re
let url = format!("http://{addr}/cacheable.bin");
let first = loader
- .fetch_raw(Request::get(&url)?.with_page_network_policy())
+ .fetch_raw(browser_navigation_request(&url)?.with_page_network_policy())
.await?;
let second = loader
- .fetch_raw(Request::get(&url)?.with_page_network_policy())
+ .fetch_raw(browser_navigation_request(&url)?.with_page_network_policy())
.await?;
assert_eq!(first.body_bytes(), b"cached-renderer-compat-raw\xff");
@@ -1168,7 +1216,7 @@ async fn image_raw_stream_uses_shared_memory_resource_cache_without_http_cache_d
let loader = ResourceRequestClient::new(&FetchConfig::default())?;
let url = format!("http://{addr}/cached.png");
let request = || {
- Request::get(&url).map(|request| {
+ browser_navigation_request(&url).map(|request| {
request
.with_page_network_policy()
.with_resource_type(RequestResourceType::Image)
@@ -1243,7 +1291,7 @@ async fn cache_bypass_replaces_raw_subresource_memory_entry() -> Result<()> {
let peer = loader.fork_with_isolated_page_network_policy();
let url = format!("http://{addr}/cached.png");
let request = || {
- Request::get(&url).map(|request| {
+ browser_navigation_request(&url).map(|request| {
request
.with_page_network_policy()
.with_resource_type(RequestResourceType::Image)
@@ -1318,7 +1366,7 @@ async fn browser_fetch_raw_stream_uses_shared_memory_resource_cache_without_http
let loader = ResourceRequestClient::new(&FetchConfig::default())?;
let url = format!("http://{addr}/cached-fetch.txt");
let request = || {
- Request::get(&url).map(|request| {
+ browser_navigation_request(&url).map(|request| {
request
.with_page_network_policy()
.with_browser_request_metadata(BrowserRequestMetadata::Fetch)
@@ -1446,12 +1494,14 @@ async fn loader_applies_network_policy_only_to_opt_in_requests() -> Result<()> {
loader.set_extra_http_headers(&[("x-cdp-test".to_owned(), "loader-policy".to_owned())]);
let plain = loader
- .fetch(Request::get(&format!("http://{addr}/plain"))?)
+ .fetch(browser_navigation_request(&format!("http://{addr}/plain"))?)
.await?;
assert_eq!(plain.body_text(), "plain:");
let opt_in = loader
- .fetch(Request::get(&format!("http://{addr}/optin"))?.with_page_network_policy())
+ .fetch(
+ browser_navigation_request(&format!("http://{addr}/optin"))?.with_page_network_policy(),
+ )
.await?;
assert_eq!(opt_in.body_text(), "optin:loader-policy");
@@ -1500,20 +1550,23 @@ async fn loader_opt_in_network_policy_enforces_blocked_and_offline() -> Result<(
let blocked_url = format!("http://{addr}/blocked");
loader.set_blocked_url_patterns(std::slice::from_ref(&blocked_url));
let blocked = loader
- .fetch(Request::get(&blocked_url)?.with_page_network_policy())
+ .fetch(browser_navigation_request(&blocked_url)?.with_page_network_policy())
.await
.unwrap_err()
.to_string();
assert!(blocked.contains("net::ERR_BLOCKED_BY_CLIENT"));
let plain = loader
- .fetch(Request::get(&format!("http://{addr}/plain"))?)
+ .fetch(browser_navigation_request(&format!("http://{addr}/plain"))?)
.await?;
assert_eq!(plain.body_text(), "reachable");
loader.set_network_offline(true);
let offline = loader
- .fetch(Request::get(&format!("http://{addr}/offline"))?.with_page_network_policy())
+ .fetch(
+ browser_navigation_request(&format!("http://{addr}/offline"))?
+ .with_page_network_policy(),
+ )
.await
.unwrap_err()
.to_string();
diff --git a/moli-renderer-v8/src/network_host/async_fetch.rs b/moli-renderer-v8/src/network_host/async_fetch.rs
index 694d2ed14..f2b193365 100644
--- a/moli-renderer-v8/src/network_host/async_fetch.rs
+++ b/moli-renderer-v8/src/network_host/async_fetch.rs
@@ -400,8 +400,10 @@ async fn run_cors_preflight_if_needed(
preflight_request_headers: &[(String, String)],
preflight_observer: Option<&CorsPreflightNetworkObserver>,
) -> Result<(), String> {
- if let Some(initiator_url) = request.cookie_context.initiator_url.clone()
- && request.request_mode == RequestMode::Cors
+ let request_origin = request
+ .browser_origin()
+ .map_err(|error| error.to_string())?;
+ if request.request_mode == RequestMode::Cors
&& let Some(preflight_headers) = cors_preflight_request_headers(
request.has_cross_origin_url(&request.url),
&request.url,
@@ -410,16 +412,23 @@ async fn run_cors_preflight_if_needed(
)
{
let observable_preflight_headers = preflight_headers.clone();
- let mut preflight_request =
- Request::new("OPTIONS", request.url.as_str(), None, preflight_headers)
- .map_err(|error| format!("cors preflight: failed to build request: {error}"))?
- // Preflight performs one HTTP exchange; a redirect is a
- // non-ok response, never another OPTIONS request.
- .with_redirect_mode(RequestRedirectMode::Manual)
- .with_initiator_url(&initiator_url)
- .with_credentials_mode(RequestCredentialsMode::SameOrigin)
- .with_redirect_chain(request.redirect_chain().to_vec())
- .with_network_partition_key(request.network_partition_key().map(str::to_owned));
+ let mut preflight_request = Request::new_browser_bytes(
+ "OPTIONS",
+ request.url.as_str(),
+ None,
+ preflight_headers,
+ request_origin.clone(),
+ )
+ .map_err(|error| format!("cors preflight: failed to build request: {error}"))?
+ // Preflight performs one HTTP exchange; a redirect is a
+ // non-ok response, never another OPTIONS request.
+ .with_redirect_mode(RequestRedirectMode::Manual)
+ .with_credentials_mode(RequestCredentialsMode::SameOrigin)
+ .with_redirect_chain(request.redirect_chain().to_vec())
+ .with_network_partition_key(request.network_partition_key().map(str::to_owned));
+ if let Some(initiator_url) = request.cookie_context.initiator_url.as_ref() {
+ preflight_request = preflight_request.with_initiator_url(initiator_url);
+ }
if let Some(metadata) = request.browser_request_metadata() {
preflight_request = preflight_request.with_browser_request_metadata(metadata);
} else {
@@ -794,6 +803,9 @@ mod tests {
request_headers.clone(),
)?
.with_initiator_url(&Url::parse("https://origin.test/page")?)
+ .with_request_origin(moli_url::WebOrigin::from_url(&Url::parse(
+ "https://origin.test/page",
+ )?))
.with_browser_request_metadata(BrowserRequestMetadata::Xhr);
let mut redirects = ManualCorsRedirectState::new(request, request_headers);
@@ -835,13 +847,23 @@ mod tests {
}
#[tokio::test(flavor = "multi_thread")]
- async fn cors_preflight_uses_streaming_head_response() -> Result<()> {
+ async fn cors_preflight_uses_streaming_head_response_without_a_referrer_url() -> Result<()> {
let listener = TcpListener::bind("127.0.0.1:0").await?;
let addr = listener.local_addr()?;
let server = tokio::spawn(async move {
let (mut preflight, _) = listener.accept().await.unwrap();
let preflight_request = read_http_request_text(&mut preflight).await.unwrap();
assert!(preflight_request.starts_with("OPTIONS /resource HTTP/1.1"));
+ assert!(
+ preflight_request
+ .to_ascii_lowercase()
+ .contains("\r\norigin: http://origin.test\r\n")
+ );
+ assert!(
+ !preflight_request
+ .to_ascii_lowercase()
+ .contains("\r\nreferer:")
+ );
assert!(
preflight_request
.to_ascii_lowercase()
@@ -870,6 +892,11 @@ mod tests {
let (mut actual, _) = listener.accept().await.unwrap();
let actual_request = read_http_request_text(&mut actual).await.unwrap();
assert!(actual_request.starts_with("PUT /resource HTTP/1.1"));
+ assert!(
+ actual_request
+ .to_ascii_lowercase()
+ .contains("\r\norigin: http://origin.test\r\n")
+ );
let body = "ok";
let response = format!(
concat!(
@@ -894,7 +921,9 @@ mod tests {
None,
vec![("X-Test".to_owned(), "yes".to_owned())],
)?
- .with_initiator_url(&Url::parse("http://origin.test/page")?)
+ .with_request_origin(moli_url::WebOrigin::from_url(&Url::parse(
+ "http://origin.test/page",
+ )?))
.with_credentials_mode(RequestCredentialsMode::SameOrigin)
.with_browser_request_metadata(BrowserRequestMetadata::Fetch);
@@ -992,6 +1021,7 @@ mod tests {
request_headers.clone(),
)?
.with_initiator_url(&document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&document_url))
.with_credentials_mode(RequestCredentialsMode::SameOrigin)
.with_browser_request_metadata(BrowserRequestMetadata::Xhr);
@@ -1076,6 +1106,7 @@ mod tests {
let request_headers = vec![("Content-Type".to_owned(), "custom/type".to_owned())];
let request = Request::new("GET", request_url.as_str(), None, request_headers.clone())?
.with_initiator_url(&document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&document_url))
.with_credentials_mode(RequestCredentialsMode::SameOrigin)
.with_browser_request_metadata(BrowserRequestMetadata::Fetch);
@@ -1089,6 +1120,7 @@ mod tests {
73,
AsyncSubresourceNetworkContext {
frame_id: Some("FRAME-1".to_owned()),
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url: document_url.clone(),
resource_type: SubresourceResourceType::Fetch,
policy_context: Default::default(),
@@ -1187,6 +1219,9 @@ mod tests {
let source_url = Url::parse(&format!("http://{addr}/synthetic"))?;
let request = Request::get(target_url.as_str())?
.with_initiator_url(&Url::parse(&format!("http://{addr}/page"))?)
+ .with_request_origin(moli_url::WebOrigin::from_url(&Url::parse(&format!(
+ "http://{addr}/page"
+ ))?))
.with_browser_request_metadata(BrowserRequestMetadata::Fetch);
let initial_redirect_chain = vec![RedirectInfo {
source: moli_fetch::RedirectSource::ServiceWorker,
@@ -1214,6 +1249,9 @@ mod tests {
74,
AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(
+ &(Url::parse(&format!("http://{addr}/page"))?),
+ ),
document_url: Url::parse(&format!("http://{addr}/page"))?,
resource_type: SubresourceResourceType::Fetch,
policy_context: Default::default(),
@@ -1290,6 +1328,7 @@ mod tests {
let loader = loader_owner.handle();
let request_url = Url::parse(&format!("http://{addr}/xhr"))?;
let request = Request::get(request_url.as_str())?
+ .with_request_origin(moli_url::WebOrigin::from_url(&request_url))
.with_browser_request_metadata(BrowserRequestMetadata::Xhr);
spawn_async_subresource_fetch(
@@ -1302,6 +1341,9 @@ mod tests {
41,
AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(
+ &(Url::parse("http://origin.test/page")?),
+ ),
document_url: Url::parse("http://origin.test/page")?,
resource_type: SubresourceResourceType::Xhr,
policy_context: Default::default(),
@@ -1393,6 +1435,7 @@ mod tests {
request_headers.clone(),
)?
.with_initiator_url(&document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&document_url))
.with_browser_request_metadata(BrowserRequestMetadata::Xhr);
assert!(browser_request_needs_manual_preflight_redirects(
&request,
@@ -1409,6 +1452,7 @@ mod tests {
42,
AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url,
resource_type: SubresourceResourceType::Xhr,
policy_context: Default::default(),
@@ -1557,6 +1601,7 @@ mod tests {
request_headers.clone(),
)?
.with_initiator_url(&document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&document_url))
.with_credentials_mode(RequestCredentialsMode::SameOrigin)
.with_browser_request_metadata(BrowserRequestMetadata::Xhr);
@@ -1570,6 +1615,7 @@ mod tests {
43,
AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url: document_url.clone(),
resource_type: SubresourceResourceType::Xhr,
policy_context: Default::default(),
diff --git a/moli-renderer-v8/src/network_host/beacon.rs b/moli-renderer-v8/src/network_host/beacon.rs
index 7b6f49388..b15156f41 100644
--- a/moli-renderer-v8/src/network_host/beacon.rs
+++ b/moli-renderer-v8/src/network_host/beacon.rs
@@ -130,6 +130,7 @@ pub(crate) fn navigator_send_beacon_callback<'s>(
match Request::new_bytes("POST", resolved_url.as_str(), body, request_headers.clone()) {
Ok(request) => request
.with_initiator_url(&document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&document_url))
.with_resource_type(RequestResourceType::Beacon)
.with_browser_request_metadata(moli_fetch::BrowserRequestMetadata::Beacon)
.with_request_mode(RequestMode::NoCors)
@@ -145,6 +146,7 @@ pub(crate) fn navigator_send_beacon_callback<'s>(
let cancel_handle = FetchCancelHandle::new();
let network_context = AsyncSubresourceNetworkContext {
frame_id: info.frame_id.clone(),
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
document_url: info.document_url.clone(),
resource_type: info.resource_type,
policy_context: Default::default(),
@@ -261,6 +263,7 @@ pub(crate) fn send_link_audit_ping(
) {
Ok(request) => request
.with_initiator_url(&document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&document_url))
.with_resource_type(RequestResourceType::Ping)
.with_browser_request_metadata(moli_fetch::BrowserRequestMetadata::Ping)
.with_request_mode(RequestMode::NoCors)
@@ -276,6 +279,7 @@ pub(crate) fn send_link_audit_ping(
let cancel_handle = FetchCancelHandle::new();
let network_context = AsyncSubresourceNetworkContext {
frame_id: info.frame_id.clone(),
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
document_url: info.document_url.clone(),
resource_type: info.resource_type,
policy_context: Default::default(),
diff --git a/moli-renderer-v8/src/network_host/csp_reports.rs b/moli-renderer-v8/src/network_host/csp_reports.rs
index cdd4d49a9..4e7160bad 100644
--- a/moli-renderer-v8/src/network_host/csp_reports.rs
+++ b/moli-renderer-v8/src/network_host/csp_reports.rs
@@ -197,6 +197,7 @@ fn send_content_security_policy_report_request(
let request = request
.with_initiator_url(&request_context.document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&request_context.document_url))
.with_network_partition_key(request_context.network_partition_key.clone())
.with_subframe_context(request_context.frame_id.is_some());
let info = report_subresource_fetch_info(
@@ -311,11 +312,11 @@ fn dispatch_service_worker_content_security_policy_report(
request.priority_hints.fetch_priority,
service_worker_fetch_request_metadata(&request),
),
- request_body_text: request_body_text.clone(),
cors_preflight_request_headers: Vec::new(),
request_cookie_report: info.request_cookie_report.clone(),
network_context: AsyncSubresourceNetworkContext {
frame_id: info.frame_id.clone(),
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
document_url: info.document_url.clone(),
resource_type: SubresourceResourceType::CspReport,
policy_context: request_context.policy_context,
@@ -376,6 +377,7 @@ fn spawn_content_security_policy_report_fetch(
internal_id,
AsyncSubresourceNetworkContext {
frame_id: info.frame_id,
+ request_origin: moli_url::WebOrigin::from_url(&info.document_url),
document_url: info.document_url,
resource_type: SubresourceResourceType::CspReport,
policy_context: request_context.policy_context,
diff --git a/moli-renderer-v8/src/network_host/event_source/request.rs b/moli-renderer-v8/src/network_host/event_source/request.rs
index fd87d89e9..6642c653d 100644
--- a/moli-renderer-v8/src/network_host/event_source/request.rs
+++ b/moli-renderer-v8/src/network_host/event_source/request.rs
@@ -295,6 +295,7 @@ pub(crate) fn start_event_source_request<'s>(
registered.internal_id,
crate::types::AsyncSubresourceNetworkContext {
frame_id: prepared.frame_id,
+ request_origin: moli_url::WebOrigin::from_url(&prepared.document_url),
document_url: prepared.document_url,
resource_type: SubresourceResourceType::EventSource,
policy_context: prepared.policy_context,
@@ -405,11 +406,11 @@ fn dispatch_service_worker_event_source<'s>(
let dispatch = ServiceWorkerFetchDispatch {
internal_id: registered.internal_id,
request,
- request_body_text: None,
cors_preflight_request_headers: prepared.cors_preflight_request_headers.clone(),
request_cookie_report: prepared.request_cookie_report.clone(),
network_context: crate::types::AsyncSubresourceNetworkContext {
frame_id: prepared.frame_id.clone(),
+ request_origin: moli_url::WebOrigin::from_url(&prepared.document_url),
document_url: prepared.document_url.clone(),
resource_type: SubresourceResourceType::EventSource,
policy_context: prepared.policy_context,
@@ -450,6 +451,7 @@ fn build_event_source_request(prepared: &PreparedEventSourceRequest) -> Result<R
.map(|request| {
request
.with_initiator_url(&prepared.document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&prepared.document_url))
.with_request_mode(RequestMode::Cors)
.with_credentials_mode(prepared.credentials_mode)
.with_network_partition_key(prepared.network_partition_key.clone())
diff --git a/moli-renderer-v8/src/network_host/fetch/bindings.rs b/moli-renderer-v8/src/network_host/fetch/bindings.rs
index 918c26b60..c46e9ae9f 100644
--- a/moli-renderer-v8/src/network_host/fetch/bindings.rs
+++ b/moli-renderer-v8/src/network_host/fetch/bindings.rs
@@ -262,6 +262,13 @@ fn window_fetch_callback_in_relevant_realm<'s>(
return;
}
+ if let Err(message) = moli_fetch::FetchUrlList::new(&prepared.resolved_url, &[])
+ .validate_request_mode(prepared.request_mode, &prepared.request_origin)
+ {
+ rv.set(make_rejected_promise(scope, &message).into());
+ return;
+ }
+
let Some(resolver) = v8::PromiseResolver::new(scope) else {
rv.set_undefined();
return;
@@ -302,10 +309,10 @@ fn window_fetch_callback_in_relevant_realm<'s>(
}
match resolve_local_fetch(host, &prepared) {
- Ok(Some((document_url, response))) => {
+ Ok(Some(response)) => {
let response_obj = build_fetch_response_object_for_request_mode(
scope,
- &document_url,
+ &prepared.request_origin,
prepared.request_mode,
response,
);
diff --git a/moli-renderer-v8/src/network_host/fetch/bindings/paths.rs b/moli-renderer-v8/src/network_host/fetch/bindings/paths.rs
index 43b2382e6..21bf62fb1 100644
--- a/moli-renderer-v8/src/network_host/fetch/bindings/paths.rs
+++ b/moli-renderer-v8/src/network_host/fetch/bindings/paths.rs
@@ -26,6 +26,7 @@ pub(super) fn record_intercepted_fetch(
prepared.csp_report_context,
prepared.credentials_mode,
prepared.request_mode,
+ prepared.request_origin.clone(),
prepared.network_partition_key,
prepared.policy_context,
PendingSubresourceFetchInfo {
@@ -141,7 +142,7 @@ pub(super) fn reject_bad_port_fetch(
pub(super) fn resolve_local_fetch(
host: &mut JsContextHost,
prepared: &PreparedWindowFetchRequest,
-) -> Result<Option<(url::Url, Response)>, String> {
+) -> Result<Option<Response>, String> {
let Some(response) = local_url_response(&prepared.resolved_url) else {
if prepared.resolved_url.scheme() != "blob" {
return Ok(None);
@@ -159,7 +160,6 @@ pub(super) fn resolve_local_fetch(
));
return Err(message);
};
- let document_url = prepared.document_url.clone();
host.record_subresource_network(
SubresourceNetworkRecord::success_with_body(
prepared.frame_id.clone(),
@@ -185,7 +185,7 @@ pub(super) fn resolve_local_fetch(
.with_from_cache(response.from_cache)
.with_negotiated_http_version(response.negotiated_http_version),
);
- Ok(Some((document_url, response)))
+ Ok(Some(response))
}
pub(super) fn spawn_network_fetch(
@@ -195,13 +195,13 @@ pub(super) fn spawn_network_fetch(
prepared: PreparedWindowFetchRequest,
) -> Result<u64, String> {
let loader = prepared.resource_loader.request_client().clone();
- let mut request = Request::new_bytes(
+ let mut request = Request::new_browser(
&prepared.method,
- prepared.resolved_url.as_str(),
+ prepared.resolved_url.clone(),
prepared.body.clone(),
prepared.request_headers.clone(),
+ prepared.request_origin.clone(),
)
- .map_err(|error| error.to_string())?
.with_initiator_url(&prepared.document_url)
.with_request_mode(prepared.request_mode)
.with_credentials_mode(prepared.credentials_mode)
@@ -228,6 +228,7 @@ pub(super) fn spawn_network_fetch(
);
let network_context = AsyncSubresourceNetworkContext {
frame_id: prepared.frame_id.clone(),
+ request_origin: prepared.request_origin.clone(),
document_url: prepared.document_url.clone(),
resource_type: SubresourceResourceType::Fetch,
policy_context: prepared.policy_context,
@@ -235,7 +236,9 @@ pub(super) fn spawn_network_fetch(
let cancel_handle = FetchCancelHandle::new();
let requires_preflight = prepared.request_mode == moli_fetch::RequestMode::Cors
&& crate::network_host::cors_preflight_request_headers(
- !moli_url::same_origin(&prepared.document_url, &prepared.resolved_url),
+ !prepared
+ .request_origin
+ .same_origin(&(&prepared.resolved_url).into()),
&prepared.resolved_url,
&prepared.method,
&prepared.cors_preflight_request_headers,
@@ -250,6 +253,7 @@ pub(super) fn spawn_network_fetch(
Some(cancel_handle.clone()),
prepared.credentials_mode,
prepared.request_mode,
+ prepared.request_origin.clone(),
prepared.network_partition_key.clone(),
prepared.policy_context,
PendingSubresourceFetchInfo {
diff --git a/moli-renderer-v8/src/network_host/fetch/bindings/request.rs b/moli-renderer-v8/src/network_host/fetch/bindings/request.rs
index c050d8c8b..8d465ba24 100644
--- a/moli-renderer-v8/src/network_host/fetch/bindings/request.rs
+++ b/moli-renderer-v8/src/network_host/fetch/bindings/request.rs
@@ -8,6 +8,7 @@ pub(super) struct PreparedWindowFetchRequest {
pub(super) connect_policy: crate::document_runtime::DocumentConnectPolicySnapshot,
pub(super) csp_report_context: crate::network_host::WindowCspReportRequestContext,
pub(super) document_url: url::Url,
+ pub(super) request_origin: moli_url::WebOrigin,
pub(super) network_partition_key: Option<String>,
pub(super) document_referrer_policy: Option<String>,
pub(super) policy_context: crate::types::SubresourcePolicyContext,
@@ -51,8 +52,14 @@ pub(super) fn prepare_window_fetch_request<'s>(
let resource_loader = host
.document_resource_loader_for_window_owner(document_target.owner())
.ok_or_else(|| "fetch: Document resource loader is unavailable".to_owned())?;
- let (frame_id, document_url) = subresource_request_scope_for_owner(scope, host, request_scope)
+ let (frame_id, mut base_url) = subresource_request_scope_for_owner(scope, host, request_scope)
.ok_or_else(|| "fetch: Window execution context owner is retired".to_owned())?;
+ let context = resource_loader.fetch_context();
+ let document_url = context.document_url().clone();
+ let request_origin = moli_url::WebOrigin::from_serialized(context.origin());
+ if request_scope == crate::native_bridge::OwnerDispatchScope::Top {
+ base_url = host.document_base_url_for_handle(host.document_handle());
+ }
let connect_policy = host
.document_connect_policy_snapshot_for_owner(request_scope)
.ok_or_else(|| "fetch: document policy context is unavailable".to_owned())?;
@@ -69,7 +76,7 @@ pub(super) fn prepare_window_fetch_request<'s>(
}
let request_headers =
merge_subresource_request_headers(host.extra_http_headers(), &request_headers);
- let resolved_url = resolve_context_url(&document_url, &parsed.url, None)?;
+ let resolved_url = resolve_context_url(&base_url, &parsed.url, None)?;
Ok(PreparedWindowFetchRequest {
frame_id,
@@ -78,6 +85,7 @@ pub(super) fn prepare_window_fetch_request<'s>(
connect_policy,
csp_report_context,
document_url,
+ request_origin,
network_partition_key,
document_referrer_policy,
policy_context,
diff --git a/moli-renderer-v8/src/network_host/fetch/bindings/service_worker.rs b/moli-renderer-v8/src/network_host/fetch/bindings/service_worker.rs
index 9de0ec863..8fd3219d5 100644
--- a/moli-renderer-v8/src/network_host/fetch/bindings/service_worker.rs
+++ b/moli-renderer-v8/src/network_host/fetch/bindings/service_worker.rs
@@ -36,13 +36,16 @@ pub(super) fn dispatch_service_worker_fetch(
let cancel_handle = FetchCancelHandle::new();
let network_context = AsyncSubresourceNetworkContext {
frame_id: prepared.frame_id.clone(),
+ request_origin: prepared.request_origin.clone(),
document_url: prepared.document_url.clone(),
resource_type: SubresourceResourceType::Fetch,
policy_context: prepared.policy_context,
};
let requires_preflight = prepared.request_mode == moli_fetch::RequestMode::Cors
&& crate::network_host::cors_preflight_request_headers(
- !moli_url::same_origin(&prepared.document_url, &prepared.resolved_url),
+ !prepared
+ .request_origin
+ .same_origin(&(&prepared.resolved_url).into()),
&prepared.resolved_url,
&prepared.method,
&prepared.cors_preflight_request_headers,
@@ -58,6 +61,7 @@ pub(super) fn dispatch_service_worker_fetch(
Some(cancel_handle.clone()),
prepared.credentials_mode,
prepared.request_mode,
+ prepared.request_origin.clone(),
prepared.network_partition_key.clone(),
prepared.policy_context,
PendingSubresourceFetchInfo {
@@ -98,7 +102,6 @@ pub(super) fn dispatch_service_worker_fetch(
let dispatch = ServiceWorkerFetchDispatch {
internal_id,
request,
- request_body_text: request_body_text.clone(),
cors_preflight_request_headers: prepared.cors_preflight_request_headers.clone(),
request_cookie_report,
network_context,
diff --git a/moli-renderer-v8/src/network_host/image.rs b/moli-renderer-v8/src/network_host/image.rs
index 90ae7b0a3..e1066690a 100644
--- a/moli-renderer-v8/src/network_host/image.rs
+++ b/moli-renderer-v8/src/network_host/image.rs
@@ -78,6 +78,7 @@ pub(crate) fn start_scanned_image_preload(
let request = match Request::new("GET", request_url.as_str(), None, request_headers) {
Ok(request) => request
.with_initiator_url(&document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&document_url))
.with_resource_type(RequestResourceType::Image)
.with_page_network_policy()
.with_request_mode(RequestMode::NoCors)
@@ -272,6 +273,7 @@ pub(crate) fn start_image_element_resource_fetch(
let request = Request::new("GET", request_url.as_str(), None, request_headers.clone())
.map_err(|error| error.to_string())?
.with_initiator_url(&document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&document_url))
.with_resource_type(RequestResourceType::Image)
.with_page_network_policy()
.with_request_mode(request_mode)
@@ -325,11 +327,11 @@ pub(crate) fn start_image_element_resource_fetch(
request.priority_hints.fetch_priority,
service_worker_fetch_request_metadata(&request),
),
- request_body_text: None,
cors_preflight_request_headers: Vec::new(),
request_cookie_report,
network_context: AsyncSubresourceNetworkContext {
frame_id,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url,
resource_type: SubresourceResourceType::Image,
policy_context,
@@ -390,6 +392,7 @@ pub(crate) fn start_image_element_resource_fetch(
internal_id,
AsyncSubresourceNetworkContext {
frame_id,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url,
resource_type: SubresourceResourceType::Image,
policy_context,
diff --git a/moli-renderer-v8/src/network_host/media.rs b/moli-renderer-v8/src/network_host/media.rs
index 5521fc5d9..8b577ec33 100644
--- a/moli-renderer-v8/src/network_host/media.rs
+++ b/moli-renderer-v8/src/network_host/media.rs
@@ -111,6 +111,7 @@ pub(crate) fn start_media_element_resource_fetch(
let request = Request::new("GET", request_url.as_str(), None, Vec::new())
.map_err(|error| error.to_string())?
.with_initiator_url(&document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&document_url))
.with_resource_type(RequestResourceType::Media)
.with_page_network_policy()
.with_request_mode(request_mode)
@@ -169,11 +170,11 @@ pub(crate) fn start_media_element_resource_fetch(
request.priority_hints.fetch_priority,
service_worker_fetch_request_metadata(&request),
),
- request_body_text: None,
cors_preflight_request_headers: Vec::new(),
request_cookie_report,
network_context: AsyncSubresourceNetworkContext {
frame_id,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url,
resource_type,
policy_context,
@@ -213,6 +214,7 @@ pub(crate) fn start_media_element_resource_fetch(
internal_id,
AsyncSubresourceNetworkContext {
frame_id,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url,
resource_type,
policy_context,
diff --git a/moli-renderer-v8/src/network_host/request_scope.rs b/moli-renderer-v8/src/network_host/request_scope.rs
index 65a5e07d7..bac1d0d69 100644
--- a/moli-renderer-v8/src/network_host/request_scope.rs
+++ b/moli-renderer-v8/src/network_host/request_scope.rs
@@ -13,6 +13,7 @@ pub(in crate::network_host) fn observe_subresource_request_cookie_report(
let request = Request::new(method, request_url.as_str(), None, Vec::new())
.ok()?
.with_initiator_url(document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(document_url))
.with_credentials_mode(credentials_mode);
if !request.allows_credentials_for_url(request_url) {
return None;
diff --git a/moli-renderer-v8/src/network_host/response/cors.rs b/moli-renderer-v8/src/network_host/response/cors.rs
index a7793dad9..a260ecb5b 100644
--- a/moli-renderer-v8/src/network_host/response/cors.rs
+++ b/moli-renderer-v8/src/network_host/response/cors.rs
@@ -2,7 +2,7 @@ use moli_fetch::validate_cors_response_for_origin;
use moli_cookie_jar::same_site_urls;
use moli_fetch::{RedirectSource, RequestCredentialsMode, RequestMode};
-use moli_url::{origin_ascii_serialization, same_origin};
+use moli_url::WebOrigin;
use moli_web_mime::{
response_header_value, response_header_values, should_opaque_response_be_blocked_by_orb,
should_opaque_response_be_blocked_by_orb_with_body,
@@ -44,17 +44,19 @@ pub(crate) fn is_cors_policy_failure_message(message: &str) -> bool {
/// Once CORS-tainted, a redirect across origins changes the request origin to
/// null, even when the final URL returns to the initiating document's origin.
pub(crate) fn validate_cors_response_chain(
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
head: &moli_fetch::ResponseHead,
credentials_mode: RequestCredentialsMode,
) -> Result<(), String> {
+ let request_origin = request_origin.into();
for (index, redirect) in head.redirect_chain.iter().enumerate() {
// This response precedes the redirect: only earlier hops contribute to
// the Origin that was sent for it.
let urls = moli_fetch::FetchUrlList::new(&redirect.from_url, &head.redirect_chain[..index]);
- if redirect.source == RedirectSource::Network && urls.has_cross_origin_url(document_url) {
+ if redirect.source == RedirectSource::Network && urls.has_cross_origin_url(&request_origin)
+ {
validate_cors_response_for_origin(
- &urls.serialized_origin(document_url),
+ &urls.serialized_origin(&request_origin),
&redirect.headers,
credentials_mode,
)?;
@@ -62,10 +64,10 @@ pub(crate) fn validate_cors_response_chain(
}
let urls = head.url_list();
if matches!(head.final_url.scheme(), "http" | "https")
- && urls.has_cross_origin_url(document_url)
+ && urls.has_cross_origin_url(&request_origin)
{
validate_cors_response_for_origin(
- &urls.serialized_origin(document_url),
+ &urls.serialized_origin(&request_origin),
&head.headers,
credentials_mode,
)?;
@@ -74,21 +76,22 @@ pub(crate) fn validate_cors_response_chain(
}
pub(crate) fn validate_fetch_response_security_policy(
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
head: &moli_fetch::ResponseHead,
request_mode: RequestMode,
credentials_mode: RequestCredentialsMode,
policy_context: crate::types::SubresourcePolicyContext,
) -> Result<(), String> {
+ let request_origin = request_origin.into();
head.url_list()
- .validate_request_mode(request_mode, document_url)?;
+ .validate_request_mode(request_mode, &request_origin)?;
if request_mode == RequestMode::SameOrigin {
return Ok(());
}
if request_mode == RequestMode::NoCors {
- validate_cross_origin_resource_policy(document_url, &head.final_url, &head.headers)?;
+ validate_cross_origin_resource_policy(&request_origin, &head.final_url, &head.headers)?;
validate_cross_origin_embedder_and_document_isolation_policy(
- document_url,
+ &request_origin,
&head.final_url,
&head.headers,
request_mode,
@@ -96,22 +99,23 @@ pub(crate) fn validate_fetch_response_security_policy(
policy_context.cross_origin_embedder_policy,
policy_context.document_isolation_policy,
)?;
- validate_opaque_response_blocking(document_url, &head.final_url, &head.headers)
+ validate_opaque_response_blocking(&request_origin, &head.final_url, &head.headers)
} else {
- validate_cors_response_chain(document_url, head, credentials_mode)
+ validate_cors_response_chain(&request_origin, head, credentials_mode)
}
}
pub(crate) fn validate_fetch_response_security_policy_with_body(
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
head: &moli_fetch::ResponseHead,
response_body: &[u8],
request_mode: RequestMode,
credentials_mode: RequestCredentialsMode,
policy_context: crate::types::SubresourcePolicyContext,
) -> Result<(), String> {
+ let request_origin = request_origin.into();
validate_fetch_response_security_policy_with_body_classified(
- document_url,
+ &request_origin,
head,
response_body,
request_mode,
@@ -122,24 +126,25 @@ pub(crate) fn validate_fetch_response_security_policy_with_body(
}
pub(crate) fn validate_fetch_response_security_policy_with_body_classified(
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
head: &moli_fetch::ResponseHead,
response_body: &[u8],
request_mode: RequestMode,
credentials_mode: RequestCredentialsMode,
policy_context: crate::types::SubresourcePolicyContext,
) -> Result<(), FetchResponseSecurityViolation> {
+ let request_origin = request_origin.into();
head.url_list()
- .validate_request_mode(request_mode, document_url)
+ .validate_request_mode(request_mode, &request_origin)
.map_err(FetchResponseSecurityViolation::Rejected)?;
if request_mode == RequestMode::SameOrigin {
return Ok(());
}
if request_mode == RequestMode::NoCors {
- validate_cross_origin_resource_policy(document_url, &head.final_url, &head.headers)
+ validate_cross_origin_resource_policy(&request_origin, &head.final_url, &head.headers)
.map_err(FetchResponseSecurityViolation::Rejected)?;
validate_cross_origin_embedder_and_document_isolation_policy(
- document_url,
+ &request_origin,
&head.final_url,
&head.headers,
request_mode,
@@ -149,25 +154,26 @@ pub(crate) fn validate_fetch_response_security_policy_with_body_classified(
)
.map_err(FetchResponseSecurityViolation::Rejected)?;
validate_opaque_response_blocking_with_body(
- document_url,
+ &request_origin,
&head.final_url,
&head.headers,
response_body,
)
.map_err(FetchResponseSecurityViolation::OpaqueResponseBlocked)
} else {
- validate_cors_response_chain(document_url, head, credentials_mode)
+ validate_cors_response_chain(&request_origin, head, credentials_mode)
.map_err(FetchResponseSecurityViolation::Rejected)
}
}
pub(crate) fn validate_opaque_response_blocking(
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
response_url: &url::Url,
response_headers: &[(String, String)],
) -> Result<(), String> {
+ let request_origin = request_origin.into();
if !matches!(response_url.scheme(), "http" | "https")
- || same_origin(document_url, response_url)
+ || request_origin.same_origin(&response_url.into())
|| !should_opaque_response_be_blocked_by_orb(response_headers)
{
return Ok(());
@@ -175,18 +181,19 @@ pub(crate) fn validate_opaque_response_blocking(
Err(format!(
"OpaqueResponseBlocking check failed: {} cannot load {response_url} as an opaque no-cors response",
- origin_ascii_serialization(document_url)
+ request_origin.ascii_serialization()
))
}
pub(crate) fn validate_opaque_response_blocking_with_body(
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
response_url: &url::Url,
response_headers: &[(String, String)],
response_body: &[u8],
) -> Result<(), String> {
+ let request_origin = request_origin.into();
if !matches!(response_url.scheme(), "http" | "https")
- || same_origin(document_url, response_url)
+ || request_origin.same_origin(&response_url.into())
|| !should_opaque_response_be_blocked_by_orb_with_body(response_headers, response_body)
{
return Ok(());
@@ -194,21 +201,22 @@ pub(crate) fn validate_opaque_response_blocking_with_body(
Err(format!(
"OpaqueResponseBlocking check failed: {} cannot load {response_url} as an opaque no-cors response",
- origin_ascii_serialization(document_url)
+ request_origin.ascii_serialization()
))
}
#[cfg(test)]
fn validate_cross_origin_embedder_policy(
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
response_url: &url::Url,
response_headers: &[(String, String)],
request_mode: RequestMode,
credentials_mode: RequestCredentialsMode,
embedder_policy: CrossOriginEmbedderPolicy,
) -> Result<(), String> {
+ let request_origin = request_origin.into();
validate_cross_origin_embedder_and_document_isolation_policy(
- document_url,
+ &request_origin,
response_url,
response_headers,
request_mode,
@@ -219,7 +227,7 @@ fn validate_cross_origin_embedder_policy(
}
pub(crate) fn validate_cross_origin_embedder_and_document_isolation_policy(
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
response_url: &url::Url,
response_headers: &[(String, String)],
request_mode: RequestMode,
@@ -227,15 +235,16 @@ pub(crate) fn validate_cross_origin_embedder_and_document_isolation_policy(
embedder_policy: CrossOriginEmbedderPolicy,
document_isolation_policy: DocumentIsolationPolicy,
) -> Result<(), String> {
+ let request_origin = request_origin.into();
if request_mode != RequestMode::NoCors
|| !matches!(response_url.scheme(), "http" | "https")
- || same_origin(document_url, response_url)
+ || request_origin.same_origin(&response_url.into())
{
return Ok(());
}
let request_includes_credentials =
- request_includes_credentials(document_url, response_url, credentials_mode);
+ request_includes_credentials(&request_origin, response_url, credentials_mode);
let requires_corp_due_to_coep = match embedder_policy {
CrossOriginEmbedderPolicy::None => false,
CrossOriginEmbedderPolicy::RequireCorp => true,
@@ -265,17 +274,17 @@ pub(crate) fn validate_cross_origin_embedder_and_document_isolation_policy(
else {
return Err(format!(
"{policy_label} check failed: requires Cross-Origin-Resource-Policy for {} to load {response_url}",
- origin_ascii_serialization(document_url)
+ request_origin.ascii_serialization()
));
};
let policy = policy.trim().to_ascii_lowercase();
match policy.as_str() {
"same-origin" | "same-site" | "cross-origin" => {
- validate_cross_origin_resource_policy(document_url, response_url, response_headers)
+ validate_cross_origin_resource_policy(&request_origin, response_url, response_headers)
}
_ => Err(format!(
"{policy_label} check failed: treats invalid Cross-Origin-Resource-Policy `{policy}` as same-origin for {} to load {response_url}",
- origin_ascii_serialization(document_url)
+ request_origin.ascii_serialization()
)),
}
}
@@ -304,22 +313,24 @@ fn defaulted_corp_policy_label(
}
fn request_includes_credentials(
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
response_url: &url::Url,
credentials_mode: RequestCredentialsMode,
) -> bool {
+ let request_origin = request_origin.into();
match credentials_mode {
RequestCredentialsMode::Include => true,
RequestCredentialsMode::Omit => false,
- RequestCredentialsMode::SameOrigin => same_origin(document_url, response_url),
+ RequestCredentialsMode::SameOrigin => request_origin.same_origin(&response_url.into()),
}
}
pub(crate) fn validate_cross_origin_resource_policy(
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
response_url: &url::Url,
response_headers: &[(String, String)],
) -> Result<(), String> {
+ let request_origin = request_origin.into();
if !matches!(response_url.scheme(), "http" | "https") {
return Ok(());
}
@@ -329,8 +340,9 @@ pub(crate) fn validate_cross_origin_resource_policy(
};
let policy = policy.trim().to_ascii_lowercase();
let allowed = match policy.as_str() {
- "same-origin" => same_origin(document_url, response_url),
- "same-site" => same_site_urls(document_url, response_url, true),
+ "same-origin" => request_origin.same_origin(&response_url.into()),
+ "same-site" => url::Url::parse(request_origin.ascii_serialization())
+ .is_ok_and(|origin| same_site_urls(&origin, response_url, true)),
"cross-origin" => true,
_ => true,
};
@@ -339,7 +351,7 @@ pub(crate) fn validate_cross_origin_resource_policy(
}
Err(format!(
"Cross-Origin-Resource-Policy check failed: `{policy}` does not allow {} to load {response_url}",
- origin_ascii_serialization(document_url)
+ request_origin.ascii_serialization()
))
}
@@ -437,12 +449,13 @@ pub(crate) fn validate_cors_preflight_response(
}
pub(crate) fn filter_cors_exposed_response_headers(
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
head: &moli_fetch::ResponseHead,
credentials_mode: RequestCredentialsMode,
) -> Vec<(String, String)> {
+ let request_origin = request_origin.into();
let response_headers = &head.headers;
- if !head.url_list().has_cross_origin_url(document_url) {
+ if !head.url_list().has_cross_origin_url(&request_origin) {
return response_headers.to_vec();
}
if !matches!(head.final_url.scheme(), "http" | "https") {
@@ -509,6 +522,7 @@ fn parsed_header_name(name: &str) -> Option<http::HeaderName> {
#[cfg(test)]
mod tests {
use super::*;
+ use moli_url::origin_ascii_serialization;
fn url(value: &str) -> url::Url {
url::Url::parse(value).expect("valid URL")
diff --git a/moli-renderer-v8/src/network_host/response/materialize.rs b/moli-renderer-v8/src/network_host/response/materialize.rs
index db83b61e9..2f504ca91 100644
--- a/moli-renderer-v8/src/network_host/response/materialize.rs
+++ b/moli-renderer-v8/src/network_host/response/materialize.rs
@@ -7,6 +7,7 @@ use super::*;
use crate::types::NetworkBodySourceId;
use crate::web_api_interfaces;
use moli_fetch::RequestMode;
+use moli_url::WebOrigin;
use moli_webapi_declare::WebApiObject;
fn is_redirect_status(status: u16) -> bool {
@@ -75,11 +76,12 @@ struct FetchResponseBodyDeclaration<'scope> {
}
fn response_filter(
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
head: &moli_fetch::ResponseHead,
request_mode: RequestMode,
) -> FetchResponseFilter {
- network_response_filter(document_url, head, request_mode)
+ let request_origin = request_origin.into();
+ network_response_filter(&request_origin, head, request_mode)
.map_or(FetchResponseFilter::None, Into::into)
}
@@ -88,16 +90,17 @@ fn response_filter(
/// Service worker responses must retain their own filter instead: their URL
/// does not determine whether the worker returned a readable response.
pub(crate) fn network_response_filter(
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
head: &moli_fetch::ResponseHead,
request_mode: RequestMode,
) -> Option<crate::types::AsyncSubresourceFetchResponseFilter> {
+ let request_origin = request_origin.into();
use crate::types::AsyncSubresourceFetchResponseFilter;
if is_redirect_status(head.status) {
Some(AsyncSubresourceFetchResponseFilter::OpaqueRedirect)
} else if request_mode == RequestMode::NoCors
- && head.url_list().has_cross_origin_url(document_url)
+ && head.url_list().has_cross_origin_url(&request_origin)
{
Some(AsyncSubresourceFetchResponseFilter::Opaque)
} else {
@@ -106,17 +109,20 @@ pub(crate) fn network_response_filter(
}
fn compute_fetch_response_type(
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
head: &moli_fetch::ResponseHead,
filter: FetchResponseFilter,
) -> &'static str {
+ let request_origin = request_origin.into();
// Returning to the initiating origin does not undo response tainting.
match filter {
FetchResponseFilter::Basic => "basic",
FetchResponseFilter::Cors => "cors",
FetchResponseFilter::Opaque => "opaque",
FetchResponseFilter::OpaqueRedirect => "opaqueredirect",
- FetchResponseFilter::None if head.url_list().has_cross_origin_url(document_url) => "cors",
+ FetchResponseFilter::None if head.url_list().has_cross_origin_url(&request_origin) => {
+ "cors"
+ }
FetchResponseFilter::None => "basic",
}
}
@@ -159,14 +165,15 @@ fn filtered_response_status_text(
pub(crate) fn build_fetch_response_object_for_request_mode<'s>(
scope: &mut v8::PinScope<'s, '_>,
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
request_mode: RequestMode,
response: Response,
) -> v8::Local<'s, v8::Object> {
+ let request_origin = request_origin.into();
let (head, body) = response.into_body();
build_fetch_response_object_from_body_source_for_request_mode(
scope,
- document_url,
+ &request_origin,
request_mode,
head,
body,
@@ -175,14 +182,15 @@ 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, '_>,
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
request_mode: RequestMode,
head: moli_fetch::ResponseHead,
body: moli_fetch::ResponseBody,
) -> v8::Local<'s, v8::Object> {
+ let request_origin = request_origin.into();
build_fetch_response_object_from_body_source_for_request_mode_with_filter(
scope,
- document_url,
+ &request_origin,
request_mode,
head,
body,
@@ -192,16 +200,17 @@ 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, '_>,
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
request_mode: RequestMode,
head: moli_fetch::ResponseHead,
body: moli_fetch::ResponseBody,
filter_override: Option<crate::types::AsyncSubresourceFetchResponseFilter>,
) -> v8::Local<'s, v8::Object> {
+ let request_origin = request_origin.into();
let filter = filter_override
.map(FetchResponseFilter::from)
- .unwrap_or_else(|| response_filter(document_url, &head, request_mode));
- let obj = build_fetch_response_object_head(scope, document_url, &head, filter, None);
+ .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) {
network_body_stream_from_response_body(scope, obj, body)
} else {
@@ -213,13 +222,14 @@ 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, '_>,
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
request_mode: RequestMode,
head: moli_fetch::ResponseHead,
body: crate::protocol_types::SubresourceResponseBody,
) -> v8::Local<'s, v8::Object> {
- let filter = response_filter(document_url, &head, request_mode);
- let obj = build_fetch_response_object_head(scope, document_url, &head, filter, None);
+ let request_origin = request_origin.into();
+ 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) {
Some(network_body_stream_from_subresource_body(scope, obj, body))
} else {
@@ -231,14 +241,15 @@ 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, '_>,
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
request_mode: RequestMode,
head: moli_fetch::ResponseHead,
body_source_id: NetworkBodySourceId,
) -> v8::Local<'s, v8::Object> {
+ let request_origin = request_origin.into();
build_fetch_response_object_from_stream_for_request_mode_with_filter(
scope,
- document_url,
+ &request_origin,
request_mode,
head,
body_source_id,
@@ -248,15 +259,16 @@ 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, '_>,
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
request_mode: RequestMode,
head: moli_fetch::ResponseHead,
body_source_id: NetworkBodySourceId,
filter_override: Option<crate::types::AsyncSubresourceFetchResponseFilter>,
) -> v8::Local<'s, v8::Object> {
+ let request_origin = request_origin.into();
build_fetch_response_object_from_stream_for_request_mode_with_surface_url(
scope,
- document_url,
+ &request_origin,
request_mode,
head,
body_source_id,
@@ -285,21 +297,27 @@ 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, '_>,
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
request_mode: RequestMode,
head: moli_fetch::ResponseHead,
body_source_id: NetworkBodySourceId,
filtered_surface_url: Option<&str>,
filter_override: Option<crate::types::AsyncSubresourceFetchResponseFilter>,
) -> v8::Local<'s, v8::Object> {
+ let request_origin = request_origin.into();
let filter = filter_override
.map(FetchResponseFilter::from)
- .unwrap_or_else(|| response_filter(document_url, &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();
- let obj =
- build_fetch_response_object_head(scope, document_url, &head, filter, filtered_surface_url);
+ let obj = build_fetch_response_object_head(
+ scope,
+ &request_origin,
+ &head,
+ filter,
+ filtered_surface_url,
+ );
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);
@@ -310,13 +328,14 @@ fn build_fetch_response_object_from_stream_for_request_mode_with_surface_url<'s>
fn build_fetch_response_object_head<'s>(
scope: &mut v8::PinScope<'s, '_>,
- document_url: &url::Url,
+ request_origin: impl Into<WebOrigin>,
head: &moli_fetch::ResponseHead,
filter: FetchResponseFilter,
filtered_surface_url: Option<&str>,
) -> v8::Local<'s, v8::Object> {
+ let request_origin = request_origin.into();
let status = filtered_response_status(head, filter);
- let response_type = compute_fetch_response_type(document_url, head, filter);
+ let response_type = compute_fetch_response_type(&request_origin, head, filter);
let obj = FetchResponseHeadDeclaration::new(
status as f64,
(200..300).contains(&status),
diff --git a/moli-renderer-v8/src/network_host/stylesheet_subresource.rs b/moli-renderer-v8/src/network_host/stylesheet_subresource.rs
index 7dde5fb59..188ed24e1 100644
--- a/moli-renderer-v8/src/network_host/stylesheet_subresource.rs
+++ b/moli-renderer-v8/src/network_host/stylesheet_subresource.rs
@@ -164,6 +164,7 @@ pub(crate) fn start_stylesheet_subresource_fetch(
let request = Request::new("GET", request_url.as_str(), None, Vec::new())
.map_err(|error| error.to_string())?
.with_initiator_url(&document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&document_url))
.with_resource_type(request_resource_type)
.with_page_network_policy()
.with_request_mode(request_mode)
@@ -223,11 +224,11 @@ pub(crate) fn start_stylesheet_subresource_fetch(
request.priority_hints.fetch_priority,
service_worker_fetch_request_metadata(&request),
),
- request_body_text: None,
cors_preflight_request_headers: Vec::new(),
request_cookie_report,
network_context: AsyncSubresourceNetworkContext {
frame_id,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url,
resource_type,
policy_context,
@@ -267,6 +268,7 @@ pub(crate) fn start_stylesheet_subresource_fetch(
internal_id,
AsyncSubresourceNetworkContext {
frame_id,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url,
resource_type,
policy_context,
diff --git a/moli-renderer-v8/src/network_host/text_track.rs b/moli-renderer-v8/src/network_host/text_track.rs
index 4da7de5c1..74071931c 100644
--- a/moli-renderer-v8/src/network_host/text_track.rs
+++ b/moli-renderer-v8/src/network_host/text_track.rs
@@ -122,6 +122,7 @@ pub(crate) fn start_text_track_resource_fetch(
let request = Request::new("GET", request_url.as_str(), None, Vec::new())
.map_err(|error| error.to_string())?
.with_initiator_url(&document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&document_url))
.with_resource_type(RequestResourceType::TextTrack)
.with_page_network_policy()
.with_request_mode(request_mode)
@@ -180,11 +181,11 @@ pub(crate) fn start_text_track_resource_fetch(
request.priority_hints.fetch_priority,
service_worker_fetch_request_metadata(&request),
),
- request_body_text: None,
cors_preflight_request_headers: Vec::new(),
request_cookie_report,
network_context: AsyncSubresourceNetworkContext {
frame_id,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url,
resource_type: SubresourceResourceType::TextTrack,
policy_context,
@@ -224,6 +225,7 @@ pub(crate) fn start_text_track_resource_fetch(
internal_id,
AsyncSubresourceNetworkContext {
frame_id,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url,
resource_type: SubresourceResourceType::TextTrack,
policy_context,
diff --git a/moli-renderer-v8/src/network_host/xhr/send.rs b/moli-renderer-v8/src/network_host/xhr/send.rs
index 9fbc73818..313c14473 100644
--- a/moli-renderer-v8/src/network_host/xhr/send.rs
+++ b/moli-renderer-v8/src/network_host/xhr/send.rs
@@ -286,6 +286,7 @@ fn send_synchronous_network_xhr(
)
.expect("xhr request url was already resolved")
.with_initiator_url(&prepared.document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&prepared.document_url))
.with_credentials_mode(prepared.credentials_mode)
.with_network_partition_key(prepared.network_partition_key.clone())
.with_browser_request_metadata(BrowserRequestMetadata::Xhr);
diff --git a/moli-renderer-v8/src/network_host/xhr/send/paths.rs b/moli-renderer-v8/src/network_host/xhr/send/paths.rs
index 5f20849b9..dd1368260 100644
--- a/moli-renderer-v8/src/network_host/xhr/send/paths.rs
+++ b/moli-renderer-v8/src/network_host/xhr/send/paths.rs
@@ -71,6 +71,7 @@ pub(super) fn dispatch_service_worker_xhr(
let cancel_handle = FetchCancelHandle::new();
let network_context = AsyncSubresourceNetworkContext {
frame_id: prepared.frame_id.clone(),
+ request_origin: moli_url::WebOrigin::from_url(&prepared.document_url),
document_url: prepared.document_url.clone(),
resource_type: SubresourceResourceType::Xhr,
policy_context: prepared.policy_context,
@@ -114,7 +115,6 @@ pub(super) fn dispatch_service_worker_xhr(
let dispatch = ServiceWorkerFetchDispatch {
internal_id,
request,
- request_body_text: request_body_text.clone(),
cors_preflight_request_headers: prepared.cors_preflight_request_headers.clone(),
request_cookie_report,
network_context,
@@ -303,6 +303,7 @@ pub(super) fn spawn_network_xhr_fetch(
)
.expect("xhr request url was already resolved")
.with_initiator_url(&prepared.document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&prepared.document_url))
.with_credentials_mode(prepared.credentials_mode)
.with_network_partition_key(prepared.network_partition_key.clone())
.with_browser_request_metadata(BrowserRequestMetadata::Xhr)
@@ -317,6 +318,7 @@ pub(super) fn spawn_network_xhr_fetch(
);
let network_context = AsyncSubresourceNetworkContext {
frame_id: prepared.frame_id.clone(),
+ request_origin: moli_url::WebOrigin::from_url(&prepared.document_url),
document_url: prepared.document_url.clone(),
resource_type: SubresourceResourceType::Xhr,
policy_context: prepared.policy_context,
diff --git a/moli-renderer-v8/src/planning.rs b/moli-renderer-v8/src/planning.rs
index 5007eec97..91dd519ff 100644
--- a/moli-renderer-v8/src/planning.rs
+++ b/moli-renderer-v8/src/planning.rs
@@ -345,6 +345,7 @@ pub(crate) fn external_script_request(
.expect("prepared script url should already be parsed")
.with_page_network_policy()
.with_initiator_url(&script.initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&script.initiator_url))
.with_browser_request_metadata(moli_fetch::BrowserRequestMetadata::Script)
.with_credentials_mode(external_script_credentials_mode(
script.kind,
diff --git a/moli-renderer-v8/src/runtime/browser_context_runtime.rs b/moli-renderer-v8/src/runtime/browser_context_runtime.rs
index bc7c267c7..7a9b52efa 100644
--- a/moli-renderer-v8/src/runtime/browser_context_runtime.rs
+++ b/moli-renderer-v8/src/runtime/browser_context_runtime.rs
@@ -1160,7 +1160,8 @@ mod tests {
let submit_error = stale_client
.fetch_raw_stream_with_cancel(
Request::get("http://127.0.0.1:9/post-shutdown")
- .expect("test request should build"),
+ .expect("test request should build")
+ .with_request_origin(moli_url::WebOrigin::Opaque),
FetchCancelHandle::new(),
)
.await
diff --git a/moli-renderer-v8/src/runtime/browser_context_runtime/service_workers.rs b/moli-renderer-v8/src/runtime/browser_context_runtime/service_workers.rs
index 68856a0b4..ef8a53b47 100644
--- a/moli-renderer-v8/src/runtime/browser_context_runtime/service_workers.rs
+++ b/moli-renderer-v8/src/runtime/browser_context_runtime/service_workers.rs
@@ -195,10 +195,6 @@ impl RendererBrowserContextRuntime {
}
let (direct_completion_tx, main_resource_completion_rx) = tokio::sync::oneshot::channel();
- let request_body_text = request
- .body
- .as_ref()
- .map(|body| String::from_utf8_lossy(body).into_owned());
let redirect_mode =
main_resource_fetch_event_redirect_mode(destination, request.redirect_mode);
let dispatch = ServiceWorkerFetchDispatch {
@@ -219,11 +215,11 @@ impl RendererBrowserContextRuntime {
== BrowserNavigationRequestKind::Reload,
metadata: service_worker_fetch_request_metadata(request),
},
- request_body_text,
cors_preflight_request_headers: Vec::new(),
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: request.browser_origin()?.clone(),
document_url: request.url.clone(),
resource_type: SubresourceResourceType::Fetch,
policy_context: Default::default(),
@@ -272,10 +268,6 @@ impl RendererBrowserContextRuntime {
let completion_tx =
crate::page_task_queue::RendererResourceCompletionSender::direct_completion_only();
let (direct_completion_tx, direct_completion_rx) = tokio::sync::oneshot::channel();
- let request_body_text = request
- .body
- .as_ref()
- .map(|body| String::from_utf8_lossy(body).into_owned());
let dispatch = ServiceWorkerFetchDispatch {
internal_id: 0,
request: ServiceWorkerFetchRequest {
@@ -293,11 +285,11 @@ impl RendererBrowserContextRuntime {
is_reload: false,
metadata: service_worker_fetch_request_metadata(request),
},
- request_body_text,
cors_preflight_request_headers: Vec::new(),
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: request.browser_origin()?.clone(),
document_url,
resource_type,
policy_context: Default::default(),
diff --git a/moli-renderer-v8/src/runtime/page_vm/followed_navigation.rs b/moli-renderer-v8/src/runtime/page_vm/followed_navigation.rs
index 7b4cc9a86..b747534b1 100644
--- a/moli-renderer-v8/src/runtime/page_vm/followed_navigation.rs
+++ b/moli-renderer-v8/src/runtime/page_vm/followed_navigation.rs
@@ -469,6 +469,7 @@ fn build_followed_location_navigation_request(
.with_top_level_navigation_cookie_context()
.with_browser_navigation_kind(browser_navigation_kind)
.with_initiator_url(initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(initiator_url))
})
}
diff --git a/moli-renderer-v8/src/script_vm/app_manifest.rs b/moli-renderer-v8/src/script_vm/app_manifest.rs
index bc3f90232..5f501ea41 100644
--- a/moli-renderer-v8/src/script_vm/app_manifest.rs
+++ b/moli-renderer-v8/src/script_vm/app_manifest.rs
@@ -74,6 +74,7 @@ impl ScriptVm {
let request = Request::new("GET", manifest_url.as_str(), None, request_headers.clone())
.expect("a resolved app manifest URL should remain valid")
.with_initiator_url(&document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&document_url))
.with_request_mode(RequestMode::Cors)
.with_credentials_mode(credentials_mode)
.with_redirect_mode(RequestRedirectMode::Follow)
diff --git a/moli-renderer-v8/src/script_vm/devtools_resource_load.rs b/moli-renderer-v8/src/script_vm/devtools_resource_load.rs
index e975c27bb..1542a474b 100644
--- a/moli-renderer-v8/src/script_vm/devtools_resource_load.rs
+++ b/moli-renderer-v8/src/script_vm/devtools_resource_load.rs
@@ -69,6 +69,7 @@ impl ScriptVm {
let request = Request::new("GET", url.as_str(), None, Vec::new())
.expect("a parsed DevTools resource URL should remain valid")
.with_initiator_url(&document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&document_url))
.without_inferred_referrer()
.with_request_mode(RequestMode::NoCors)
.with_credentials_mode(credentials_mode)
diff --git a/moli-renderer-v8/src/script_vm/subresource_fetch.rs b/moli-renderer-v8/src/script_vm/subresource_fetch.rs
index c99536657..3fccca89e 100644
--- a/moli-renderer-v8/src/script_vm/subresource_fetch.rs
+++ b/moli-renderer-v8/src/script_vm/subresource_fetch.rs
@@ -1112,6 +1112,7 @@ impl ScriptVm {
.take_pending_subresource_fetch(internal_id)
.ok_or_else(|| anyhow!("unknown pending subresource fetch `{internal_id}`"))?;
let PendingSubresourceFetchState {
+ request_origin,
info,
load,
execution_context,
@@ -1174,6 +1175,7 @@ impl ScriptVm {
.record_in_flight_worker_subresource_fetch(
crate::types::InFlightWorkerSubresourceFetchState {
pending: PendingSubresourceFetchState {
+ request_origin,
info,
load,
execution_context,
@@ -1228,6 +1230,7 @@ impl ScriptVm {
.record_in_flight_worker_subresource_fetch(
crate::types::InFlightWorkerSubresourceFetchState {
pending: PendingSubresourceFetchState {
+ request_origin,
info,
load,
execution_context,
@@ -1291,6 +1294,7 @@ impl ScriptVm {
let request_body = body.unwrap_or_else(|| info.request_body.clone());
let request_headers = headers.unwrap_or_else(|| info.request_headers.clone());
let pending = PendingSubresourceFetchState {
+ request_origin,
info,
load,
execution_context,
@@ -1337,6 +1341,7 @@ impl ScriptVm {
);
}
continuation => PendingSubresourceFetchState {
+ request_origin,
info,
load,
execution_context,
@@ -1407,6 +1412,7 @@ impl ScriptVm {
request_headers.clone(),
)?
.with_initiator_url(&pending.info.document_url)
+ .with_request_origin(pending.request_origin.clone())
.with_request_mode(pending.request_mode)
.with_credentials_mode(pending.credentials_mode)
.with_network_partition_key(pending.network_partition_key.clone())
@@ -1497,6 +1503,7 @@ impl ScriptVm {
request_headers.clone(),
)?
.with_initiator_url(&pending.info.document_url)
+ .with_request_origin(pending.request_origin.clone())
.with_resource_type(moli_fetch::RequestResourceType::CspReport)
.with_request_mode(pending.request_mode)
.with_credentials_mode(pending.credentials_mode)
@@ -1530,11 +1537,11 @@ impl ScriptVm {
request.priority_hints.fetch_priority,
crate::service_worker_runtime::service_worker_fetch_request_metadata(&request),
),
- request_body_text: request_body.clone(),
cors_preflight_request_headers: Vec::new(),
request_cookie_report,
network_context: crate::types::AsyncSubresourceNetworkContext {
frame_id,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url,
resource_type: SubresourceResourceType::CspReport,
policy_context,
@@ -1675,6 +1682,9 @@ impl ScriptVm {
original_request_headers.clone(),
)?
.with_initiator_url(&pending_fetch.info.document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(
+ &pending_fetch.info.document_url,
+ ))
.with_request_mode(pending_fetch.request_mode)
.with_credentials_mode(pending_fetch.credentials_mode)
.with_auth(auth.into())
@@ -1921,6 +1931,7 @@ impl ScriptVm {
.take_pending_subresource_fetch(internal_id)
.ok_or_else(|| anyhow!("unknown pending subresource fetch `{internal_id}`"))?;
let PendingSubresourceFetchState {
+ request_origin,
info,
load,
execution_context,
@@ -2072,6 +2083,7 @@ impl ScriptVm {
return Ok(AsyncSubresourceCommandExecution::without_window_realm(()));
}
continuation => PendingSubresourceFetchState {
+ request_origin,
info,
load,
execution_context,
@@ -2112,6 +2124,7 @@ impl ScriptVm {
.take_pending_subresource_fetch(internal_id)
.ok_or_else(|| anyhow!("unknown pending subresource fetch `{internal_id}`"))?;
let PendingSubresourceFetchState {
+ request_origin,
info,
load,
execution_context,
@@ -2435,6 +2448,7 @@ impl ScriptVm {
return Ok(AsyncSubresourceCommandExecution::without_window_realm(()));
}
continuation => PendingSubresourceFetchState {
+ request_origin,
info,
load,
execution_context,
@@ -3130,7 +3144,7 @@ impl ScriptVm {
}
if !skip_fetch_security_validation {
crate::network_host::validate_fetch_response_security_policy_with_body(
- &pending.info.document_url,
+ &pending.request_origin,
&response.head(),
response.body_bytes(),
pending.request_mode,
@@ -3302,7 +3316,7 @@ impl ScriptVm {
(!skip_fetch_security_validation)
.then(|| {
crate::network_host::validate_fetch_response_security_policy_with_body(
- &pending.info.document_url,
+ &pending.request_origin,
&response.head(),
response.body_bytes(),
pending.request_mode,
@@ -3585,7 +3599,7 @@ impl ScriptVm {
| SubresourceResourceType::Xhr
) {
let validation = crate::network_host::validate_fetch_response_security_policy_with_body_classified(
- &pending.info.document_url,
+ &pending.request_origin,
&response.head(),
response.body_bytes(),
pending.request_mode,
@@ -3682,7 +3696,7 @@ impl ScriptVm {
) && !response_filter.is_some_and(|filter| filter.is_readable()) {
observable_response.headers =
crate::network_host::filter_cors_exposed_response_headers(
- &pending.info.document_url,
+ &pending.request_origin,
&observable_response.head(),
pending.credentials_mode,
);
@@ -3707,7 +3721,7 @@ impl ScriptVm {
let response_obj =
crate::network_host::build_fetch_response_object_from_body_source_for_request_mode_with_filter(
scope,
- &pending.info.document_url,
+ &pending.request_origin,
pending.request_mode,
head,
body,
@@ -4373,7 +4387,7 @@ impl ScriptVm {
return None;
}
crate::network_host::validate_fetch_response_security_policy(
- &pending.info.document_url,
+ &pending.request_origin,
&started.head,
pending.request_mode,
pending.credentials_mode,
@@ -4577,7 +4591,7 @@ impl ScriptVm {
)
.then(|| {
crate::network_host::validate_fetch_response_security_policy(
- &pending.info.document_url,
+ &pending.request_origin,
&started.head,
pending.request_mode,
pending.credentials_mode,
@@ -4768,7 +4782,7 @@ impl ScriptVm {
SubresourceResourceType::Fetch | SubresourceResourceType::Xhr
) && !started.response_filter.is_some_and(|filter| filter.is_readable()) {
observable_head.headers = crate::network_host::filter_cors_exposed_response_headers(
- &pending.info.document_url,
+ &pending.request_origin,
&observable_head,
pending.credentials_mode,
);
@@ -4858,7 +4872,7 @@ impl ScriptVm {
let resolver = v8::Local::new(scope, resolver);
let response_obj = crate::network_host::build_fetch_response_object_from_stream_for_request_mode_with_filter(
scope,
- &pending.info.document_url,
+ &pending.request_origin,
pending.request_mode,
observable_head,
started.body_source_id,
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 dca9d7370..b7f18404a 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
@@ -1949,6 +1949,7 @@ async fn streaming_subresource_finish_preserves_response_head_cache_state() {
.record_streaming_subresource_fetch(super::StreamingSubresourceFetchState {
response_filter: None,
pending: super::PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
info: crate::types::PendingSubresourceFetchInfo {
internal_id,
network_request_handle: None,
@@ -2097,6 +2098,7 @@ async fn async_subresource_failure_network_error_override_preserves_fetch_reject
context_host.borrow_mut().restore_pending_subresource_fetch(
super::PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
info: crate::types::PendingSubresourceFetchInfo {
internal_id,
network_request_handle: None,
@@ -2231,6 +2233,10 @@ async fn streaming_fetch_body_error_records_response_started_then_body_failed()
.record_streaming_subresource_fetch(super::StreamingSubresourceFetchState {
response_filter: None,
pending: super::PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(
+ &(Url::parse("https://streaming-fetch-body-error.test/")
+ .expect("document URL should parse")),
+ ),
info: crate::types::PendingSubresourceFetchInfo {
internal_id,
network_request_handle: Some(request_handle),
@@ -2387,6 +2393,7 @@ fn install_streaming_fetch_response_fixture(
.record_streaming_subresource_fetch(super::StreamingSubresourceFetchState {
response_filter: None,
pending: super::PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
info: crate::types::PendingSubresourceFetchInfo {
internal_id,
network_request_handle,
@@ -2488,6 +2495,10 @@ async fn streaming_fetch_body_cancel_aborts_streaming_subresource() {
.record_streaming_subresource_fetch(super::StreamingSubresourceFetchState {
response_filter: None,
pending: super::PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(
+ &(Url::parse("https://streaming-fetch-body-cancel.test/")
+ .expect("document URL should parse")),
+ ),
info: crate::types::PendingSubresourceFetchInfo {
internal_id,
network_request_handle: None,
@@ -3112,6 +3123,10 @@ async fn streaming_xhr_materialization_failure_errors_body_source_before_close()
.record_streaming_subresource_fetch(super::StreamingSubresourceFetchState {
response_filter: None,
pending: super::PendingSubresourceFetchState {
+ request_origin: moli_url::WebOrigin::from_url(
+ &(Url::parse("https://xhr-streaming-materialize-error.test/")
+ .expect("document URL should parse")),
+ ),
info: crate::types::PendingSubresourceFetchInfo {
internal_id,
network_request_handle: None,
diff --git a/moli-renderer-v8/src/script_vm/tests/mod.rs b/moli-renderer-v8/src/script_vm/tests/mod.rs
index 09059bc4b..d7928064e 100644
--- a/moli-renderer-v8/src/script_vm/tests/mod.rs
+++ b/moli-renderer-v8/src/script_vm/tests/mod.rs
@@ -308,6 +308,7 @@ fn register_pending_window_fetch_for_test(
Some(cancel_handle.clone()),
moli_fetch::RequestCredentialsMode::SameOrigin,
moli_fetch::RequestMode::Cors,
+ (&url).into(),
None,
Default::default(),
crate::types::PendingSubresourceFetchInfo {
@@ -469,6 +470,7 @@ fn register_pending_window_fetch_with_connect_policy_for_test(
Some(cancel_handle.clone()),
moli_fetch::RequestCredentialsMode::SameOrigin,
moli_fetch::RequestMode::Cors,
+ (&document_url).into(),
None,
Default::default(),
crate::types::PendingSubresourceFetchInfo {
diff --git a/moli-renderer-v8/src/service_worker_runtime/events.rs b/moli-renderer-v8/src/service_worker_runtime/events.rs
index f4b7fb556..30480cb1f 100644
--- a/moli-renderer-v8/src/service_worker_runtime/events.rs
+++ b/moli-renderer-v8/src/service_worker_runtime/events.rs
@@ -720,7 +720,6 @@ pub(crate) struct ServiceWorkerFetchCompletion {
pub(crate) struct ServiceWorkerFetchDispatch {
pub(crate) internal_id: u64,
pub(crate) request: ServiceWorkerFetchRequest,
- pub(crate) request_body_text: Option<String>,
pub(crate) cors_preflight_request_headers: Vec<(String, String)>,
pub(crate) request_cookie_report: Option<moli_cookie_jar::StoredCookieQueryReport>,
pub(crate) network_context: AsyncSubresourceNetworkContext,
diff --git a/moli-renderer-v8/src/service_worker_runtime/script_loading.rs b/moli-renderer-v8/src/service_worker_runtime/script_loading.rs
index 6f024d5a4..321761c5b 100644
--- a/moli-renderer-v8/src/service_worker_runtime/script_loading.rs
+++ b/moli-renderer-v8/src/service_worker_runtime/script_loading.rs
@@ -197,6 +197,7 @@ pub(super) fn load_service_worker_script_source_for_params(
.with_cache_mode(params.cache_mode)
.with_page_network_policy()
.with_initiator_url(&params.document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&params.document_url))
.with_script_fetch_metadata(ScriptFetchRequestMetadata {
..ScriptFetchRequestMetadata::default()
});
@@ -329,6 +330,7 @@ fn load_imported_script_resource_for_update_check(
.with_cache_mode(cache_mode)
.with_page_network_policy()
.with_initiator_url(initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(initiator_url))
.with_script_fetch_metadata(ScriptFetchRequestMetadata {
..ScriptFetchRequestMetadata::default()
});
diff --git a/moli-renderer-v8/src/service_worker_runtime/service.rs b/moli-renderer-v8/src/service_worker_runtime/service.rs
index d94a866da..0200c5162 100644
--- a/moli-renderer-v8/src/service_worker_runtime/service.rs
+++ b/moli-renderer-v8/src/service_worker_runtime/service.rs
@@ -326,6 +326,11 @@ impl std::fmt::Debug for ServiceWorkerRuntimeService {
}
}
+fn request_body_text(body: &Option<Vec<u8>>) -> Option<String> {
+ body.as_ref()
+ .map(|body| String::from_utf8_lossy(body).into_owned())
+}
+
impl ServiceWorkerRuntimeService {
pub(super) fn downgrade(&self) -> WeakServiceWorkerRuntimeService {
WeakServiceWorkerRuntimeService {
@@ -923,28 +928,28 @@ mod tests {
cancel_handle: moli_fetch::FetchCancelHandle,
) -> ServiceWorkerFetchJob {
ServiceWorkerFetchJob {
+ request: {
+ let origin = moli_url::WebOrigin::from_url(&document_url);
+ let initiator = (document_url).clone();
+ moli_fetch::Request::new_browser("GET", request_url, None, Vec::new(), origin)
+ .with_initiator_url(&initiator)
+ .with_request_mode(moli_fetch::RequestMode::Cors)
+ .with_credentials_mode(moli_fetch::RequestCredentialsMode::SameOrigin)
+ .with_redirect_mode(moli_fetch::RequestRedirectMode::Follow)
+ .with_fetch_priority_hint(None)
+ },
internal_id,
owner: Some(test_run_owner(version_id, run)),
- request_url,
- request_method: "GET".to_owned(),
- request_headers: Vec::new(),
- request_body: None,
- request_body_bytes: None,
cors_preflight_request_headers: Vec::new(),
client_id,
resulting_client_id: None,
destination: ServiceWorkerRequestDestination::Empty,
is_reload: false,
metadata: Default::default(),
- request_mode: moli_fetch::RequestMode::Cors,
- credentials_mode: moli_fetch::RequestCredentialsMode::SameOrigin,
- redirect_mode: moli_fetch::RequestRedirectMode::Follow,
- priority: None,
- redirect_chain: Vec::new(),
- redirect_count: 0,
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url,
resource_type: crate::types::SubresourceResourceType::Fetch,
policy_context: Default::default(),
@@ -4249,28 +4254,34 @@ mod tests {
state.pending_fetch_jobs.insert(
event_id,
ServiceWorkerFetchJob {
+ request: {
+ let origin = moli_url::WebOrigin::from_url(&request_url);
+ let initiator = request_url.clone();
+ moli_fetch::Request::new_browser(
+ "GET",
+ request_url.clone(),
+ None,
+ Vec::new(),
+ origin,
+ )
+ .with_initiator_url(&initiator)
+ .with_request_mode(moli_fetch::RequestMode::Cors)
+ .with_credentials_mode(moli_fetch::RequestCredentialsMode::SameOrigin)
+ .with_redirect_mode(moli_fetch::RequestRedirectMode::Follow)
+ .with_fetch_priority_hint(None)
+ },
internal_id: event_id.as_u64(),
owner: Some(ServiceWorkerRunOwner::new(version_id, run)),
- request_url: request_url.clone(),
- request_method: "GET".to_owned(),
- request_headers: Vec::new(),
- request_body: None,
- request_body_bytes: None,
cors_preflight_request_headers: Vec::new(),
client_id: ServiceWorkerClientId::from_u64_for_test(0),
resulting_client_id: None,
destination: ServiceWorkerRequestDestination::Empty,
is_reload: false,
metadata: Default::default(),
- request_mode: moli_fetch::RequestMode::Cors,
- credentials_mode: moli_fetch::RequestCredentialsMode::SameOrigin,
- redirect_mode: moli_fetch::RequestRedirectMode::Follow,
- priority: None,
- redirect_chain: Vec::new(),
- redirect_count: 0,
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&request_url),
document_url: request_url.clone(),
resource_type: crate::types::SubresourceResourceType::Fetch,
policy_context: Default::default(),
@@ -4715,28 +4726,34 @@ self.addEventListener("message", event => {
state.pending_fetch_jobs.insert(
event_id,
ServiceWorkerFetchJob {
+ request: {
+ let origin = moli_url::WebOrigin::from_url(&document_url);
+ let initiator = (document_url).clone();
+ moli_fetch::Request::new_browser(
+ "GET",
+ request_url.clone(),
+ None,
+ Vec::new(),
+ origin,
+ )
+ .with_initiator_url(&initiator)
+ .with_request_mode(moli_fetch::RequestMode::Cors)
+ .with_credentials_mode(moli_fetch::RequestCredentialsMode::SameOrigin)
+ .with_redirect_mode(moli_fetch::RequestRedirectMode::Follow)
+ .with_fetch_priority_hint(None)
+ },
internal_id: 131,
owner: Some(test_run_owner(version_id, &run)),
- request_url: request_url.clone(),
- request_method: "GET".to_owned(),
- request_headers: Vec::new(),
- request_body: None,
- request_body_bytes: None,
cors_preflight_request_headers: Vec::new(),
client_id: ServiceWorkerClientId::from_u64_for_test(0),
resulting_client_id: None,
destination: ServiceWorkerRequestDestination::Empty,
is_reload: false,
metadata: Default::default(),
- request_mode: moli_fetch::RequestMode::Cors,
- credentials_mode: moli_fetch::RequestCredentialsMode::SameOrigin,
- redirect_mode: moli_fetch::RequestRedirectMode::Follow,
- priority: None,
- redirect_chain: Vec::new(),
- redirect_count: 0,
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url,
resource_type: crate::types::SubresourceResourceType::Fetch,
policy_context: Default::default(),
@@ -7185,11 +7202,11 @@ self.addEventListener("message", event => {
is_reload: false,
metadata: Default::default(),
},
- request_body_text: None,
cors_preflight_request_headers: Vec::new(),
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url,
resource_type: crate::types::SubresourceResourceType::Fetch,
policy_context: Default::default(),
@@ -8371,28 +8388,34 @@ self.addEventListener("message", event => {
state.pending_fetch_jobs.insert(
event_id,
ServiceWorkerFetchJob {
+ request: {
+ let origin = moli_url::WebOrigin::from_url(&document_url);
+ let initiator = document_url.clone();
+ moli_fetch::Request::new_browser(
+ "GET",
+ request_url.clone(),
+ None,
+ Vec::new(),
+ origin,
+ )
+ .with_initiator_url(&initiator)
+ .with_request_mode(moli_fetch::RequestMode::Cors)
+ .with_credentials_mode(moli_fetch::RequestCredentialsMode::SameOrigin)
+ .with_redirect_mode(moli_fetch::RequestRedirectMode::Follow)
+ .with_fetch_priority_hint(None)
+ },
internal_id: 41,
owner: Some(test_run_owner(version_id, &run)),
- request_url: request_url.clone(),
- request_method: "GET".to_owned(),
- request_headers: Vec::new(),
- request_body: None,
- request_body_bytes: None,
cors_preflight_request_headers: Vec::new(),
client_id: ServiceWorkerClientId::from_u64_for_test(0),
resulting_client_id: None,
destination: ServiceWorkerRequestDestination::Empty,
is_reload: false,
metadata: Default::default(),
- request_mode: moli_fetch::RequestMode::Cors,
- credentials_mode: moli_fetch::RequestCredentialsMode::SameOrigin,
- redirect_mode: moli_fetch::RequestRedirectMode::Follow,
- priority: None,
- redirect_chain: Vec::new(),
- redirect_count: 0,
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url: document_url.clone(),
resource_type: crate::types::SubresourceResourceType::Fetch,
policy_context: Default::default(),
@@ -9174,11 +9197,11 @@ self.addEventListener("message", event => {
is_reload: false,
metadata: Default::default(),
},
- request_body_text: None,
cors_preflight_request_headers: Vec::new(),
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url: document_url.clone(),
resource_type: crate::types::SubresourceResourceType::Fetch,
policy_context: Default::default(),
@@ -9267,11 +9290,11 @@ self.addEventListener("message", event => {
is_reload: false,
metadata: Default::default(),
},
- request_body_text: None,
cors_preflight_request_headers: Vec::new(),
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url: document_url.clone(),
resource_type: crate::types::SubresourceResourceType::Fetch,
policy_context: Default::default(),
@@ -9438,11 +9461,11 @@ self.addEventListener("message", event => {
is_reload: false,
metadata: Default::default(),
},
- request_body_text: None,
cors_preflight_request_headers: Vec::new(),
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&worker_script_url),
document_url: worker_script_url,
resource_type: crate::types::SubresourceResourceType::Fetch,
policy_context: Default::default(),
@@ -9547,11 +9570,11 @@ self.addEventListener("message", event => {
is_reload: false,
metadata: Default::default(),
},
- request_body_text: None,
cors_preflight_request_headers: Vec::new(),
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url: document_url.clone(),
resource_type: crate::types::SubresourceResourceType::Fetch,
policy_context: Default::default(),
@@ -9631,28 +9654,34 @@ self.addEventListener("message", event => {
state.pending_fetch_jobs.insert(
event_id,
ServiceWorkerFetchJob {
+ request: {
+ let origin = moli_url::WebOrigin::from_url(&document_url);
+ let initiator = (document_url).clone();
+ moli_fetch::Request::new_browser(
+ "GET",
+ request_url,
+ None,
+ Vec::new(),
+ origin,
+ )
+ .with_initiator_url(&initiator)
+ .with_request_mode(moli_fetch::RequestMode::Cors)
+ .with_credentials_mode(moli_fetch::RequestCredentialsMode::SameOrigin)
+ .with_redirect_mode(moli_fetch::RequestRedirectMode::Follow)
+ .with_fetch_priority_hint(None)
+ },
internal_id: 90,
owner: Some(test_run_owner(version_id, &run)),
- request_url,
- request_method: "GET".to_owned(),
- request_headers: Vec::new(),
- request_body: None,
- request_body_bytes: None,
cors_preflight_request_headers: Vec::new(),
client_id: ServiceWorkerClientId::from_u64_for_test(0),
resulting_client_id: None,
destination: ServiceWorkerRequestDestination::Empty,
is_reload: false,
metadata: Default::default(),
- request_mode: moli_fetch::RequestMode::Cors,
- credentials_mode: moli_fetch::RequestCredentialsMode::SameOrigin,
- redirect_mode: moli_fetch::RequestRedirectMode::Follow,
- priority: None,
- redirect_chain: Vec::new(),
- redirect_count: 0,
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url,
resource_type: crate::types::SubresourceResourceType::Fetch,
policy_context: Default::default(),
@@ -9762,28 +9791,34 @@ self.addEventListener("message", event => {
state.pending_fetch_jobs.insert(
event_id,
ServiceWorkerFetchJob {
+ request: {
+ let origin = moli_url::WebOrigin::from_url(&document_url);
+ let initiator = (document_url).clone();
+ moli_fetch::Request::new_browser(
+ "GET",
+ request_url,
+ None,
+ Vec::new(),
+ origin,
+ )
+ .with_initiator_url(&initiator)
+ .with_request_mode(moli_fetch::RequestMode::Cors)
+ .with_credentials_mode(moli_fetch::RequestCredentialsMode::SameOrigin)
+ .with_redirect_mode(moli_fetch::RequestRedirectMode::Follow)
+ .with_fetch_priority_hint(None)
+ },
internal_id: 77,
owner: Some(test_run_owner(version_id, &run)),
- request_url,
- request_method: "GET".to_owned(),
- request_headers: Vec::new(),
- request_body: None,
- request_body_bytes: None,
cors_preflight_request_headers: Vec::new(),
client_id: ServiceWorkerClientId::from_u64_for_test(0),
resulting_client_id: None,
destination: ServiceWorkerRequestDestination::Empty,
is_reload: false,
metadata: Default::default(),
- request_mode: moli_fetch::RequestMode::Cors,
- credentials_mode: moli_fetch::RequestCredentialsMode::SameOrigin,
- redirect_mode: moli_fetch::RequestRedirectMode::Follow,
- priority: None,
- redirect_chain: Vec::new(),
- redirect_count: 0,
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url,
resource_type: crate::types::SubresourceResourceType::Fetch,
policy_context: Default::default(),
@@ -10299,28 +10334,34 @@ self.addEventListener("message", event => {
state.pending_fetch_jobs.insert(
event_id,
ServiceWorkerFetchJob {
+ request: {
+ let origin = moli_url::WebOrigin::from_url(&document_url);
+ let initiator = (document_url).clone();
+ moli_fetch::Request::new_browser(
+ "GET",
+ request_url.clone(),
+ None,
+ Vec::new(),
+ origin,
+ )
+ .with_initiator_url(&initiator)
+ .with_request_mode(moli_fetch::RequestMode::Cors)
+ .with_credentials_mode(moli_fetch::RequestCredentialsMode::SameOrigin)
+ .with_redirect_mode(moli_fetch::RequestRedirectMode::Follow)
+ .with_fetch_priority_hint(None)
+ },
internal_id: 91,
owner: Some(test_run_owner(active_version_id, &active_run)),
- request_url: request_url.clone(),
- request_method: "GET".to_owned(),
- request_headers: Vec::new(),
- request_body: None,
- request_body_bytes: None,
cors_preflight_request_headers: Vec::new(),
client_id: ServiceWorkerClientId::from_u64_for_test(0),
resulting_client_id: None,
destination: ServiceWorkerRequestDestination::Empty,
is_reload: false,
metadata: Default::default(),
- request_mode: moli_fetch::RequestMode::Cors,
- credentials_mode: moli_fetch::RequestCredentialsMode::SameOrigin,
- redirect_mode: moli_fetch::RequestRedirectMode::Follow,
- priority: None,
- redirect_chain: Vec::new(),
- redirect_count: 0,
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url,
resource_type: crate::types::SubresourceResourceType::Fetch,
policy_context: Default::default(),
@@ -11916,28 +11957,34 @@ self.addEventListener("message", event => {
state.pending_fetch_jobs.insert(
event_id,
ServiceWorkerFetchJob {
+ request: {
+ let origin = moli_url::WebOrigin::from_url(&document_url);
+ let initiator = document_url.clone();
+ moli_fetch::Request::new_browser(
+ "GET",
+ request_url.clone(),
+ None,
+ Vec::new(),
+ origin,
+ )
+ .with_initiator_url(&initiator)
+ .with_request_mode(moli_fetch::RequestMode::Cors)
+ .with_credentials_mode(moli_fetch::RequestCredentialsMode::SameOrigin)
+ .with_redirect_mode(moli_fetch::RequestRedirectMode::Follow)
+ .with_fetch_priority_hint(None)
+ },
internal_id,
owner: Some(test_run_owner(active_version_id, &active_run)),
- request_url: request_url.clone(),
- request_method: "GET".to_owned(),
- request_headers: Vec::new(),
- request_body: None,
- request_body_bytes: None,
cors_preflight_request_headers: Vec::new(),
client_id: ServiceWorkerClientId::from_u64_for_test(0),
resulting_client_id: None,
destination: ServiceWorkerRequestDestination::Empty,
is_reload: false,
metadata: Default::default(),
- request_mode: moli_fetch::RequestMode::Cors,
- credentials_mode: moli_fetch::RequestCredentialsMode::SameOrigin,
- redirect_mode: moli_fetch::RequestRedirectMode::Follow,
- priority: None,
- redirect_chain: Vec::new(),
- redirect_count: 0,
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url: document_url.clone(),
resource_type: crate::types::SubresourceResourceType::Fetch,
policy_context: Default::default(),
diff --git a/moli-renderer-v8/src/service_worker_runtime/service/event_completion.rs b/moli-renderer-v8/src/service_worker_runtime/service/event_completion.rs
index 09929b324..900ea27a8 100644
--- a/moli-renderer-v8/src/service_worker_runtime/service/event_completion.rs
+++ b/moli-renderer-v8/src/service_worker_runtime/service/event_completion.rs
@@ -509,7 +509,7 @@ pub(super) fn service_worker_fetch_diagnostic_from_job_result(
final_url: response
.final_url
.as_ref()
- .unwrap_or(&job.request_url)
+ .unwrap_or(&job.request.url)
.as_str()
.to_owned(),
status: response.status,
@@ -527,10 +527,10 @@ pub(super) fn service_worker_fetch_diagnostic_from_job_result(
crate::runtime::RendererServiceWorkerFetchDiagnostic {
internal_id: job.internal_id,
document_url: job.network_context.document_url.as_str().to_owned(),
- request_url: job.request_url.as_str().to_owned(),
- method: job.request_method.clone(),
- request_headers: job.request_headers.clone(),
- request_body: job.request_body.clone(),
+ request_url: job.request.url.as_str().to_owned(),
+ method: job.request.method.clone(),
+ request_headers: job.request.request_headers.clone(),
+ request_body: request_body_text(&job.request.body),
destination: service_worker_fetch_diagnostic_destination(job.network_context.resource_type)
.to_owned(),
result,
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 c952b1c53..719c49292 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
@@ -27,7 +27,7 @@ struct ServiceWorkerNavigationPreloadDispatch {
}
fn service_worker_fetch_event_can_use_navigation_preload(job: &ServiceWorkerFetchJob) -> bool {
- job.request_mode == moli_fetch::RequestMode::Navigate
+ job.request.request_mode == moli_fetch::RequestMode::Navigate
&& matches!(
job.destination,
ServiceWorkerRequestDestination::Document | ServiceWorkerRequestDestination::Iframe
@@ -38,41 +38,22 @@ fn navigation_preload_request_for_job(
job: &ServiceWorkerFetchJob,
header_value: &str,
) -> Result<moli_fetch::Request, String> {
- let mut headers = job.request_headers.clone();
+ let mut headers = job.request.request_headers.clone();
headers.retain(|(name, _)| !name.eq_ignore_ascii_case("service-worker-navigation-preload"));
headers.push((
"Service-Worker-Navigation-Preload".to_owned(),
header_value.to_owned(),
));
- moli_fetch::Request::new_bytes(
- &job.request_method,
- job.request_url.as_str(),
- job.request_body_bytes.clone(),
- headers,
- )
- .map(|request| {
- let request = if job.network_context.frame_id.is_some() {
- request.with_subframe_navigation_cookie_context()
+ let mut request = super::fetch_settlement::service_worker_network_fallback_request_for_job(job);
+ request.request_headers = headers;
+ Ok(request
+ .with_redirect_mode(moli_fetch::RequestRedirectMode::Manual)
+ .with_browser_navigation_kind(if job.is_reload {
+ moli_fetch::BrowserNavigationRequestKind::Reload
} else {
- request.with_top_level_navigation_cookie_context()
- };
- request
- .with_initiator_url(&job.network_context.document_url)
- .with_request_mode(job.request_mode)
- .with_credentials_mode(job.credentials_mode)
- // Chromium reports the first navigation preload redirect to
- // `preloadResponse` as an opaqueredirect response instead of
- // following it internally.
- .with_redirect_mode(moli_fetch::RequestRedirectMode::Manual)
- .with_fetch_priority_hint(job.priority)
- .with_browser_navigation_kind(if job.is_reload {
- moli_fetch::BrowserNavigationRequestKind::Reload
- } else {
- moli_fetch::BrowserNavigationRequestKind::Navigate
- })
- .with_page_network_policy()
- })
- .map_err(|error| error.to_string())
+ moli_fetch::BrowserNavigationRequestKind::Navigate
+ })
+ .with_page_network_policy())
}
fn navigation_preload_response_head(
@@ -260,25 +241,29 @@ impl ServiceWorkerRuntimeService {
pub(crate) fn dispatch_controlled_fetch(&self, dispatch: ServiceWorkerFetchDispatch) -> bool {
let request = dispatch.request.clone();
let fetch_job = ServiceWorkerFetchJob {
+ request: {
+ let origin = dispatch.network_context.request_origin.clone();
+ moli_fetch::Request::new_browser(
+ &request.method,
+ request.url.clone(),
+ request.body.clone(),
+ request.headers.clone(),
+ origin,
+ )
+ .with_initiator_url(&dispatch.network_context.document_url)
+ .with_request_mode(request.request_mode)
+ .with_credentials_mode(request.credentials_mode)
+ .with_redirect_mode(request.redirect_mode)
+ .with_fetch_priority_hint(request.priority)
+ },
internal_id: dispatch.internal_id,
owner: None,
- request_url: request.url.clone(),
- request_method: request.method.clone(),
- request_headers: request.headers.clone(),
- request_body: dispatch.request_body_text,
- request_body_bytes: request.body.clone(),
cors_preflight_request_headers: dispatch.cors_preflight_request_headers,
client_id: request.client_id,
resulting_client_id: request.resulting_client_id,
destination: request.destination,
is_reload: request.is_reload,
metadata: request.metadata.clone(),
- request_mode: request.request_mode,
- credentials_mode: request.credentials_mode,
- redirect_mode: request.redirect_mode,
- priority: request.priority,
- redirect_chain: Vec::new(),
- redirect_count: 0,
request_cookie_report: dispatch.request_cookie_report,
network_context: dispatch.network_context,
completion_tx: dispatch.completion_tx,
@@ -298,14 +283,12 @@ impl ServiceWorkerRuntimeService {
mut fetch_job: ServiceWorkerFetchJob,
request: ServiceWorkerFetchRequest,
) -> Result<(), Box<ServiceWorkerFetchJob>> {
- if let Err(error) =
- moli_fetch::FetchUrlList::new(&fetch_job.request_url, &fetch_job.redirect_chain)
- .validate_request_mode(
- fetch_job.request_mode,
- &fetch_job.network_context.document_url,
- )
- {
- self.complete_fetch_with_failure(fetch_job, error);
+ if let Err(error) = fetch_job.request.browser_origin().and_then(|_| {
+ fetch_job
+ .request
+ .validate_request_mode_for_url(&fetch_job.request.url)
+ }) {
+ self.complete_fetch_with_failure(fetch_job, error.to_string());
return Ok(());
}
let (dispatch_event, start_launch, fallback_job) = {
@@ -1408,8 +1391,8 @@ impl ServiceWorkerRuntimeService {
return None;
}
- let request_url = job.request_url.clone();
- let request_mode = job.request_mode;
+ let request_url = job.request.url.clone();
+ let request_mode = job.request.request_mode;
let request_client = job.request_client.clone();
let resource_task_runner = job.resource_task_runner.clone();
let cancel_handle = moli_fetch::FetchCancelHandle::new();
diff --git a/moli-renderer-v8/src/service_worker_runtime/service/fetch_settlement.rs b/moli-renderer-v8/src/service_worker_runtime/service/fetch_settlement.rs
index 23a305917..3827aaea6 100644
--- a/moli-renderer-v8/src/service_worker_runtime/service/fetch_settlement.rs
+++ b/moli-renderer-v8/src/service_worker_runtime/service/fetch_settlement.rs
@@ -30,10 +30,10 @@ fn service_worker_redirect_target(
else {
return Ok(None);
};
- if job.redirect_count >= MAX_SERVICE_WORKER_SYNTHETIC_REDIRECTS {
+ if job.request.redirect_count() >= MAX_SERVICE_WORKER_SYNTHETIC_REDIRECTS {
return Err(format!(
"redirect limit exceeded for {}",
- response.final_url.as_ref().unwrap_or(&job.request_url)
+ response.final_url.as_ref().unwrap_or(&job.request.url)
));
}
if let Ok(url) = Url::parse(location) {
@@ -53,60 +53,41 @@ fn fetch_request_for_job(job: &ServiceWorkerFetchJob) -> ServiceWorkerFetchReque
ServiceWorkerFetchRequest {
client_id: job.client_id,
resulting_client_id: job.resulting_client_id,
- url: job.request_url.clone(),
- method: job.request_method.clone(),
- headers: job.request_headers.clone(),
- body: job.request_body_bytes.clone(),
+ url: job.request.url.clone(),
+ method: job.request.method.clone(),
+ headers: job.request.request_headers.clone(),
+ body: job.request.body.clone(),
destination: job.destination,
- request_mode: job.request_mode,
- credentials_mode: job.credentials_mode,
- redirect_mode: job.redirect_mode,
- priority: job.priority,
+ request_mode: job.request.request_mode,
+ credentials_mode: job.request.credentials_mode,
+ redirect_mode: job.request.redirect_mode,
+ priority: job.request.priority_hints.fetch_priority,
is_reload: job.is_reload,
metadata: job.metadata.clone(),
}
}
-fn service_worker_network_fallback_request_for_job(
+pub(super) fn service_worker_network_fallback_request_for_job(
job: &ServiceWorkerFetchJob,
-) -> Result<moli_fetch::Request, String> {
- let request = moli_fetch::Request::new_bytes(
- &job.request_method,
- job.request_url.as_str(),
- job.request_body_bytes.clone(),
- job.request_headers.clone(),
- )
- .map_err(|error| error.to_string())?;
- Ok(configure_service_worker_network_fallback_request(
- job, request,
- ))
-}
-
-fn configure_service_worker_network_fallback_request(
- job: &ServiceWorkerFetchJob,
- request: moli_fetch::Request,
) -> moli_fetch::Request {
- let mut request = request
- .with_initiator_url(&job.network_context.document_url)
- .with_request_mode(job.request_mode)
- .with_credentials_mode(job.credentials_mode)
- .with_redirect_chain(job.redirect_chain.clone())
- .with_redirect_mode(if service_worker_fetch_is_navigation_request(job) {
- moli_fetch::RequestRedirectMode::Follow
- } else {
- job.redirect_mode
- })
- .with_fetch_priority_hint(job.priority)
+ let mut request = job
+ .request
+ .clone()
.with_browser_request_metadata(service_worker_fetch_browser_metadata(
job.network_context.resource_type,
))
.with_subframe_context(job.network_context.frame_id.is_some());
if service_worker_fetch_is_navigation_request(job) {
+ let initiator_url = request.cookie_context.initiator_url.clone();
+ request = request.with_redirect_mode(moli_fetch::RequestRedirectMode::Follow);
request = if job.network_context.frame_id.is_some() {
request.with_subframe_navigation_cookie_context()
} else {
request.with_top_level_navigation_cookie_context()
};
+ if let Some(initiator_url) = initiator_url {
+ request = request.with_initiator_url(&initiator_url);
+ }
}
if job.network_context.resource_type == crate::types::SubresourceResourceType::EventSource {
request = request
@@ -124,13 +105,13 @@ fn service_worker_fetch_stream_response_head(
final_url: response_head
.final_url
.clone()
- .unwrap_or_else(|| job.request_url.clone()),
+ .unwrap_or_else(|| job.request.url.clone()),
status: response_head.status,
headers: response_head.headers.clone(),
request_cookie_report: job.request_cookie_report.clone(),
cookie_set_reports: Vec::new(),
- redirected: response_head.redirected || !job.redirect_chain.is_empty(),
- redirect_chain: job.redirect_chain.clone(),
+ redirected: response_head.redirected || !job.request.redirect_chain().is_empty(),
+ redirect_chain: job.request.redirect_chain().to_vec(),
from_cache: false,
negotiated_http_version: None,
}
@@ -140,7 +121,7 @@ fn service_worker_fetch_can_forward_stream(
job: &ServiceWorkerFetchJob,
response_head: &MaterializedServiceWorkerFetchResponseHead,
) -> Result<bool, String> {
- let final_url = response_head.final_url.as_ref().unwrap_or(&job.request_url);
+ let final_url = response_head.final_url.as_ref().unwrap_or(&job.request.url);
validate_service_worker_fetch_response_head_security_policy(
job,
final_url,
@@ -168,41 +149,25 @@ fn apply_service_worker_synthetic_redirect(
) -> Result<(), String> {
let from_url = response
.final_url
- .unwrap_or_else(|| job.request_url.clone());
- job.redirect_chain.push(moli_fetch::RedirectInfo {
- source: moli_fetch::RedirectSource::ServiceWorker,
- from_url,
- to_url: next_url.clone(),
- status: response.status,
- headers: response.headers,
- network_extra_info_available: false,
- request_extra_info: None,
- response_extra_info: None,
- redirect_has_extra_info: false,
- request_cookie_report: job.request_cookie_report.take(),
- cookie_set_reports: Vec::new(),
- from_cache: false,
- negotiated_http_version: None,
- });
- job.redirect_count += 1;
-
- let mut request = moli_fetch::Request::new_bytes(
- &job.request_method,
- job.request_url.as_str(),
- job.request_body_bytes.clone(),
- job.request_headers.clone(),
- )
- .map_err(|error| error.to_string())?;
- request.apply_redirect_status(response.status);
- job.request_method = request.method;
- job.request_headers = request.request_headers;
- job.request_body_bytes = request.body;
- job.request_body = job
- .request_body_bytes
- .as_ref()
- .map(|body| String::from_utf8_lossy(body).into_owned());
- job.cors_preflight_request_headers = job.request_headers.clone();
- job.request_url = next_url;
+ .unwrap_or_else(|| job.request.url.clone());
+ job.request
+ .follow_redirect(moli_fetch::RedirectInfo {
+ source: moli_fetch::RedirectSource::ServiceWorker,
+ from_url,
+ to_url: next_url.clone(),
+ status: response.status,
+ headers: response.headers,
+ network_extra_info_available: false,
+ request_extra_info: None,
+ response_extra_info: None,
+ redirect_has_extra_info: false,
+ request_cookie_report: job.request_cookie_report.take(),
+ cookie_set_reports: Vec::new(),
+ from_cache: false,
+ negotiated_http_version: None,
+ })
+ .map_err(|error| error.to_string())?;
+ job.cors_preflight_request_headers = job.request.request_headers.clone();
Ok(())
}
@@ -229,10 +194,6 @@ impl ServiceWorkerRuntimeService {
let completion_tx =
crate::page_task_queue::RendererResourceCompletionSender::direct_completion_only();
let (direct_completion_tx, direct_completion_rx) = tokio::sync::oneshot::channel();
- let request_body_text = request
- .body
- .as_ref()
- .map(|body| String::from_utf8_lossy(body).into_owned());
let dispatch = ServiceWorkerFetchDispatch {
internal_id: 0,
request: ServiceWorkerFetchRequest {
@@ -250,11 +211,14 @@ impl ServiceWorkerRuntimeService {
is_reload: false,
metadata: service_worker_fetch_request_metadata(request),
},
- request_body_text,
cors_preflight_request_headers: Vec::new(),
request_cookie_report: None,
network_context: crate::types::AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: request
+ .browser_origin()
+ .map_err(|error| error.to_string())?
+ .clone(),
document_url: request.url.clone(),
resource_type: crate::types::SubresourceResourceType::Script,
policy_context: Default::default(),
@@ -283,7 +247,7 @@ impl ServiceWorkerRuntimeService {
pub(super) fn dispatch_fetch_fallback(&self, mut job: ServiceWorkerFetchJob) {
job.cancel_pending_navigation_preload();
if let Some(completion_tx) = job.direct_completion_tx.take() {
- if job.redirect_count != 0 {
+ if job.request.redirect_count() != 0 {
self.dispatch_direct_fetch_network_fallback(job, completion_tx);
return;
}
@@ -291,18 +255,7 @@ impl ServiceWorkerRuntimeService {
return;
}
let request_client = job.request_client.clone();
- let request = match moli_fetch::Request::new_bytes(
- &job.request_method,
- job.request_url.as_str(),
- job.request_body_bytes.clone(),
- job.request_headers.clone(),
- ) {
- Ok(request) => configure_service_worker_network_fallback_request(&job, request),
- Err(error) => {
- self.complete_fetch_with_failure(job, error.to_string());
- return;
- }
- };
+ let request = service_worker_network_fallback_request_for_job(&job);
crate::network_host::spawn_async_subresource_fetch(
job.resource_task_runner.clone(),
job.completion_tx,
@@ -312,10 +265,10 @@ impl ServiceWorkerRuntimeService {
job.cors_preflight_request_headers,
job.internal_id,
job.network_context,
- job.request_url,
- job.request_method,
- job.request_headers,
- job.request_body,
+ job.request.url,
+ job.request.method,
+ job.request.request_headers,
+ request_body_text(&job.request.body),
);
}
@@ -325,17 +278,18 @@ impl ServiceWorkerRuntimeService {
completion_tx: tokio::sync::oneshot::Sender<ServiceWorkerDirectFetchResult>,
) {
let request_client = job.request_client.clone();
- let request = match service_worker_network_fallback_request_for_job(&job) {
- Ok(request) => request,
- Err(message) => {
- let _ = completion_tx.send(ServiceWorkerDirectFetchResult::Failure(message));
+ let request = service_worker_network_fallback_request_for_job(&job);
+ let cancel_handle = job.cancel_handle.clone();
+ let request_origin = match request.browser_origin() {
+ Ok(origin) => origin.clone(),
+ Err(error) => {
+ let _ =
+ completion_tx.send(ServiceWorkerDirectFetchResult::Failure(error.to_string()));
return;
}
};
- let cancel_handle = job.cancel_handle.clone();
- let document_url = job.network_context.document_url.clone();
- let request_mode = job.request_mode;
- let credentials_mode = job.credentials_mode;
+ let request_mode = job.request.request_mode;
+ let credentials_mode = job.request.credentials_mode;
job.resource_task_runner.spawn(async move {
let result = match request_client
.fetch_raw_stream_with_cancel(request, cancel_handle)
@@ -352,7 +306,7 @@ impl ServiceWorkerRuntimeService {
// before the direct consumer can trust an absent filter.
if request_mode == moli_fetch::RequestMode::Cors
&& let Err(message) = crate::network_host::validate_cors_response_chain(
- &document_url,
+ &request_origin,
&head,
credentials_mode,
)
@@ -362,7 +316,7 @@ impl ServiceWorkerRuntimeService {
return;
}
let response_filter = crate::network_host::network_response_filter(
- &document_url,
+ &request_origin,
&head,
request_mode,
);
@@ -429,10 +383,10 @@ impl ServiceWorkerRuntimeService {
&started.response_head.response_type,
),
internal_id: job.internal_id,
- request_url: job.request_url.clone(),
- request_method: job.request_method.clone(),
- request_headers: job.request_headers.clone(),
- request_body: job.request_body.clone(),
+ request_url: job.request.url.clone(),
+ request_method: job.request.method.clone(),
+ request_headers: job.request.request_headers.clone(),
+ request_body: request_body_text(&job.request.body),
body_source_id: started.body_source_id,
network_request_headers: None,
head: service_worker_fetch_stream_response_head(
@@ -585,10 +539,10 @@ impl ServiceWorkerRuntimeService {
}
}
if is_redirect_status(response.status)
- && job.redirect_mode != moli_fetch::RequestRedirectMode::Manual
+ && job.request.redirect_mode != moli_fetch::RequestRedirectMode::Manual
{
match service_worker_redirect_target(&job, &response) {
- Ok(Some(next_url)) => match job.redirect_mode {
+ Ok(Some(next_url)) => match job.request.redirect_mode {
moli_fetch::RequestRedirectMode::Error => {
self.complete_fetch_with_network_failure(
job,
@@ -636,7 +590,7 @@ impl ServiceWorkerRuntimeService {
let final_url = response
.final_url
.clone()
- .unwrap_or_else(|| job.request_url.clone());
+ .unwrap_or_else(|| job.request.url.clone());
if let Err(message) =
validate_service_worker_fetch_response_security_policy(&job, &response, &final_url)
{
@@ -651,8 +605,8 @@ impl ServiceWorkerRuntimeService {
headers: response.headers,
request_cookie_report: job.request_cookie_report,
cookie_set_reports: Vec::new(),
- redirected: response.redirected || !job.redirect_chain.is_empty(),
- redirect_chain: job.redirect_chain,
+ redirected: response.redirected || !job.request.redirect_chain().is_empty(),
+ redirect_chain: job.request.redirect_chain().to_vec(),
from_cache: false,
negotiated_http_version: None,
},
@@ -682,10 +636,10 @@ impl ServiceWorkerRuntimeService {
.completion_tx
.send_async_subresource(AsyncSubresourceFetchCompletion {
internal_id: job.internal_id,
- request_url: job.request_url,
- request_method: job.request_method,
- request_headers: job.request_headers,
- request_body: job.request_body,
+ request_url: job.request.url,
+ request_method: job.request.method,
+ request_headers: job.request.request_headers,
+ request_body: request_body_text(&job.request.body),
response_status_text: Some(response.status_text),
skip_fetch_security_validation: true,
response_filter,
@@ -735,10 +689,10 @@ impl ServiceWorkerRuntimeService {
.completion_tx
.send_async_subresource(AsyncSubresourceFetchCompletion {
internal_id: job.internal_id,
- request_url: job.request_url,
- request_method: job.request_method,
- request_headers: job.request_headers,
- request_body: job.request_body,
+ request_url: job.request.url,
+ request_method: job.request.method,
+ request_headers: job.request.request_headers,
+ request_body: request_body_text(&job.request.body),
response_status_text: None,
skip_fetch_security_validation: false,
response_filter: None,
@@ -811,7 +765,7 @@ fn validate_service_worker_fetch_response_security_policy(
fn service_worker_fetch_response_requires_body_security_policy(
job: &ServiceWorkerFetchJob,
) -> bool {
- job.request_mode == moli_fetch::RequestMode::NoCors
+ job.request.request_mode == moli_fetch::RequestMode::NoCors
&& matches!(
job.network_context.resource_type,
crate::types::SubresourceResourceType::Fetch
@@ -824,7 +778,7 @@ fn validate_service_worker_fetch_response_body_security_policy(
response: &ServiceWorkerFetchResponse,
final_url: &Url,
) -> Result<(), String> {
- if job.request_mode != moli_fetch::RequestMode::NoCors
+ if job.request.request_mode != moli_fetch::RequestMode::NoCors
|| !matches!(
job.network_context.resource_type,
crate::types::SubresourceResourceType::Fetch
@@ -836,7 +790,9 @@ fn validate_service_worker_fetch_response_body_security_policy(
validate_service_worker_fetch_response_head_security_policy(job, final_url, &response.headers)?;
crate::network_host::validate_opaque_response_blocking_with_body(
- &job.network_context.document_url,
+ job.request
+ .browser_origin()
+ .map_err(|error| error.to_string())?,
final_url,
&response.headers,
&response.body,
@@ -848,7 +804,7 @@ fn validate_service_worker_fetch_response_head_security_policy(
final_url: &Url,
headers: &[(String, String)],
) -> Result<(), String> {
- if job.request_mode != moli_fetch::RequestMode::NoCors
+ if job.request.request_mode != moli_fetch::RequestMode::NoCors
|| matches!(
job.network_context.resource_type,
crate::types::SubresourceResourceType::WebSocket
@@ -857,17 +813,17 @@ fn validate_service_worker_fetch_response_head_security_policy(
return Ok(());
}
- crate::network_host::validate_cross_origin_resource_policy(
- &job.network_context.document_url,
- final_url,
- headers,
- )?;
+ let origin = job
+ .request
+ .browser_origin()
+ .map_err(|error| error.to_string())?;
+ crate::network_host::validate_cross_origin_resource_policy(origin, final_url, headers)?;
crate::network_host::validate_cross_origin_embedder_and_document_isolation_policy(
- &job.network_context.document_url,
+ origin,
final_url,
headers,
- job.request_mode,
- job.credentials_mode,
+ job.request.request_mode,
+ job.request.credentials_mode,
job.network_context
.policy_context
.cross_origin_embedder_policy,
@@ -883,7 +839,7 @@ fn service_worker_fetch_response_rejection(
"error" => {
return Some("FetchEvent.respondWith rejected an error Response".to_owned());
}
- "cors" if job.request_mode == moli_fetch::RequestMode::SameOrigin => {
+ "cors" if job.request.request_mode == moli_fetch::RequestMode::SameOrigin => {
return Some(
"FetchEvent.respondWith rejected a cors Response for a same-origin request"
.to_owned(),
@@ -892,14 +848,16 @@ fn service_worker_fetch_response_rejection(
"opaque" => {
if let Some(message) =
crate::service_worker_runtime::service_worker_opaque_response_rejection(
- job.request_mode,
+ job.request.request_mode,
job.destination,
)
{
return Some(message);
}
}
- "opaqueredirect" if job.redirect_mode != moli_fetch::RequestRedirectMode::Manual => {
+ "opaqueredirect"
+ if job.request.redirect_mode != moli_fetch::RequestRedirectMode::Manual =>
+ {
return Some(
"FetchEvent.respondWith rejected an opaqueredirect Response for a request whose redirect mode is not manual"
.to_owned(),
@@ -907,7 +865,7 @@ fn service_worker_fetch_response_rejection(
}
_ => {}
}
- if response.redirected && job.redirect_mode != moli_fetch::RequestRedirectMode::Follow {
+ if response.redirected && job.request.redirect_mode != moli_fetch::RequestRedirectMode::Follow {
return Some(
"FetchEvent.respondWith rejected a redirected Response for a request whose redirect mode is not follow"
.to_owned(),
@@ -1181,28 +1139,34 @@ mod tests {
state.pending_fetch_jobs.insert(
event_id,
ServiceWorkerFetchJob {
+ request: {
+ let origin = moli_url::WebOrigin::from_url(&document_url);
+ let initiator = (document_url).clone();
+ moli_fetch::Request::new_browser(
+ "GET",
+ request_url.clone(),
+ None,
+ vec![("accept".to_owned(), "text/plain".to_owned())],
+ origin,
+ )
+ .with_initiator_url(&initiator)
+ .with_request_mode(request_mode)
+ .with_credentials_mode(moli_fetch::RequestCredentialsMode::SameOrigin)
+ .with_redirect_mode(redirect_mode)
+ .with_fetch_priority_hint(None)
+ },
internal_id,
owner: Some(ServiceWorkerRunOwner::new(version_id, run.clone())),
- request_url: request_url.clone(),
- request_method: "GET".to_owned(),
- request_headers: vec![("accept".to_owned(), "text/plain".to_owned())],
- request_body: None,
- request_body_bytes: None,
cors_preflight_request_headers: Vec::new(),
client_id,
resulting_client_id: None,
destination,
is_reload: false,
metadata: Default::default(),
- request_mode,
- credentials_mode: moli_fetch::RequestCredentialsMode::SameOrigin,
- redirect_mode,
- priority: None,
- redirect_chain: Vec::new(),
- redirect_count: 0,
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url,
resource_type,
policy_context: Default::default(),
@@ -1261,8 +1225,7 @@ mod tests {
.remove(&event_id)
.expect("EventSource service worker fetch job");
- let request = service_worker_network_fallback_request_for_job(&job)
- .expect("EventSource fallback request");
+ let request = service_worker_network_fallback_request_for_job(&job);
assert_eq!(
request.browser_request_metadata(),
Some(moli_fetch::BrowserRequestMetadata::EventSource)
@@ -1899,21 +1862,21 @@ mod tests {
.expect("redirected fetch job should be pending");
assert_eq!(redirected_job.internal_id, 312);
assert_eq!(
- redirected_job.request_url,
+ redirected_job.request.url,
url("https://example.test/app/next.txt")
);
- assert_eq!(redirected_job.redirect_count, 1);
- assert_eq!(redirected_job.redirect_chain.len(), 1);
+ assert_eq!(redirected_job.request.redirect_count(), 1);
+ assert_eq!(redirected_job.request.redirect_chain().len(), 1);
assert_eq!(
- redirected_job.redirect_chain[0].source,
+ redirected_job.request.redirect_chain()[0].source,
moli_fetch::RedirectSource::ServiceWorker
);
assert_eq!(
- redirected_job.redirect_chain[0].from_url,
+ redirected_job.request.redirect_chain()[0].from_url,
url("https://example.test/app/data.txt")
);
assert_eq!(
- redirected_job.redirect_chain[0].to_url,
+ redirected_job.request.redirect_chain()[0].to_url,
url("https://example.test/app/next.txt")
);
}
@@ -1924,31 +1887,37 @@ mod tests {
let completion_queue = crate::page_task_queue::RendererResourceCompletionTestHarness::new();
let request_url = url("https://example.test/app/post");
let mut job = ServiceWorkerFetchJob {
+ request: {
+ let origin = moli_url::WebOrigin::from_url(&request_url);
+ let initiator = request_url.clone();
+ moli_fetch::Request::new_browser(
+ "POST",
+ request_url.clone(),
+ Some(b"payload".to_vec()),
+ vec![
+ ("content-type".to_owned(), "text/plain".to_owned()),
+ ("x-keep".to_owned(), "yes".to_owned()),
+ ],
+ origin,
+ )
+ .with_initiator_url(&initiator)
+ .with_request_mode(moli_fetch::RequestMode::Cors)
+ .with_credentials_mode(moli_fetch::RequestCredentialsMode::SameOrigin)
+ .with_redirect_mode(moli_fetch::RequestRedirectMode::Follow)
+ .with_fetch_priority_hint(None)
+ },
internal_id: 312,
owner: Some(ServiceWorkerRunOwner::fresh(ServiceWorkerVersionId(1))),
- request_url: request_url.clone(),
- request_method: "POST".to_owned(),
- request_headers: vec![
- ("content-type".to_owned(), "text/plain".to_owned()),
- ("x-keep".to_owned(), "yes".to_owned()),
- ],
- request_body: Some("payload".to_owned()),
- request_body_bytes: Some(b"payload".to_vec()),
cors_preflight_request_headers: Vec::new(),
client_id: ServiceWorkerClientId::from_u64_for_test(0),
resulting_client_id: None,
destination: ServiceWorkerRequestDestination::Empty,
is_reload: false,
metadata: Default::default(),
- request_mode: moli_fetch::RequestMode::Cors,
- credentials_mode: moli_fetch::RequestCredentialsMode::SameOrigin,
- redirect_mode: moli_fetch::RequestRedirectMode::Follow,
- priority: None,
- redirect_chain: Vec::new(),
- redirect_count: 0,
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&request_url),
document_url: request_url.clone(),
resource_type: crate::types::SubresourceResourceType::Fetch,
policy_context: Default::default(),
@@ -1961,6 +1930,14 @@ mod tests {
streaming_body_source_id: None,
direct_completion_tx: None,
};
+ let origin = moli_url::WebOrigin::from_url(&url("https://initiator.test/"));
+ job.request = job
+ .request
+ .with_request_origin(origin.clone())
+ .with_cache_mode(moli_fetch::RequestCacheMode::Validate)
+ .with_network_partition_key(Some("partition".to_owned()))
+ .without_inferred_referrer()
+ .with_fetch_priority_hint(Some(moli_fetch::FetchPriorityHint::High));
let response = ServiceWorkerFetchResponse {
final_url: Some(request_url.clone()),
response_type: "default".to_owned(),
@@ -1978,20 +1955,41 @@ mod tests {
.expect("synthetic redirect should apply");
assert_eq!(next_url, url("https://example.test/app/next"));
- assert_eq!(job.request_url, next_url);
- assert_eq!(job.request_method, "GET");
- assert_eq!(job.request_body, None);
- assert_eq!(job.request_body_bytes, None);
+ assert_eq!(job.request.url, next_url);
+ assert_eq!(job.request.method, "GET");
+ assert_eq!(request_body_text(&job.request.body), None);
+ assert_eq!(job.request.body, None);
assert_eq!(
- job.request_headers,
+ job.request.request_headers,
vec![("x-keep".to_owned(), "yes".to_owned())]
);
- assert_eq!(job.cors_preflight_request_headers, job.request_headers);
- assert_eq!(job.redirect_count, 1);
- assert_eq!(job.redirect_chain.len(), 1);
- assert_eq!(job.redirect_chain[0].from_url, request_url);
- assert_eq!(job.redirect_chain[0].to_url, next_url);
- assert_eq!(job.redirect_chain[0].status, 303);
+ assert_eq!(
+ job.cors_preflight_request_headers,
+ job.request.request_headers
+ );
+ assert_eq!(job.request.redirect_count(), 1);
+ assert_eq!(job.request.redirect_chain().len(), 1);
+ assert_eq!(job.request.redirect_chain()[0].from_url, request_url);
+ assert_eq!(job.request.redirect_chain()[0].to_url, next_url);
+ assert_eq!(job.request.redirect_chain()[0].status, 303);
+
+ let fallback = service_worker_network_fallback_request_for_job(&job);
+ assert_eq!(fallback.url, next_url);
+ assert_eq!(fallback.method, "GET");
+ assert_eq!(fallback.body, None);
+ assert_eq!(fallback.request_headers, job.request.request_headers);
+ assert!(fallback.browser_origin().unwrap().same_origin(&origin));
+ assert_eq!(
+ fallback.cache_mode(),
+ moli_fetch::RequestCacheMode::Validate
+ );
+ assert_eq!(fallback.network_partition_key(), Some("partition"));
+ assert!(!fallback.infers_referrer_from_initiator());
+ assert_eq!(
+ fallback.priority_hints.fetch_priority,
+ Some(moli_fetch::FetchPriorityHint::High)
+ );
+ assert_eq!(fallback.redirect_count(), 1);
}
#[test]
@@ -2093,14 +2091,17 @@ mod tests {
.expect("redirected fetch job should be pending");
assert_eq!(redirected_job.internal_id, 337);
assert_eq!(
- redirected_job.request_url,
+ redirected_job.request.url,
url("https://redirect-source.test/resources/blank.html")
);
- assert_eq!(redirected_job.redirect_count, 1);
- assert_eq!(redirected_job.redirect_chain.len(), 1);
- assert_eq!(redirected_job.redirect_chain[0].from_url, response_url);
+ assert_eq!(redirected_job.request.redirect_count(), 1);
+ assert_eq!(redirected_job.request.redirect_chain().len(), 1);
assert_eq!(
- redirected_job.redirect_chain[0].to_url,
+ redirected_job.request.redirect_chain()[0].from_url,
+ response_url
+ );
+ assert_eq!(
+ redirected_job.request.redirect_chain()[0].to_url,
url("https://redirect-source.test/resources/blank.html")
);
}
@@ -2671,7 +2672,7 @@ mod tests {
.policy_context
.cross_origin_embedder_policy =
crate::cross_origin_isolation::CrossOriginEmbedderPolicy::Credentialless;
- job.credentials_mode = moli_fetch::RequestCredentialsMode::SameOrigin;
+ job.request.credentials_mode = moli_fetch::RequestCredentialsMode::SameOrigin;
}
service.finish_fetch_event_completed(ServiceWorkerFetchCompletion {
@@ -2724,7 +2725,7 @@ mod tests {
.policy_context
.cross_origin_embedder_policy =
crate::cross_origin_isolation::CrossOriginEmbedderPolicy::Credentialless;
- job.credentials_mode = moli_fetch::RequestCredentialsMode::Include;
+ job.request.credentials_mode = moli_fetch::RequestCredentialsMode::Include;
}
service.finish_fetch_event_completed(ServiceWorkerFetchCompletion {
@@ -2839,7 +2840,7 @@ mod tests {
.expect("pending fetch job should exist");
job.network_context.policy_context.document_isolation_policy =
crate::cross_origin_isolation::DocumentIsolationPolicy::IsolateAndCredentialless;
- job.credentials_mode = moli_fetch::RequestCredentialsMode::SameOrigin;
+ job.request.credentials_mode = moli_fetch::RequestCredentialsMode::SameOrigin;
}
service.finish_fetch_event_completed(ServiceWorkerFetchCompletion {
@@ -2890,7 +2891,7 @@ mod tests {
.expect("pending fetch job should exist");
job.network_context.policy_context.document_isolation_policy =
crate::cross_origin_isolation::DocumentIsolationPolicy::IsolateAndCredentialless;
- job.credentials_mode = moli_fetch::RequestCredentialsMode::Include;
+ job.request.credentials_mode = moli_fetch::RequestCredentialsMode::Include;
}
service.finish_fetch_event_completed(ServiceWorkerFetchCompletion {
@@ -3015,7 +3016,7 @@ mod tests {
.policy_context
.cross_origin_embedder_policy =
crate::cross_origin_isolation::CrossOriginEmbedderPolicy::Credentialless;
- job.credentials_mode = moli_fetch::RequestCredentialsMode::Include;
+ job.request.credentials_mode = moli_fetch::RequestCredentialsMode::Include;
}
service.finish_fetch_stream_started(ServiceWorkerFetchStreamStarted {
@@ -3079,7 +3080,7 @@ mod tests {
.expect("pending fetch job should exist");
job.network_context.policy_context.document_isolation_policy =
crate::cross_origin_isolation::DocumentIsolationPolicy::IsolateAndCredentialless;
- job.credentials_mode = moli_fetch::RequestCredentialsMode::Include;
+ job.request.credentials_mode = moli_fetch::RequestCredentialsMode::Include;
}
service.finish_fetch_stream_started(ServiceWorkerFetchStreamStarted {
@@ -3326,11 +3327,30 @@ mod tests {
.pending_fetch_jobs
.remove(&event_id)
.expect("active fetch job");
- job.request_url =
+ job.request.url =
Url::parse(&format!("http://{address}/fallback")).expect("fallback request URL");
job.network_context.document_url =
Url::parse(&format!("http://{address}/page")).expect("fallback document URL");
- job.redirect_count = 1;
+ job.network_context.request_origin = (&job.network_context.document_url).into();
+ job.request = job
+ .request
+ .with_initiator_url(&job.network_context.document_url)
+ .with_request_origin(job.network_context.request_origin.clone());
+ job.request.record_redirect(moli_fetch::RedirectInfo {
+ source: moli_fetch::RedirectSource::ServiceWorker,
+ from_url: job.network_context.document_url.clone(),
+ to_url: job.request.url.clone(),
+ status: 302,
+ headers: Vec::new(),
+ network_extra_info_available: false,
+ request_extra_info: None,
+ response_extra_info: None,
+ redirect_has_extra_info: false,
+ request_cookie_report: None,
+ cookie_set_reports: Vec::new(),
+ from_cache: false,
+ negotiated_http_version: None,
+ });
job.direct_completion_tx = Some(direct_completion_tx);
// This test intentionally calls from a plain test thread. The
diff --git a/moli-renderer-v8/src/service_worker_runtime/state.rs b/moli-renderer-v8/src/service_worker_runtime/state.rs
index bb95d066e..bbc6bdb26 100644
--- a/moli-renderer-v8/src/service_worker_runtime/state.rs
+++ b/moli-renderer-v8/src/service_worker_runtime/state.rs
@@ -769,25 +769,15 @@ pub(super) enum ServiceWorkerPeriodicSyncStart {
}
pub(super) struct ServiceWorkerFetchJob {
+ pub(super) request: moli_fetch::Request,
pub(super) internal_id: u64,
pub(super) owner: Option<ServiceWorkerRunOwner>,
- pub(super) request_url: Url,
- pub(super) request_method: String,
- pub(super) request_headers: Vec<(String, String)>,
- pub(super) request_body: Option<String>,
- pub(super) request_body_bytes: Option<Vec<u8>>,
pub(super) cors_preflight_request_headers: Vec<(String, String)>,
pub(super) client_id: ServiceWorkerClientId,
pub(super) resulting_client_id: Option<ServiceWorkerClientId>,
pub(super) destination: ServiceWorkerRequestDestination,
pub(super) is_reload: bool,
pub(super) metadata: ServiceWorkerFetchRequestMetadata,
- pub(super) request_mode: moli_fetch::RequestMode,
- pub(super) credentials_mode: moli_fetch::RequestCredentialsMode,
- pub(super) redirect_mode: moli_fetch::RequestRedirectMode,
- pub(super) priority: Option<moli_fetch::FetchPriorityHint>,
- pub(super) redirect_chain: Vec<moli_fetch::RedirectInfo>,
- pub(super) redirect_count: usize,
pub(super) request_cookie_report: Option<moli_cookie_jar::StoredCookieQueryReport>,
pub(super) network_context: AsyncSubresourceNetworkContext,
pub(super) completion_tx: RendererResourceCompletionSender,
diff --git a/moli-renderer-v8/src/shared_worker_runtime/loading.rs b/moli-renderer-v8/src/shared_worker_runtime/loading.rs
index b2c9951c1..070349ede 100644
--- a/moli-renderer-v8/src/shared_worker_runtime/loading.rs
+++ b/moli-renderer-v8/src/shared_worker_runtime/loading.rs
@@ -564,6 +564,7 @@ fn shared_worker_script_request(
.with_credentials_mode(request_policy.credentials_mode)
.with_page_network_policy()
.with_initiator_url(initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(initiator_url))
.with_network_partition_key(request_policy.network_partition_key.clone())
.with_script_fetch_metadata(ScriptFetchRequestMetadata {
document_referrer_policy: request_policy.document_referrer_policy.clone(),
diff --git a/moli-renderer-v8/src/stylesheet_blocking.rs b/moli-renderer-v8/src/stylesheet_blocking.rs
index cf30dcf21..51b63e63e 100644
--- a/moli-renderer-v8/src/stylesheet_blocking.rs
+++ b/moli-renderer-v8/src/stylesheet_blocking.rs
@@ -220,6 +220,7 @@ fn stylesheet_readiness_request(
.expect("stylesheet url should already be parsed")
.with_page_network_policy()
.with_initiator_url(document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(document_url))
.with_resource_type(resource_type);
let captured_fetch_priority =
moli_fetch::FetchPriorityHint::from_attribute(options.fetch_priority());
@@ -265,7 +266,9 @@ enum StylesheetResponseProvenance {
impl StylesheetResponseProvenance {
fn is_cors_same_origin(self, document_url: &Url, head: &moli_fetch::ResponseHead) -> bool {
match self {
- Self::Network => !head.url_list().has_cross_origin_url(document_url),
+ Self::Network => !head
+ .url_list()
+ .has_cross_origin_url(&moli_url::WebOrigin::from_url(document_url)),
Self::ServiceWorker { filter } => !matches!(
filter,
Some(
diff --git a/moli-renderer-v8/src/stylesheet_runtime/connected.rs b/moli-renderer-v8/src/stylesheet_runtime/connected.rs
index 66d4a6a6f..7f1e32c35 100644
--- a/moli-renderer-v8/src/stylesheet_runtime/connected.rs
+++ b/moli-renderer-v8/src/stylesheet_runtime/connected.rs
@@ -2155,7 +2155,8 @@ fn connected_link_readiness_request(
let request = moli_fetch::Request::new("GET", url.as_str(), None, vec![])
.expect("preload-like link url should already be parsed")
.with_page_network_policy()
- .with_initiator_url(document_url);
+ .with_initiator_url(document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(document_url));
let mut request = request
.with_request_mode(options.request_mode)
.with_credentials_mode(options.credentials_mode);
@@ -4787,6 +4788,7 @@ mod tests {
let script_request = moli_fetch::Request::new("GET", script_url.as_str(), None, vec![])?
.with_page_network_policy()
.with_initiator_url(&document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&document_url))
.with_credentials_mode(module_script_credentials_mode(
metadata.cross_origin.as_deref(),
))
diff --git a/moli-renderer-v8/src/types.rs b/moli-renderer-v8/src/types.rs
index e4b0e7ce8..56c00fb14 100644
--- a/moli-renderer-v8/src/types.rs
+++ b/moli-renderer-v8/src/types.rs
@@ -505,6 +505,7 @@ impl PendingSubresourceExecutionContext {
}
pub(super) struct PendingSubresourceFetchState {
+ pub(super) request_origin: moli_url::WebOrigin,
pub(super) info: PendingSubresourceFetchInfo,
pub(super) load: crate::network::loads::ResourceLoadLease,
pub(super) execution_context: PendingSubresourceExecutionContext,
@@ -631,6 +632,7 @@ impl SubresourcePolicyContext {
#[derive(Clone, Debug)]
pub(super) struct AsyncSubresourceNetworkContext {
+ pub(super) request_origin: moli_url::WebOrigin,
pub(super) frame_id: Option<String>,
pub(super) document_url: Url,
pub(super) resource_type: SubresourceResourceType,
diff --git a/moli-renderer-v8/src/worker/global_scope/content_security_policy.rs b/moli-renderer-v8/src/worker/global_scope/content_security_policy.rs
index b49e469ee..b704ea406 100644
--- a/moli-renderer-v8/src/worker/global_scope/content_security_policy.rs
+++ b/moli-renderer-v8/src/worker/global_scope/content_security_policy.rs
@@ -49,6 +49,7 @@ pub(super) fn dispatch_worker_content_security_policy_violation_event<'s>(
let fields = ContentSecurityPolicyViolationEventFields::from_url_violation(violation);
send_content_security_policy_reports(
request_client.request_client(),
+ moli_url::WebOrigin::from_serialized(&violation.document_uri),
&fields,
&violation.report_uri_endpoints,
&violation.report_to_endpoints,
@@ -152,6 +153,7 @@ fn send_worker_content_security_policy_report_for_state(
};
let request = request
.with_initiator_url(&document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&document_url))
.with_network_partition_key(network_partition_key.clone())
.with_browser_request_metadata(BrowserRequestMetadata::Fetch);
let Some(load) = loader.register_load(
@@ -381,11 +383,11 @@ fn dispatch_worker_content_security_policy_report_to_service_worker(
is_reload: false,
metadata: request_metadata,
},
- request_body_text: request_body.clone(),
cors_preflight_request_headers: Vec::new(),
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url: document_url.clone(),
resource_type: SubresourceResourceType::CspReport,
policy_context,
@@ -548,6 +550,7 @@ pub(in crate::worker) fn continue_pending_worker_csp_report(
) {
Ok(request) => request
.with_initiator_url(&pending.document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&pending.document_url))
.with_resource_type(RequestResourceType::CspReport)
.with_request_mode(pending.request.request_mode)
.with_credentials_mode(pending.request.credentials_mode)
diff --git a/moli-renderer-v8/src/worker/global_scope/fetch.rs b/moli-renderer-v8/src/worker/global_scope/fetch.rs
index 91210d4b5..d1cf16af4 100644
--- a/moli-renderer-v8/src/worker/global_scope/fetch.rs
+++ b/moli-renderer-v8/src/worker/global_scope/fetch.rs
@@ -161,8 +161,12 @@ pub(in crate::worker) fn spawn_worker_fetch_network(
) {
tokio::task::spawn_local(async move {
let loader = load.request_client();
- let (result, network_request_headers) = if matches!(resolved_url.scheme(), "blob" | "data")
+ let (result, network_request_headers) = if let Err(message) =
+ moli_fetch::FetchUrlList::new(&resolved_url, &[])
+ .validate_request_mode(request_mode, &moli_url::WebOrigin::from_url(&document_url))
{
+ (Err(message), None)
+ } else if matches!(resolved_url.scheme(), "blob" | "data") {
(
local_url_response(&resolved_url)
.map(|response| WorkerFetchResponse::Materialized(Box::new(response)))
@@ -176,7 +180,13 @@ pub(in crate::worker) fn spawn_worker_fetch_network(
// as `Content-Type:` so the HTTP stack does not synthesize its own upload default.
headers.push(("Content-Type".to_owned(), String::new()));
}
- match Request::new_bytes(&method, resolved_url.as_str(), body, headers) {
+ match Request::new_browser_bytes(
+ &method,
+ resolved_url.as_str(),
+ body,
+ headers,
+ moli_url::WebOrigin::from_url(&document_url),
+ ) {
Ok(request) => {
let mut request = request
.with_initiator_url(&document_url)
@@ -386,7 +396,6 @@ fn spawn_worker_fetch_service_worker(
suppress_default_content_type: bool,
) {
let (direct_completion_tx, direct_completion_rx) = tokio::sync::oneshot::channel();
- let request_body_text = request_body_text(&body);
let dispatch = ServiceWorkerFetchDispatch {
internal_id: u64::from(fetch_id),
request: ServiceWorkerFetchRequest {
@@ -404,11 +413,11 @@ fn spawn_worker_fetch_service_worker(
is_reload: false,
metadata: request_metadata.clone(),
},
- request_body_text,
cors_preflight_request_headers: headers.clone(),
request_cookie_report: None,
network_context: AsyncSubresourceNetworkContext {
frame_id: None,
+ request_origin: moli_url::WebOrigin::from_url(&document_url),
document_url: document_url.clone(),
resource_type: SubresourceResourceType::Fetch,
policy_context,
@@ -506,26 +515,31 @@ pub(in crate::worker) fn spawn_worker_xhr_network(
tokio::task::spawn_local(async move {
let loader = load.request_client();
let cors_preflight_request_headers = headers.clone();
- let request =
- Request::new_bytes(&method, resolved_url.as_str(), body, headers).map(|request| {
- let mut request = request
- .with_initiator_url(&document_url)
- .with_credentials_mode(credentials_mode)
- .with_network_partition_key(network_partition_key.clone())
- .with_browser_request_metadata(BrowserRequestMetadata::Xhr);
- if let Some(referrer_policy) = referrer_policy {
- request = request.with_script_fetch_metadata(
- moli_fetch::ScriptFetchRequestMetadata {
- document_referrer_policy: Some(referrer_policy),
- ..moli_fetch::ScriptFetchRequestMetadata::default()
- },
- );
- }
- if let Some(auth) = auth {
- request = request.with_auth(auth.into());
- }
- request
- });
+ let request = Request::new_browser_bytes(
+ &method,
+ resolved_url.as_str(),
+ body,
+ headers,
+ moli_url::WebOrigin::from_url(&document_url),
+ )
+ .map(|request| {
+ let mut request = request
+ .with_initiator_url(&document_url)
+ .with_credentials_mode(credentials_mode)
+ .with_network_partition_key(network_partition_key.clone())
+ .with_browser_request_metadata(BrowserRequestMetadata::Xhr);
+ if let Some(referrer_policy) = referrer_policy {
+ request =
+ request.with_script_fetch_metadata(moli_fetch::ScriptFetchRequestMetadata {
+ document_referrer_policy: Some(referrer_policy),
+ ..moli_fetch::ScriptFetchRequestMetadata::default()
+ });
+ }
+ if let Some(auth) = auth {
+ request = request.with_auth(auth.into());
+ }
+ request
+ });
let (result, network_request_headers) = match request {
Ok(request)
@@ -2042,6 +2056,13 @@ pub(in crate::worker) fn worker_fetch_callback<'s>(
return;
}
+ if let Err(message) = moli_fetch::FetchUrlList::new(&resolved_url, &[])
+ .validate_request_mode(request_mode, &moli_url::WebOrigin::from_url(&document_url))
+ {
+ rv.set(make_rejected_promise(scope, &message).into());
+ return;
+ }
+
if worker_url_blocked(&blocked_url_patterns, &resolved_url) {
let message = BLOCKED_BY_CLIENT_ERROR_TEXT.to_owned();
record_worker_subresource_failure(
diff --git a/moli-renderer-v8/src/worker/global_scope/import_scripts.rs b/moli-renderer-v8/src/worker/global_scope/import_scripts.rs
index 05525c68c..a4babea41 100644
--- a/moli-renderer-v8/src/worker/global_scope/import_scripts.rs
+++ b/moli-renderer-v8/src/worker/global_scope/import_scripts.rs
@@ -158,7 +158,9 @@ pub(super) fn fetch_worker_import_source_blocking(
.with_network_partition_key(network_partition_key);
let request_initiator_url = initiator_url.clone();
if let Some(ref initiator_url) = request_initiator_url {
- request = request.with_initiator_url(initiator_url);
+ request = request
+ .with_initiator_url(initiator_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(initiator_url));
}
if let Some(referrer_policy) = referrer_policy {
request = request.with_script_fetch_metadata(moli_fetch::ScriptFetchRequestMetadata {
diff --git a/moli-renderer-v8/src/worker/global_scope/xhr.rs b/moli-renderer-v8/src/worker/global_scope/xhr.rs
index 5ade730a1..78eb73246 100644
--- a/moli-renderer-v8/src/worker/global_scope/xhr.rs
+++ b/moli-renderer-v8/src/worker/global_scope/xhr.rs
@@ -544,6 +544,7 @@ fn send_synchronous_worker_xhr(
let mut request = request
.with_page_network_policy()
.with_initiator_url(&prepared.document_url)
+ .with_request_origin(moli_url::WebOrigin::from_url(&prepared.document_url))
.with_credentials_mode(prepared.credentials_mode)
.with_network_partition_key(state.borrow().network_partition_key.clone())
.with_browser_request_metadata(BrowserRequestMetadata::Xhr);
diff --git a/moli-renderer-v8/src/worker/thread/mod.rs b/moli-renderer-v8/src/worker/thread/mod.rs
index b381814ff..6c8974234 100644
--- a/moli-renderer-v8/src/worker/thread/mod.rs
+++ b/moli-renderer-v8/src/worker/thread/mod.rs
@@ -665,6 +665,7 @@ fn start_worker_module_graph_fetch(
}
fetch_request = fetch_request
.with_initiator_url(request.initiator_url())
+ .with_request_origin(moli_url::WebOrigin::from_url(request.initiator_url()))
.with_credentials_mode(request.credentials_mode());
let requested_url = request.url().clone();
let request_initiator_url = request.initiator_url().clone();
diff --git a/moli-url/src/origin.rs b/moli-url/src/origin.rs
index 0820f7d52..b8ab25a8e 100644
--- a/moli-url/src/origin.rs
+++ b/moli-url/src/origin.rs
@@ -24,6 +24,12 @@ pub enum WebOrigin {
}
impl WebOrigin {
+ /// Reads a captured environment origin; `null` remains opaque rather than
+ /// being replaced with the environment's URL or its URL-resolution base.
+ pub fn from_serialized(origin: &str) -> Self {
+ Url::parse(origin).map_or(Self::Opaque, |url| Self::from_url(&url))
+ }
+
pub fn from_url(url: &Url) -> Self {
let Some(origin_url) = tuple_origin_url(url) else {
return Self::Opaque;
@@ -65,6 +71,18 @@ impl WebOrigin {
}
}
+impl From<&Url> for WebOrigin {
+ fn from(url: &Url) -> Self {
+ Self::from_url(url)
+ }
+}
+
+impl From<&WebOrigin> for WebOrigin {
+ fn from(origin: &WebOrigin) -> Self {
+ origin.clone()
+ }
+}
+
pub fn tuple_origin_url(url: &Url) -> Option<Cow<'_, Url>> {
let origin_url = if url.scheme() == "blob" {
let inner = Url::parse(url.path()).ok()?;