mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Implement WebResourceRequested Event. (#34961)
* Implement WebResourceRequested Event on the Embedder Layer Signed-off-by: zhuhaichao518 <zhuhaichao518@gmail.com> * fix and add test Signed-off-by: zhuhaichao518 <zhuhaichao518@gmail.com> * resolve comments Signed-off-by: zhuhaichao518 <zhuhaichao518@gmail.com> * remove sample code in webview Signed-off-by: zhuhaichao518 <zhuhaichao518@gmail.com> * remove typo Signed-off-by: zhuhaichao518 <zhuhaichao518@gmail.com> * ./mach format Signed-off-by: zhuhaichao518 <zhuhaichao518@gmail.com> * fix test fail caused by interception message Signed-off-by: zhuhaichao518 <zhuhaichao518@gmail.com> * update impl for is_for_main_frame Signed-off-by: zhuhaichao518 <zhuhaichao518@gmail.com> --------- Signed-off-by: zhuhaichao518 <zhuhaichao518@gmail.com>
This commit is contained in:
zhuhaichao518
GitHub
parent
7256590599
commit
a1326a7cf6
13 changed files with 364 additions and 9 deletions
|
|
@ -30,6 +30,7 @@ use net::fetch::methods::{self, FetchContext};
|
|||
use net::filemanager_thread::FileManager;
|
||||
use net::hsts::HstsEntry;
|
||||
use net::protocols::ProtocolRegistry;
|
||||
use net::request_intercepter::RequestIntercepter;
|
||||
use net::resource_thread::CoreResourceThreadPool;
|
||||
use net_traits::filemanager_thread::FileTokenCheck;
|
||||
use net_traits::http_status::HttpStatus;
|
||||
|
|
@ -47,8 +48,9 @@ use uuid::Uuid;
|
|||
|
||||
use crate::http_loader::{expect_devtools_http_request, expect_devtools_http_response};
|
||||
use crate::{
|
||||
create_embedder_proxy, create_http_state, fetch, fetch_with_context, fetch_with_cors_cache,
|
||||
make_body, make_server, make_ssl_server, new_fetch_context, DEFAULT_USER_AGENT,
|
||||
create_embedder_proxy, create_embedder_proxy_and_receiver, create_http_state, fetch,
|
||||
fetch_with_context, fetch_with_cors_cache, make_body, make_server, make_ssl_server,
|
||||
new_fetch_context, DEFAULT_USER_AGENT,
|
||||
};
|
||||
|
||||
// TODO write a struct that impls Handler for storing test values
|
||||
|
|
@ -695,15 +697,18 @@ fn test_fetch_with_hsts() {
|
|||
|
||||
let (server, url) = make_ssl_server(handler);
|
||||
|
||||
let embedder_proxy = create_embedder_proxy();
|
||||
|
||||
let mut context = FetchContext {
|
||||
state: Arc::new(create_http_state(None)),
|
||||
user_agent: DEFAULT_USER_AGENT.into(),
|
||||
devtools_chan: None,
|
||||
filemanager: Arc::new(Mutex::new(FileManager::new(
|
||||
create_embedder_proxy(),
|
||||
embedder_proxy.clone(),
|
||||
Weak::new(),
|
||||
))),
|
||||
file_token: FileTokenCheck::NotRequired,
|
||||
request_intercepter: Arc::new(Mutex::new(RequestIntercepter::new(embedder_proxy))),
|
||||
cancellation_listener: Arc::new(Default::default()),
|
||||
timing: ServoArc::new(Mutex::new(ResourceFetchTiming::new(
|
||||
ResourceTimingType::Navigation,
|
||||
|
|
@ -752,15 +757,18 @@ fn test_load_adds_host_to_hsts_list_when_url_is_https() {
|
|||
let (server, mut url) = make_ssl_server(handler);
|
||||
url.as_mut_url().set_scheme("https").unwrap();
|
||||
|
||||
let embedder_proxy = create_embedder_proxy();
|
||||
|
||||
let mut context = FetchContext {
|
||||
state: Arc::new(create_http_state(None)),
|
||||
user_agent: DEFAULT_USER_AGENT.into(),
|
||||
devtools_chan: None,
|
||||
filemanager: Arc::new(Mutex::new(FileManager::new(
|
||||
create_embedder_proxy(),
|
||||
embedder_proxy.clone(),
|
||||
Weak::new(),
|
||||
))),
|
||||
file_token: FileTokenCheck::NotRequired,
|
||||
request_intercepter: Arc::new(Mutex::new(RequestIntercepter::new(embedder_proxy))),
|
||||
cancellation_listener: Arc::new(Default::default()),
|
||||
timing: ServoArc::new(Mutex::new(ResourceFetchTiming::new(
|
||||
ResourceTimingType::Navigation,
|
||||
|
|
@ -811,15 +819,18 @@ fn test_fetch_self_signed() {
|
|||
let (server, mut url) = make_ssl_server(handler);
|
||||
url.as_mut_url().set_scheme("https").unwrap();
|
||||
|
||||
let embedder_proxy = create_embedder_proxy();
|
||||
|
||||
let mut context = FetchContext {
|
||||
state: Arc::new(create_http_state(None)),
|
||||
user_agent: DEFAULT_USER_AGENT.into(),
|
||||
devtools_chan: None,
|
||||
filemanager: Arc::new(Mutex::new(FileManager::new(
|
||||
create_embedder_proxy(),
|
||||
embedder_proxy.clone(),
|
||||
Weak::new(),
|
||||
))),
|
||||
file_token: FileTokenCheck::NotRequired,
|
||||
request_intercepter: Arc::new(Mutex::new(RequestIntercepter::new(embedder_proxy))),
|
||||
cancellation_listener: Arc::new(Default::default()),
|
||||
timing: ServoArc::new(Mutex::new(ResourceFetchTiming::new(
|
||||
ResourceTimingType::Navigation,
|
||||
|
|
@ -1320,3 +1331,102 @@ fn test_fetch_with_devtools() {
|
|||
assert_eq!(devhttprequest, httprequest);
|
||||
assert_eq!(devhttpresponse, httpresponse);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_fetch_request_intercepted() {
|
||||
static BODY_PART1: &[u8] = b"Request is";
|
||||
static BODY_PART2: &[u8] = b" intercepted";
|
||||
static EXPECTED_BODY: &[u8] = b"Request is intercepted";
|
||||
static HEADERNAME: &str = "custom-header";
|
||||
static HEADERVALUE: &str = "custom-value";
|
||||
static STATUS_MESSAGE: &[u8] = b"custom status message";
|
||||
|
||||
let (embedder_proxy, mut embedder_receiver) = create_embedder_proxy_and_receiver();
|
||||
|
||||
std::thread::spawn(move || {
|
||||
let (_browser_context_id, embedder_msg) = embedder_receiver.recv_embedder_msg();
|
||||
match embedder_msg {
|
||||
embedder_traits::EmbedderMsg::WebResourceRequested(
|
||||
web_resource_request,
|
||||
response_sender,
|
||||
) => {
|
||||
let mut headers = HeaderMap::new();
|
||||
headers.insert(
|
||||
HeaderName::from_static(HEADERNAME),
|
||||
HeaderValue::from_static(HEADERVALUE),
|
||||
);
|
||||
let response =
|
||||
embedder_traits::WebResourceResponse::new(web_resource_request.url.clone())
|
||||
.headers(headers)
|
||||
.status_code(StatusCode::FOUND)
|
||||
.status_message(STATUS_MESSAGE.to_vec());
|
||||
let msg = embedder_traits::WebResourceResponseMsg::Start(response);
|
||||
let _ = response_sender.send(msg);
|
||||
let msg2 = embedder_traits::WebResourceResponseMsg::Body(
|
||||
embedder_traits::HttpBodyData::Chunk(BODY_PART1.to_vec()),
|
||||
);
|
||||
let _ = response_sender.send(msg2);
|
||||
let msg3 = embedder_traits::WebResourceResponseMsg::Body(
|
||||
embedder_traits::HttpBodyData::Chunk(BODY_PART2.to_vec()),
|
||||
);
|
||||
let _ = response_sender.send(msg3);
|
||||
let _ = response_sender.send(embedder_traits::WebResourceResponseMsg::Body(
|
||||
embedder_traits::HttpBodyData::Done,
|
||||
));
|
||||
},
|
||||
_ => unreachable!(),
|
||||
}
|
||||
});
|
||||
|
||||
let mut context = FetchContext {
|
||||
state: Arc::new(create_http_state(None)),
|
||||
user_agent: DEFAULT_USER_AGENT.into(),
|
||||
devtools_chan: None,
|
||||
filemanager: Arc::new(Mutex::new(FileManager::new(
|
||||
embedder_proxy.clone(),
|
||||
Weak::new(),
|
||||
))),
|
||||
file_token: FileTokenCheck::NotRequired,
|
||||
request_intercepter: Arc::new(Mutex::new(RequestIntercepter::new(embedder_proxy))),
|
||||
cancellation_listener: Arc::new(Default::default()),
|
||||
timing: ServoArc::new(Mutex::new(ResourceFetchTiming::new(
|
||||
ResourceTimingType::Navigation,
|
||||
))),
|
||||
protocols: Arc::new(ProtocolRegistry::default()),
|
||||
};
|
||||
|
||||
let url = ServoUrl::parse("http://www.example.org").unwrap();
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.build();
|
||||
let response = fetch_with_context(request, &mut context);
|
||||
|
||||
assert!(
|
||||
response
|
||||
.headers
|
||||
.get(HEADERNAME)
|
||||
.map(|v| v == HEADERVALUE)
|
||||
.unwrap_or(false),
|
||||
"The custom header does not exist or has an incorrect value!"
|
||||
);
|
||||
|
||||
let body = response.body.lock().unwrap();
|
||||
match &*body {
|
||||
ResponseBody::Done(data) => {
|
||||
assert_eq!(data, &EXPECTED_BODY, "Body content does not match");
|
||||
},
|
||||
_ => panic!("Expected ResponseBody::Done, but got {:?}", *body),
|
||||
}
|
||||
|
||||
assert_eq!(
|
||||
response.status.code(),
|
||||
StatusCode::FOUND,
|
||||
"Status code does not match!"
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
response.status.message(),
|
||||
STATUS_MESSAGE,
|
||||
"The status_message was not set correctly!"
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ use net::fetch::cors_cache::CorsCache;
|
|||
use net::fetch::methods::{self, FetchContext};
|
||||
use net::filemanager_thread::FileManager;
|
||||
use net::protocols::ProtocolRegistry;
|
||||
use net::request_intercepter::RequestIntercepter;
|
||||
use net::resource_thread::CoreResourceThreadPool;
|
||||
use net::test::HttpState;
|
||||
use net_traits::filemanager_thread::FileTokenCheck;
|
||||
|
|
@ -128,7 +129,7 @@ fn receive_credential_prompt_msgs(
|
|||
username: Option<String>,
|
||||
password: Option<String>,
|
||||
) -> std::thread::JoinHandle<()> {
|
||||
std::thread::spawn(move || {
|
||||
std::thread::spawn(move || loop {
|
||||
let (_browser_context_id, embedder_msg) = embedder_receiver.recv_embedder_msg();
|
||||
match embedder_msg {
|
||||
embedder_traits::EmbedderMsg::Prompt(prompt_definition, _prompt_origin) => {
|
||||
|
|
@ -140,7 +141,9 @@ fn receive_credential_prompt_msgs(
|
|||
},
|
||||
_ => unreachable!(),
|
||||
}
|
||||
break;
|
||||
},
|
||||
embedder_traits::EmbedderMsg::WebResourceRequested(_, _) => {},
|
||||
_ => unreachable!(),
|
||||
}
|
||||
})
|
||||
|
|
@ -179,10 +182,11 @@ fn new_fetch_context(
|
|||
user_agent: DEFAULT_USER_AGENT.into(),
|
||||
devtools_chan: dc.map(|dc| Arc::new(Mutex::new(dc))),
|
||||
filemanager: Arc::new(Mutex::new(FileManager::new(
|
||||
sender,
|
||||
sender.clone(),
|
||||
pool_handle.unwrap_or_else(|| Weak::new()),
|
||||
))),
|
||||
file_token: FileTokenCheck::NotRequired,
|
||||
request_intercepter: Arc::new(Mutex::new(RequestIntercepter::new(sender))),
|
||||
cancellation_listener: Arc::new(Default::default()),
|
||||
timing: ServoArc::new(Mutex::new(ResourceFetchTiming::new(
|
||||
ResourceTimingType::Navigation,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue