Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update FetchTaskTarget to propagate CSP violations. (#36409)

Browse source 
It also updates the FetchResponseListener to process CSP violations to
ensure that iframe elements (amongst others) properly generate the CSP
events. These iframe elements are used in the Trusted Types tests
themselves and weren't propagating the violations before.

However, the tests themselves are still not passing since they also use
Websockets, which currently aren't using the fetch machinery itself.
That is fixed as part of [1].

[1]: https://github.com/servo/servo/issues/35028

---------

Signed-off-by: Tim van der Lippe <tvanderlippe@gmail.com>
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
Co-authored-by: Josh Matthews <josh@joshmatthews.net>
This commit is contained in:
Tim van der Lippe 2025-04-13 22:54:59 +02:00 • committed by GitHub
parent 5d84acc06e
commit 85e4a2b5c7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
146 changed files with 511 additions and 612 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/shared/net/lib.rs
View file

@ -11,6 +11,7 @@ use std::thread;
use base::cross_process_instant::CrossProcessInstant;
use base::id::HistoryStateId;
use content_security_policy::{self as csp};
use cookie::Cookie;
use crossbeam_channel::{Receiver, Sender, unbounded};
use headers::{ContentType, HeaderMapExt, ReferrerPolicy as ReferrerPolicyHeader};
@ -198,6 +199,7 @@ pub enum FetchResponseMsg {
ProcessResponse(RequestId, Result<FetchMetadata, NetworkError>),
ProcessResponseChunk(RequestId, Vec<u8>),
ProcessResponseEOF(RequestId, Result<ResourceFetchTiming, NetworkError>),
ProcessCspViolations(RequestId, Vec<csp::Violation>),
}
impl FetchResponseMsg {
@ -207,7 +209,8 @@ impl FetchResponseMsg {
FetchResponseMsg::ProcessRequestEOF(id) |
FetchResponseMsg::ProcessResponse(id, ..) |
FetchResponseMsg::ProcessResponseChunk(id, ..) |
FetchResponseMsg::ProcessResponseEOF(id, ..) => *id,
FetchResponseMsg::ProcessResponseEOF(id, ..) |
FetchResponseMsg::ProcessCspViolations(id, ..) => *id,
}
}
}
@ -235,6 +238,8 @@ pub trait FetchTaskTarget {
///
/// Fired when the response is fully fetched
fn process_response_eof(&mut self, request: &Request, response: &Response);
fn process_csp_violations(&mut self, request: &Request, violations: Vec<csp::Violation>);
}
#[derive(Clone, Debug, Deserialize, Serialize)]
@ -282,6 +287,7 @@ pub trait FetchResponseListener {
fn resource_timing(&self) -> &ResourceFetchTiming;
fn resource_timing_mut(&mut self) -> &mut ResourceFetchTiming;
fn submit_resource_timing(&mut self);
fn process_csp_violations(&mut self, request_id: RequestId, violations: Vec<csp::Violation>);
}
impl FetchTaskTarget for IpcSender<FetchResponseMsg> {
@ -313,6 +319,12 @@ impl FetchTaskTarget for IpcSender<FetchResponseMsg> {
let _ = self.send(FetchResponseMsg::ProcessResponseEOF(request.id, payload));
}
fn process_csp_violations(&mut self, request: &Request, violations: Vec<csp::Violation>) {
let _ = self.send(FetchResponseMsg::ProcessCspViolations(
request.id, violations,
));
}
}
/// A fetch task that discards all data it's sent,
@ -326,6 +338,7 @@ impl FetchTaskTarget for DiscardFetch {
fn process_response(&mut self, _: &Request, _: &Response) {}
fn process_response_chunk(&mut self, _: &Request, _: Vec<u8>) {}
fn process_response_eof(&mut self, _: &Request, _: &Response) {}
fn process_csp_violations(&mut self, _: &Request, _: Vec<csp::Violation>) {}
}
pub trait Action<Listener> {
@ -366,6 +379,9 @@ impl<T: FetchResponseListener> Action<T> for FetchResponseMsg {
Err(e) => listener.process_response_eof(request_id, Err(e)),
}
},
FetchResponseMsg::ProcessCspViolations(request_id, violations) => {
listener.process_csp_violations(request_id, violations)
},
}
}
}
@ -455,6 +471,7 @@ pub enum WebSocketDomAction {
#[derive(Debug, Deserialize, Serialize)]
pub enum WebSocketNetworkEvent {
ReportCSPViolations(Vec<csp::Violation>),
ConnectionEstablished { protocol_in_use: Option<String> },
MessageReceived(MessageData),
Close(Option<u16>, String),