Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make fetch take a &Request

Browse source
This commit is contained in:
Anthony Ramine 2017-04-01 00:28:10 +02:00
parent 9601a66b60
commit f42a63baea
7 changed files with 87 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/unit/net/data_loader.rs
View file

@ -21,7 +21,7 @@ fn assert_parse(url: &'static str,
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
let response = fetch(request, None);
let response = fetch(&request, None);
match data {
Some(data) => {

63
tests/unit/net/fetch.rs
View file

@ -37,7 +37,6 @@ use servo_config::resource_files::resources_dir_path;
use servo_url::{ImmutableOrigin, ServoUrl};
use std::fs::File;
use std::io::Read;
use std::rc::Rc;
use std::sync::{Arc, Mutex};
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::mpsc::{Sender, channel};
@ -57,7 +56,7 @@ fn test_fetch_response_is_not_network_error() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&request, None);
let _ = server.close();
if fetch_response.is_network_error() {
@ -71,7 +70,7 @@ fn test_fetch_on_bad_port_is_network_error() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&request, None);
assert!(fetch_response.is_network_error());
let fetch_error = fetch_response.get_network_error().unwrap();
assert!(fetch_error == &NetworkError::Internal("Request attempted on bad port".into()))
@ -88,7 +87,7 @@ fn test_fetch_response_body_matches_const_message() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&request, None);
let _ = server.close();
assert!(!fetch_response.is_network_error());
@ -108,7 +107,7 @@ fn test_fetch_aboutblank() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&request, None);
assert!(!fetch_response.is_network_error());
assert!(*fetch_response.body.lock().unwrap() == ResponseBody::Done(vec![]));
}
@ -137,7 +136,7 @@ fn test_fetch_blob() {
let request = Request::new(url, Some(Origin::Origin(origin.origin())), false, None);
let fetch_response = fetch_with_context(request, &context);
let fetch_response = fetch_with_context(&request, &context);
assert!(!fetch_response.is_network_error());
@ -162,7 +161,7 @@ fn test_fetch_file() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
let fetch_response = fetch(request, None);
let fetch_response = fetch(&request, None);
assert!(!fetch_response.is_network_error());
assert_eq!(fetch_response.headers.len(), 1);
let content_type: &ContentType = fetch_response.headers.get().unwrap();
@ -187,7 +186,7 @@ fn test_fetch_ftp() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&request, None);
assert!(fetch_response.is_network_error());
}
@ -197,7 +196,7 @@ fn test_fetch_bogus_scheme() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&request, None);
assert!(fetch_response.is_network_error());
}
@ -228,7 +227,7 @@ fn test_cors_preflight_fetch() {
*request.referrer_policy.get_mut() = Some(ReferrerPolicy::Origin);
request.use_cors_preflight = true;
request.mode = RequestMode::CorsMode;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&request, None);
let _ = server.close();
assert!(!fetch_response.is_network_error());
@ -264,11 +263,11 @@ fn test_cors_preflight_cache_fetch() {
*request.referrer.borrow_mut() = Referrer::NoReferrer;
request.use_cors_preflight = true;
request.mode = RequestMode::CorsMode;
let wrapped_request0 = Rc::new(request.clone());
let wrapped_request1 = Rc::new(request);
let wrapped_request0 = request.clone();
let wrapped_request1 = request;
let fetch_response0 = fetch_with_cors_cache(wrapped_request0.clone(), &mut cache);
let fetch_response1 = fetch_with_cors_cache(wrapped_request1.clone(), &mut cache);
let fetch_response0 = fetch_with_cors_cache(&wrapped_request0, &mut cache);
let fetch_response1 = fetch_with_cors_cache(&wrapped_request1, &mut cache);
let _ = server.close();
assert!(!fetch_response0.is_network_error() && !fetch_response1.is_network_error());
@ -277,8 +276,8 @@ fn test_cors_preflight_cache_fetch() {
assert_eq!(1, counter.load(Ordering::SeqCst));
// The entry exists in the CORS-preflight cache
assert_eq!(true, cache.match_method(&*wrapped_request0, Method::Get));
assert_eq!(true, cache.match_method(&*wrapped_request1, Method::Get));
assert_eq!(true, cache.match_method(&wrapped_request0, Method::Get));
assert_eq!(true, cache.match_method(&wrapped_request1, Method::Get));
match *fetch_response0.body.lock().unwrap() {
ResponseBody::Done(ref body) => assert_eq!(&**body, ACK),
@ -314,7 +313,7 @@ fn test_cors_preflight_fetch_network_error() {
*request.referrer.borrow_mut() = Referrer::NoReferrer;
request.use_cors_preflight = true;
request.mode = RequestMode::CorsMode;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&request, None);
let _ = server.close();
assert!(fetch_response.is_network_error());
@ -335,7 +334,7 @@ fn test_fetch_response_is_basic_filtered() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&request, None);
let _ = server.close();
assert!(!fetch_response.is_network_error());
@ -381,7 +380,7 @@ fn test_fetch_response_is_cors_filtered() {
let mut request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
request.mode = RequestMode::CorsMode;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&request, None);
let _ = server.close();
assert!(!fetch_response.is_network_error());
@ -412,7 +411,7 @@ fn test_fetch_response_is_opaque_filtered() {
let origin = Origin::Origin(ImmutableOrigin::new_opaque());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&request, None);
let _ = server.close();
assert!(!fetch_response.is_network_error());
@ -460,7 +459,7 @@ fn test_fetch_response_is_opaque_redirect_filtered() {
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
request.redirect_mode.set(RedirectMode::Manual);
let fetch_response = fetch(request, None);
let fetch_response = fetch(&request, None);
let _ = server.close();
assert!(!fetch_response.is_network_error());
@ -497,7 +496,7 @@ fn test_fetch_with_local_urls_only() {
// Set the flag.
request.local_urls_only = true;
fetch(request, None)
fetch(&request, None)
};
let local_url = ServoUrl::parse("about:blank").unwrap();
@ -549,7 +548,7 @@ fn test_fetch_with_hsts() {
*request.referrer.borrow_mut() = Referrer::NoReferrer;
// Set the flag.
request.local_urls_only = false;
let response = fetch_with_context(request, &context);
let response = fetch_with_context(&request, &context);
let _ = server.close();
assert_eq!(response.internal_response.unwrap().url().unwrap().scheme(),
"https");
@ -573,7 +572,7 @@ fn test_fetch_with_sri_network_error() {
// Set the flag.
request.local_urls_only = false;
let response = fetch(request, None);
let response = fetch(&request, None);
let _ = server.close();
assert!(response.is_network_error());
@ -597,7 +596,7 @@ fn test_fetch_with_sri_sucess() {
// Set the flag.
request.local_urls_only = false;
let response = fetch(request, None);
let response = fetch(&request, None);
let _ = server.close();
assert_eq!(response_is_done(&response), true);
@ -629,7 +628,7 @@ fn test_fetch_blocked_nosniff() {
let origin = Origin::Origin(url.origin());
let mut request = Request::new(url, Some(origin), false, None);
request.type_ = request_type;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&request, None);
let _ = server.close();
assert_eq!(fetch_response.is_network_error(), should_error);
@ -671,7 +670,7 @@ fn setup_server_and_fetch(message: &'static [u8], redirect_cap: u32) -> Response
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&request, None);
let _ = server.close();
fetch_response
}
@ -756,7 +755,7 @@ fn test_fetch_redirect_updates_method_runner(tx: Sender<bool>, status_code: Stat
*request.referrer.borrow_mut() = Referrer::NoReferrer;
*request.method.borrow_mut() = method;
let _ = fetch(request, None);
let _ = fetch(&request, None);
let _ = server.close();
}
@ -830,7 +829,7 @@ fn test_fetch_async_returns_complete_response() {
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&request, None);
let _ = server.close();
assert_eq!(response_is_done(&fetch_response), true);
@ -849,7 +848,7 @@ fn test_opaque_filtered_fetch_async_returns_complete_response() {
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&request, None);
let _ = server.close();
@ -885,7 +884,7 @@ fn test_opaque_redirect_filtered_fetch_async_returns_complete_response() {
*request.referrer.borrow_mut() = Referrer::NoReferrer;
request.redirect_mode.set(RedirectMode::Manual);
let fetch_response = fetch(request, None);
let fetch_response = fetch(&request, None);
let _ = server.close();
@ -908,7 +907,7 @@ fn test_fetch_with_devtools() {
let (devtools_chan, devtools_port) = channel::<DevtoolsControlMsg>();
let _ = fetch(request, Some(devtools_chan));
let _ = fetch(&request, Some(devtools_chan));
let _ = server.close();
// notification received from devtools

62
tests/unit/net/http_loader.rs
View file

@ -142,7 +142,7 @@ fn test_check_default_headers_loaded_in_every_request() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&request, None);
assert!(response.status.unwrap().is_success());
// Testing for method.POST
@ -161,7 +161,7 @@ fn test_check_default_headers_loaded_in_every_request() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&request, None);
assert!(response.status.unwrap().is_success());
let _ = server.close();
@ -183,7 +183,7 @@ fn test_load_when_request_is_not_get_or_head_and_there_is_no_body_content_length
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&request, None);
assert!(response.status.unwrap().is_success());
let _ = server.close();
@ -210,7 +210,7 @@ fn test_request_and_response_data_with_network_messages() {
.. RequestInit::default()
});
let (devtools_chan, devtools_port) = mpsc::channel();
let response = fetch(request, Some(devtools_chan));
let response = fetch(&request, Some(devtools_chan));
assert!(response.status.unwrap().is_success());
let _ = server.close();
@ -297,7 +297,7 @@ fn test_request_and_response_message_from_devtool_without_pipeline_id() {
.. RequestInit::default()
});
let (devtools_chan, devtools_port) = mpsc::channel();
let response = fetch(request, Some(devtools_chan));
let response = fetch(&request, Some(devtools_chan));
assert!(response.status.unwrap().is_success());
let _ = server.close();
@ -332,7 +332,7 @@ fn test_redirected_request_to_devtools() {
.. RequestInit::default()
});
let (devtools_chan, devtools_port) = mpsc::channel();
fetch(request, Some(devtools_chan));
fetch(&request, Some(devtools_chan));
let _ = pre_server.close();
let _ = post_server.close();
@ -379,7 +379,7 @@ fn test_load_when_redirecting_from_a_post_should_rewrite_next_request_as_get() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&request, None);
let _ = pre_server.close();
let _ = post_server.close();
@ -407,7 +407,7 @@ fn test_load_should_decode_the_response_as_deflate_when_response_headers_have_co
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&request, None);
let _ = server.close();
@ -436,7 +436,7 @@ fn test_load_should_decode_the_response_as_gzip_when_response_headers_have_conte
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&request, None);
let _ = server.close();
@ -474,7 +474,7 @@ fn test_load_doesnt_send_request_body_on_any_redirect() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&request, None);
let _ = pre_server.close();
let _ = post_server.close();
@ -500,7 +500,7 @@ fn test_load_doesnt_add_host_to_sts_list_when_url_is_http_even_if_sts_headers_ar
.. RequestInit::default()
});
let context = new_fetch_context(None);
let response = fetch_with_context(request, &context);
let response = fetch_with_context(&request, &context);
let _ = server.close();
@ -530,7 +530,7 @@ fn test_load_sets_cookies_in_the_resource_manager_when_it_get_set_cookie_header_
credentials_mode: CredentialsMode::Include,
.. RequestInit::default()
});
let response = fetch_with_context(request, &context);
let response = fetch_with_context(&request, &context);
let _ = server.close();
@ -570,7 +570,7 @@ fn test_load_sets_requests_cookies_header_for_url_by_getting_cookies_from_the_re
credentials_mode: CredentialsMode::Include,
.. RequestInit::default()
});
let response = fetch_with_context(request, &context);
let response = fetch_with_context(&request, &context);
let _ = server.close();
@ -608,7 +608,7 @@ fn test_load_sends_cookie_if_nonhttp() {
credentials_mode: CredentialsMode::Include,
.. RequestInit::default()
});
let response = fetch_with_context(request, &context);
let response = fetch_with_context(&request, &context);
let _ = server.close();
@ -638,7 +638,7 @@ fn test_cookie_set_with_httponly_should_not_be_available_using_getcookiesforurl(
credentials_mode: CredentialsMode::Include,
.. RequestInit::default()
});
let response = fetch_with_context(request, &context);
let response = fetch_with_context(&request, &context);
let _ = server.close();
@ -672,7 +672,7 @@ fn test_when_cookie_received_marked_secure_is_ignored_for_http() {
credentials_mode: CredentialsMode::Include,
.. RequestInit::default()
});
let response = fetch_with_context(request, &context);
let response = fetch_with_context(&request, &context);
let _ = server.close();
@ -700,7 +700,7 @@ fn test_load_sets_content_length_to_length_of_request_body() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&request, None);
let _ = server.close();
@ -728,7 +728,7 @@ fn test_load_uses_explicit_accept_from_headers_in_load_data() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&request, None);
let _ = server.close();
@ -756,7 +756,7 @@ fn test_load_sets_default_accept_to_html_xhtml_xml_and_then_anything_else() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&request, None);
let _ = server.close();
@ -784,7 +784,7 @@ fn test_load_uses_explicit_accept_encoding_from_load_data_headers() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&request, None);
let _ = server.close();
@ -811,7 +811,7 @@ fn test_load_sets_default_accept_encoding_to_gzip_and_deflate() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&request, None);
let _ = server.close();
@ -847,7 +847,7 @@ fn test_load_errors_when_there_a_redirect_loop() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&request, None);
let _ = server_a.close();
let _ = server_b.close();
@ -890,7 +890,7 @@ fn test_load_succeeds_with_a_redirect_loop() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&request, None);
let _ = server_a.close();
let _ = server_b.close();
@ -927,7 +927,7 @@ fn test_load_follows_a_redirect() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&request, None);
let _ = pre_server.close();
let _ = post_server.close();
@ -1005,7 +1005,7 @@ fn test_redirect_from_x_to_y_provides_y_cookies_from_y() {
credentials_mode: CredentialsMode::Include,
.. RequestInit::default()
});
let response = fetch_with_context(request, &context);
let response = fetch_with_context(&request, &context);
let _ = server.close();
@ -1049,7 +1049,7 @@ fn test_redirect_from_x_to_x_provides_x_with_cookie_from_first_response() {
credentials_mode: CredentialsMode::Include,
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&request, None);
let _ = server.close();
@ -1090,7 +1090,7 @@ fn test_if_auth_creds_not_in_url_but_in_cache_it_sets_it() {
context.state.auth_cache.write().unwrap().entries.insert(url.origin().clone().ascii_serialization(), auth_entry);
let response = fetch_with_context(request, &context);
let response = fetch_with_context(&request, &context);
let _ = server.close();
@ -1116,7 +1116,7 @@ fn test_auth_ui_needs_www_auth() {
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&request, None);
let _ = server.close();
@ -1146,7 +1146,7 @@ fn test_origin_set() {
origin: url.clone(),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&request, None);
assert!(response.status.unwrap().is_success());
let origin_url = ServoUrl::parse("http://example.com").unwrap();
@ -1162,7 +1162,7 @@ fn test_origin_set() {
});
*origin_header_clone.lock().unwrap() = Some(origin.clone());
let response = fetch(request, None);
let response = fetch(&request, None);
assert!(response.status.unwrap().is_success());
// Test Origin header is not set on method Head
@ -1175,7 +1175,7 @@ fn test_origin_set() {
});
*origin_header_clone.lock().unwrap() = None;
let response = fetch(request, None);
let response = fetch(&request, None);
assert!(response.status.unwrap().is_success());
let _ = server.close();

9
tests/unit/net/lib.rs
View file

@ -42,7 +42,6 @@ use net_traits::FetchTaskTarget;
use net_traits::request::Request;
use net_traits::response::Response;
use servo_url::ServoUrl;
use std::rc::Rc;
use std::sync::mpsc::{Sender, channel};
const DEFAULT_USER_AGENT: &'static str = "Such Browser. Very Layout. Wow.";
@ -70,22 +69,22 @@ impl FetchTaskTarget for FetchResponseCollector {
}
}
fn fetch(request: Request, dc: Option<Sender<DevtoolsControlMsg>>) -> Response {
fn fetch(request: &Request, dc: Option<Sender<DevtoolsControlMsg>>) -> Response {
fetch_with_context(request, &new_fetch_context(dc))
}
fn fetch_with_context(request: Request, context: &FetchContext) -> Response {
fn fetch_with_context(request: &Request, context: &FetchContext) -> Response {
let (sender, receiver) = channel();
let mut target = FetchResponseCollector {
sender: sender,
};
methods::fetch(Rc::new(request), &mut target, context);
methods::fetch(request, &mut target, context);
receiver.recv().unwrap()
}
fn fetch_with_cors_cache(request: Rc<Request>, cache: &mut CorsCache) -> Response {
fn fetch_with_cors_cache(request: &Request, cache: &mut CorsCache) -> Response {
let (sender, receiver) = channel();
let mut target = FetchResponseCollector {
sender: sender,