mirror of
https://github.com/lexmount/moli.git
synced 2026-11-18 16:08:37 +00:00
fix(network): complete web-security resource and worker semantics
This commit is contained in:
@@ -1139,6 +1139,48 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn disabled_web_security_preserves_renderer_resource_and_form_origins() {
|
||||
let mut config = FetchConfig::default();
|
||||
config.set_web_security_disabled(true);
|
||||
let origin = moli_url::WebOrigin::from_url(&url("https://page.test/"));
|
||||
for metadata in [
|
||||
BrowserRequestMetadata::Style,
|
||||
BrowserRequestMetadata::Image,
|
||||
BrowserRequestMetadata::Font,
|
||||
BrowserRequestMetadata::SharedWorker,
|
||||
BrowserRequestMetadata::ServiceWorker,
|
||||
BrowserRequestMetadata::Fetch,
|
||||
BrowserRequestMetadata::Xhr,
|
||||
] {
|
||||
let request = Request::new("GET", "https://resource.test/item", None, Vec::new())
|
||||
.unwrap()
|
||||
.with_request_origin(origin.clone())
|
||||
.with_request_mode(RequestMode::Cors)
|
||||
.with_browser_request_metadata(metadata);
|
||||
let headers = outgoing_request_headers_for_url(&config, &request, &request.url, None);
|
||||
let expected = (!matches!(
|
||||
metadata,
|
||||
BrowserRequestMetadata::Fetch | BrowserRequestMetadata::Xhr
|
||||
))
|
||||
.then_some("https://page.test");
|
||||
assert_eq!(
|
||||
header_value(&headers, "origin").as_deref(),
|
||||
expected,
|
||||
"{metadata:?}"
|
||||
);
|
||||
}
|
||||
let request = Request::new("POST", "https://resource.test/form", None, Vec::new())
|
||||
.unwrap()
|
||||
.with_request_origin(origin)
|
||||
.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("https://page.test")
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn browser_subresource_origin_header_is_method_mode_and_origin_aware() {
|
||||
struct Case {
|
||||
|
||||
+13
-14
@@ -255,6 +255,7 @@ pub enum BrowserRequestMetadata {
|
||||
Ping,
|
||||
Script,
|
||||
SharedWorker,
|
||||
ServiceWorker,
|
||||
Style,
|
||||
StyleModule,
|
||||
TextTrack,
|
||||
@@ -276,6 +277,7 @@ impl BrowserRequestMetadata {
|
||||
Self::Manifest => "manifest",
|
||||
Self::Script => "script",
|
||||
Self::SharedWorker => "sharedworker",
|
||||
Self::ServiceWorker => "serviceworker",
|
||||
Self::Worker => "worker",
|
||||
Self::Style | Self::StyleModule => "style",
|
||||
Self::TextTrack => "track",
|
||||
@@ -1168,22 +1170,19 @@ impl Request {
|
||||
}
|
||||
|
||||
pub(crate) fn origin_header_value(&self, request_url: &Url, disabled: bool) -> Option<String> {
|
||||
// Module/script loaders supply their CORS Origin in the renderer even
|
||||
// when the network CORS loader is bypassed. Fetch and XHR do not.
|
||||
// Resource loaders set their CORS Origin before the network loader.
|
||||
// Fetch/XHR rely on the network CORS loader; form navigation also
|
||||
// supplies Origin independently of that loader.
|
||||
let renderer_cors_origin = self.request_mode == RequestMode::Cors
|
||||
&& matches!(
|
||||
self.browser_request_metadata,
|
||||
Some(
|
||||
BrowserRequestMetadata::Script
|
||||
| BrowserRequestMetadata::Worker
|
||||
| BrowserRequestMetadata::SharedWorker
|
||||
| BrowserRequestMetadata::AudioWorklet
|
||||
| BrowserRequestMetadata::JsonModule
|
||||
| BrowserRequestMetadata::TextModule
|
||||
| BrowserRequestMetadata::StyleModule
|
||||
&& self.browser_request_metadata.is_some_and(|metadata| {
|
||||
!matches!(
|
||||
metadata,
|
||||
BrowserRequestMetadata::Fetch
|
||||
| BrowserRequestMetadata::Xhr
|
||||
| BrowserRequestMetadata::EventSource
|
||||
)
|
||||
);
|
||||
if disabled && !renderer_cors_origin {
|
||||
});
|
||||
if disabled && self.request_mode != RequestMode::Navigate && !renderer_cors_origin {
|
||||
return None;
|
||||
}
|
||||
self.request_origin()?;
|
||||
|
||||
@@ -3409,6 +3409,7 @@ fn request_fetch_load_priority(request: &Request) -> crate::ResourceLoadPriority
|
||||
| crate::BrowserRequestMetadata::Ping
|
||||
| crate::BrowserRequestMetadata::Script
|
||||
| crate::BrowserRequestMetadata::SharedWorker
|
||||
| crate::BrowserRequestMetadata::ServiceWorker
|
||||
| crate::BrowserRequestMetadata::Worker
|
||||
| crate::BrowserRequestMetadata::Style
|
||||
| crate::BrowserRequestMetadata::TextTrack
|
||||
|
||||
@@ -3,24 +3,39 @@ use super::*;
|
||||
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn worker_fetch_and_xhr_settle_intercepted_responses_with_their_instance_policy() {
|
||||
check_worker_intercepted_policy(false).await;
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn shared_worker_fetch_and_xhr_settle_intercepted_responses_with_their_instance_policy() {
|
||||
check_worker_intercepted_policy(true).await;
|
||||
}
|
||||
|
||||
async fn check_worker_intercepted_policy(shared: bool) {
|
||||
let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
|
||||
let origin = format!("http://{}", listener.local_addr().unwrap());
|
||||
let server = tokio::spawn(async move {
|
||||
axum::serve(listener, Router::new()
|
||||
.route("/page", get(|| async { axum::response::Html("<!doctype html>worker security") }))
|
||||
.route("/worker.js", get(|| async { ([("content-type", "text/javascript")], r#"
|
||||
onmessage = async ({data:{url,api}}) => {
|
||||
async function receive({data:{url,api}}, reply) {
|
||||
if (api === 'xhr') {
|
||||
const xhr = new XMLHttpRequest(); xhr.open('GET',url);
|
||||
xhr.onload = () => postMessage({body:xhr.responseText,header:xhr.getResponseHeader('x-probe')});
|
||||
xhr.onerror = () => postMessage({error:'NetworkError'}); xhr.send();
|
||||
xhr.onload = () => reply({body:xhr.responseText,header:xhr.getResponseHeader('x-probe')});
|
||||
xhr.onerror = () => reply({error:'NetworkError'}); xhr.send();
|
||||
} else {
|
||||
try { const response = await fetch(url); const copy=response.clone();
|
||||
postMessage({body:await response.text(),header:response.headers.get('x-probe'),
|
||||
reply({body:await response.text(),header:response.headers.get('x-probe'),
|
||||
type:response.type,clone:await copy.text()});
|
||||
} catch(error) { postMessage({error:error.name}); }
|
||||
} catch(error) { reply({error:error.name}); }
|
||||
}
|
||||
}; postMessage('ready');
|
||||
}
|
||||
onmessage = event => receive(event, value => postMessage(value));
|
||||
onconnect = ({ports:[port]}) => {
|
||||
port.onmessage = event => receive(event, value => port.postMessage(value));
|
||||
port.start(); port.postMessage('ready');
|
||||
};
|
||||
if (typeof SharedWorkerGlobalScope === 'undefined' || !(self instanceof SharedWorkerGlobalScope)) postMessage('ready');
|
||||
"#) }))
|
||||
.fallback(get(|| async { ([("x-probe","visible")],"network") })))
|
||||
.await.unwrap();
|
||||
@@ -33,18 +48,24 @@ async fn worker_fetch_and_xhr_settle_intercepted_responses_with_their_instance_p
|
||||
enable_runtime_async(&mut ctx, "SID-1", 54_000).await;
|
||||
command(&mut ctx, 54_001, "Network.enable", json!({})).await;
|
||||
let ready = command(&mut ctx,54_002,"Runtime.evaluate",json!({
|
||||
"expression":"new Promise(resolve=>{globalThis.policyWorker=new Worker('/worker.js');policyWorker.onmessage=e=>resolve(e.data);})",
|
||||
"expression":format!("new Promise(resolve=>{{globalThis.policyWorker=new {}('/worker.js');globalThis.policyPort={};policyPort.onmessage=e=>resolve(e.data);{};}})",
|
||||
if shared {"SharedWorker"} else {"Worker"},
|
||||
if shared {"policyWorker.port"} else {"policyWorker"},
|
||||
if shared {"policyPort.start()"} else {"void 0"}),
|
||||
"awaitPromise":true,"returnByValue":true
|
||||
})).await;
|
||||
assert_eq!(ready["result"]["result"]["value"], "ready");
|
||||
let mut index = 0;
|
||||
for api in ["fetch", "xhr"] {
|
||||
for (stage, fulfill) in [
|
||||
("Request", false),
|
||||
("Request", true),
|
||||
("Response", false),
|
||||
("Response", true),
|
||||
for (stage, action) in [
|
||||
("Request", "continue"),
|
||||
("Request", "fulfill"),
|
||||
("Response", "continue"),
|
||||
("Response", "fulfill"),
|
||||
("Response", "fail"),
|
||||
] {
|
||||
let fulfill = action == "fulfill";
|
||||
let failed = action == "fail";
|
||||
index += 1;
|
||||
let id = 54_010 + index * 5;
|
||||
let url = format!(
|
||||
@@ -59,11 +80,14 @@ async fn worker_fetch_and_xhr_settle_intercepted_responses_with_their_instance_p
|
||||
)
|
||||
.await;
|
||||
command(&mut ctx,id+1,"Runtime.evaluate",json!({"expression":format!(
|
||||
"globalThis.policyResult=new Promise(resolve=>{{policyWorker.onmessage=e=>resolve(e.data);policyWorker.postMessage({{url:{url:?},api:{api:?}}});}});'started'"
|
||||
"globalThis.policyResult=new Promise(resolve=>{{policyPort.onmessage=e=>resolve(e.data);policyPort.postMessage({{url:{url:?},api:{api:?}}});}});'started'"
|
||||
)})).await;
|
||||
let pause = wait_for_request_paused(&mut ctx, &url, "worker policy pause").await;
|
||||
let mut params = json!({"requestId":pause["params"]["requestId"]});
|
||||
let method = if fulfill {
|
||||
let method = if failed {
|
||||
params["errorReason"] = json!("Aborted");
|
||||
"Fetch.failRequest"
|
||||
} else if fulfill {
|
||||
params["responseCode"] = json!(200);
|
||||
params["responseHeaders"] = json!([{"name":"Content-Type","value":"text/plain"},{"name":"X-Probe","value":"replacement"}]);
|
||||
params["body"] = json!("cmVwbGFjZW1lbnQ=");
|
||||
@@ -84,7 +108,7 @@ async fn worker_fetch_and_xhr_settle_intercepted_responses_with_their_instance_p
|
||||
)
|
||||
.await;
|
||||
let value = &response["result"]["result"]["value"];
|
||||
if disabled {
|
||||
if disabled && !failed {
|
||||
assert_eq!(
|
||||
value["body"],
|
||||
if fulfill { "replacement" } else { "network" },
|
||||
@@ -130,7 +154,7 @@ async fn worker_fetch_and_xhr_settle_intercepted_responses_with_their_instance_p
|
||||
assert_eq!(terminals.len(), 1, "{api}/{stage}: {terminals:?}");
|
||||
assert_eq!(
|
||||
terminals[0]["method"],
|
||||
if disabled {
|
||||
if disabled && !failed {
|
||||
"Network.loadingFinished"
|
||||
} else {
|
||||
"Network.loadingFailed"
|
||||
@@ -142,7 +166,7 @@ async fn worker_fetch_and_xhr_settle_intercepted_responses_with_their_instance_p
|
||||
&mut ctx,
|
||||
54_100,
|
||||
"Runtime.evaluate",
|
||||
json!({"expression":"policyWorker.terminate()"}),
|
||||
json!({"expression":if shared {"policyPort.close()"} else {"policyWorker.terminate()"}}),
|
||||
)
|
||||
.await;
|
||||
}
|
||||
|
||||
@@ -839,7 +839,12 @@ fn materialize_nested_worker_script_source(
|
||||
.with_page_network_policy()
|
||||
.with_network_partition_key(context.network_policy.network_partition_key.clone())
|
||||
.with_initiator_url(&context.base_url)
|
||||
.with_request_origin(moli_url::WebOrigin::from_url(&context.base_url));
|
||||
.with_request_origin(moli_url::WebOrigin::from_serialized(
|
||||
context
|
||||
.creator_message_security
|
||||
.serialized_origin()
|
||||
.unwrap_or("null"),
|
||||
));
|
||||
let response = loader
|
||||
.request_client()
|
||||
.fetch_text_for_worker_blocking_boundary(request)
|
||||
|
||||
@@ -51,8 +51,10 @@ pub(crate) fn start_text_track_resource_fetch(
|
||||
.filter(|element| element.is_html_element("audio") || element.is_html_element("video"))
|
||||
.context("media element is unavailable")?;
|
||||
let (request_mode, credentials_mode) = text_track_cross_origin_request_modes(media);
|
||||
moli_fetch::FetchUrlList::new(&request_url, &[])
|
||||
.validate_request_mode(request_mode, &environment.request_origin)?;
|
||||
if !resource_loader.request_client().web_security_disabled() {
|
||||
moli_fetch::FetchUrlList::new(&request_url, &[])
|
||||
.validate_request_mode(request_mode, &environment.request_origin)?;
|
||||
}
|
||||
if host
|
||||
.check_top_document_subresource_csp(scope, &request_url, DocumentSubresourceCspKind::Media)
|
||||
.blocks_request()
|
||||
|
||||
@@ -172,22 +172,25 @@ fn apply_service_worker_synthetic_redirect(
|
||||
.cloned()
|
||||
.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.head.status,
|
||||
headers: response.head.headers,
|
||||
network_extra_info_available: false,
|
||||
request_extra_info: None,
|
||||
dispatched_request: 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,
|
||||
})
|
||||
.follow_redirect_with_web_security(
|
||||
moli_fetch::RedirectInfo {
|
||||
source: moli_fetch::RedirectSource::ServiceWorker,
|
||||
from_url,
|
||||
to_url: next_url.clone(),
|
||||
status: response.head.status,
|
||||
headers: response.head.headers,
|
||||
network_extra_info_available: false,
|
||||
request_extra_info: None,
|
||||
dispatched_request: 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.request_client.web_security_disabled(),
|
||||
)
|
||||
.map_err(|error| error.to_string())?;
|
||||
job.cors_preflight_request_headers = job.request.request_headers.to_byte_strings();
|
||||
Ok(())
|
||||
|
||||
@@ -611,6 +611,7 @@ fn worker_has_pending_async(state: &Rc<RefCell<WorkerGlobalState>>) -> bool {
|
||||
fn start_worker_module_graph_fetch(
|
||||
request: WorkerModuleGraphFetchRequest,
|
||||
loader: WorkerResourceLoader,
|
||||
worker_destination: moli_fetch::BrowserRequestMetadata,
|
||||
worker_origin: moli_url::WebOrigin,
|
||||
outside_origin: Option<moli_url::WebOrigin>,
|
||||
network_partition_key: Option<String>,
|
||||
@@ -673,7 +674,10 @@ fn start_worker_module_graph_fetch(
|
||||
);
|
||||
return;
|
||||
}
|
||||
let browser_request_metadata = request.browser_request_metadata();
|
||||
let browser_request_metadata = match request.browser_request_metadata() {
|
||||
moli_fetch::BrowserRequestMetadata::Worker => worker_destination,
|
||||
metadata => metadata,
|
||||
};
|
||||
let mut fetch_request =
|
||||
match moli_fetch::Request::new("GET", request.url().as_str(), None, vec![]) {
|
||||
Ok(request) => request
|
||||
@@ -868,6 +872,13 @@ fn flush_worker_module_fetches(
|
||||
start_worker_module_graph_fetch(
|
||||
request,
|
||||
state.borrow().loader.clone(),
|
||||
match state.borrow().global_kind {
|
||||
WorkerGlobalKind::Dedicated { .. } => moli_fetch::BrowserRequestMetadata::Worker,
|
||||
WorkerGlobalKind::Shared { .. } => moli_fetch::BrowserRequestMetadata::SharedWorker,
|
||||
WorkerGlobalKind::Service { .. } => {
|
||||
moli_fetch::BrowserRequestMetadata::ServiceWorker
|
||||
}
|
||||
},
|
||||
state.borrow().request_origin(),
|
||||
state.borrow().module_static_import_origin.clone(),
|
||||
state.borrow().network_partition_key.clone(),
|
||||
|
||||
Reference in New Issue
Block a user