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

Auto merge of #16214 - nox:net, r=emilio

Browse source 
Improve the net crate

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16214)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-04-03 07:47:38 -05:00 • committed by GitHub
commit c31ee6e300
14 changed files with 555 additions and 555 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,9 +19,9 @@ fn assert_parse(url: &'static str,
data: Option<&[u8]>) {
let url = ServoUrl::parse(url).unwrap();
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
let mut request = Request::new(url, Some(origin), false, None);
let response = fetch(request, None);
let response = fetch(&mut request, None);
match data {
Some(data) => {

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

@ -23,6 +23,7 @@ use hyper::status::StatusCode;
use hyper::uri::RequestUri;
use hyper_openssl;
use msg::constellation_msg::TEST_PIPELINE_ID;
use net::connector::{create_http_connector, create_ssl_client};
use net::fetch::cors_cache::CorsCache;
use net::fetch::methods::FetchContext;
use net::filemanager_thread::FileManager;
@ -37,7 +38,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};
@ -55,9 +55,9 @@ fn test_fetch_response_is_not_network_error() {
let (mut server, url) = make_server(handler);
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 mut request = Request::new(url, Some(origin), false, None);
request.referrer = Referrer::NoReferrer;
let fetch_response = fetch(&mut request, None);
let _ = server.close();
if fetch_response.is_network_error() {
@ -69,9 +69,9 @@ fn test_fetch_response_is_not_network_error() {
fn test_fetch_on_bad_port_is_network_error() {
let url = ServoUrl::parse("http://www.example.org:6667").unwrap();
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 mut request = Request::new(url, Some(origin), false, None);
request.referrer = Referrer::NoReferrer;
let fetch_response = fetch(&mut 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()))
@ -86,9 +86,9 @@ fn test_fetch_response_body_matches_const_message() {
let (mut server, url) = make_server(handler);
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 mut request = Request::new(url, Some(origin), false, None);
request.referrer = Referrer::NoReferrer;
let fetch_response = fetch(&mut request, None);
let _ = server.close();
assert!(!fetch_response.is_network_error());
@ -106,9 +106,9 @@ fn test_fetch_response_body_matches_const_message() {
fn test_fetch_aboutblank() {
let url = ServoUrl::parse("about:blank").unwrap();
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 mut request = Request::new(url, Some(origin), false, None);
request.referrer = Referrer::NoReferrer;
let fetch_response = fetch(&mut request, None);
assert!(!fetch_response.is_network_error());
assert!(*fetch_response.body.lock().unwrap() == ResponseBody::Done(vec![]));
}
@ -136,8 +136,8 @@ fn test_fetch_blob() {
let url = ServoUrl::parse(&format!("blob:{}{}", origin.as_str(), id.simple())).unwrap();
let request = Request::new(url, Some(Origin::Origin(origin.origin())), false, None);
let fetch_response = fetch_with_context(request, &context);
let mut request = Request::new(url, Some(Origin::Origin(origin.origin())), false, None);
let fetch_response = fetch_with_context(&mut request, &context);
assert!(!fetch_response.is_network_error());
@ -160,9 +160,9 @@ fn test_fetch_file() {
let url = ServoUrl::from_file_path(path.clone()).unwrap();
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
let mut request = Request::new(url, Some(origin), false, None);
let fetch_response = fetch(request, None);
let fetch_response = fetch(&mut request, None);
assert!(!fetch_response.is_network_error());
assert_eq!(fetch_response.headers.len(), 1);
let content_type: &ContentType = fetch_response.headers.get().unwrap();
@ -185,9 +185,9 @@ fn test_fetch_file() {
fn test_fetch_ftp() {
let url = ServoUrl::parse("ftp://not-supported").unwrap();
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 mut request = Request::new(url, Some(origin), false, None);
request.referrer = Referrer::NoReferrer;
let fetch_response = fetch(&mut request, None);
assert!(fetch_response.is_network_error());
}
@ -195,9 +195,9 @@ fn test_fetch_ftp() {
fn test_fetch_bogus_scheme() {
let url = ServoUrl::parse("bogus://whatever").unwrap();
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 mut request = Request::new(url, Some(origin), false, None);
request.referrer = Referrer::NoReferrer;
let fetch_response = fetch(&mut request, None);
assert!(fetch_response.is_network_error());
}
@ -224,11 +224,11 @@ fn test_cors_preflight_fetch() {
let origin = Origin::Origin(ImmutableOrigin::new_opaque());
let mut request = Request::new(url.clone(), Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::ReferrerUrl(target_url);
*request.referrer_policy.get_mut() = Some(ReferrerPolicy::Origin);
request.referrer = Referrer::ReferrerUrl(target_url);
request.referrer_policy = Some(ReferrerPolicy::Origin);
request.use_cors_preflight = true;
request.mode = RequestMode::CorsMode;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&mut request, None);
let _ = server.close();
assert!(!fetch_response.is_network_error());
@ -261,14 +261,14 @@ fn test_cors_preflight_cache_fetch() {
let origin = Origin::Origin(ImmutableOrigin::new_opaque());
let mut request = Request::new(url.clone(), Some(origin.clone()), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
request.referrer = 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 mut wrapped_request0 = request.clone();
let mut 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(&mut wrapped_request0, &mut cache);
let fetch_response1 = fetch_with_cors_cache(&mut wrapped_request1, &mut cache);
let _ = server.close();
assert!(!fetch_response0.is_network_error() && !fetch_response1.is_network_error());
@ -277,8 +277,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),
@ -310,11 +310,11 @@ fn test_cors_preflight_fetch_network_error() {
let origin = Origin::Origin(ImmutableOrigin::new_opaque());
let mut request = Request::new(url, Some(origin), false, None);
*request.method.borrow_mut() = Method::Extension("CHICKEN".to_owned());
*request.referrer.borrow_mut() = Referrer::NoReferrer;
request.method = Method::Extension("CHICKEN".to_owned());
request.referrer = Referrer::NoReferrer;
request.use_cors_preflight = true;
request.mode = RequestMode::CorsMode;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&mut request, None);
let _ = server.close();
assert!(fetch_response.is_network_error());
@ -333,9 +333,9 @@ fn test_fetch_response_is_basic_filtered() {
let (mut server, url) = make_server(handler);
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 mut request = Request::new(url, Some(origin), false, None);
request.referrer = Referrer::NoReferrer;
let fetch_response = fetch(&mut request, None);
let _ = server.close();
assert!(!fetch_response.is_network_error());
@ -379,9 +379,9 @@ fn test_fetch_response_is_cors_filtered() {
// an origin mis-match will stop it from defaulting to a basic filtered response
let origin = Origin::Origin(ImmutableOrigin::new_opaque());
let mut request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
request.referrer = Referrer::NoReferrer;
request.mode = RequestMode::CorsMode;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&mut request, None);
let _ = server.close();
assert!(!fetch_response.is_network_error());
@ -410,16 +410,16 @@ fn test_fetch_response_is_opaque_filtered() {
// an origin mis-match will fall through to an Opaque filtered response
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 mut request = Request::new(url, Some(origin), false, None);
request.referrer = Referrer::NoReferrer;
let fetch_response = fetch(&mut request, None);
let _ = server.close();
assert!(!fetch_response.is_network_error());
assert_eq!(fetch_response.response_type, ResponseType::Opaque);
assert!(fetch_response.url().is_none());
assert!(fetch_response.url_list.into_inner().len() == 0);
assert!(fetch_response.url_list.is_empty());
// this also asserts that status message is "the empty byte sequence"
assert!(fetch_response.status.is_none());
assert_eq!(fetch_response.headers, Headers::new());
@ -457,10 +457,10 @@ fn test_fetch_response_is_opaque_redirect_filtered() {
let (mut server, url) = make_server(handler);
let origin = Origin::Origin(url.origin());
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 mut request = Request::new(url, Some(origin), false, None);
request.referrer = Referrer::NoReferrer;
request.redirect_mode = RedirectMode::Manual;
let fetch_response = fetch(&mut request, None);
let _ = server.close();
assert!(!fetch_response.is_network_error());
@ -492,12 +492,12 @@ fn test_fetch_with_local_urls_only() {
let do_fetch = |url: ServoUrl| {
let origin = Origin::Origin(url.origin());
let mut request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
request.referrer = Referrer::NoReferrer;
// Set the flag.
request.local_urls_only = true;
fetch(request, None)
fetch(&mut request, None)
};
let local_url = ServoUrl::parse("about:blank").unwrap();
@ -530,11 +530,15 @@ fn test_fetch_with_hsts() {
//takes an address and something that implements hyper::net::Ssl
let mut server = Server::https("0.0.0.0:0", ssl).unwrap().handle_threads(handler, 1).unwrap();
let ssl_client = create_ssl_client("self_signed_certificate_for_testing.crt");
let connector = create_http_connector(ssl_client);
let context = FetchContext {
state: HttpState::new("self_signed_certificate_for_testing.crt"),
state: Arc::new(HttpState::new()),
user_agent: DEFAULT_USER_AGENT.into(),
devtools_chan: None,
filemanager: FileManager::new(),
connector: connector,
};
{
@ -546,10 +550,10 @@ fn test_fetch_with_hsts() {
let url = ServoUrl::parse(&url_string).unwrap();
let origin = Origin::Origin(url.origin());
let mut request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
request.referrer = Referrer::NoReferrer;
// Set the flag.
request.local_urls_only = false;
let response = fetch_with_context(request, &context);
let response = fetch_with_context(&mut request, &context);
let _ = server.close();
assert_eq!(response.internal_response.unwrap().url().unwrap().scheme(),
"https");
@ -565,15 +569,15 @@ fn test_fetch_with_sri_network_error() {
let origin = Origin::Origin(url.origin());
let mut request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
request.referrer = Referrer::NoReferrer;
// To calulate hash use :
// echo -n "alert('Hello, Network Error');" | openssl dgst -sha384 -binary | openssl base64 -A
*request.integrity_metadata.borrow_mut() =
request.integrity_metadata =
"sha384-H8BRh8j48O9oYatfu5AZzq6A9RINhZO5H16dQZngK7T62em8MUt1FLm52t+eX6xO".to_owned();
// Set the flag.
request.local_urls_only = false;
let response = fetch(request, None);
let response = fetch(&mut request, None);
let _ = server.close();
assert!(response.is_network_error());
@ -589,15 +593,15 @@ fn test_fetch_with_sri_sucess() {
let origin = Origin::Origin(url.origin());
let mut request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
request.referrer = Referrer::NoReferrer;
// To calulate hash use :
// echo -n "alert('Hello, Network Error');" | openssl dgst -sha384 -binary | openssl base64 -A
*request.integrity_metadata.borrow_mut() =
request.integrity_metadata =
"sha384-H8BRh8j48O9oYatfu5AZzq6A9RINhZO5H16dQZngK7T62em8MUt1FLm52t+eX6xO".to_owned();
// Set the flag.
request.local_urls_only = false;
let response = fetch(request, None);
let response = fetch(&mut request, None);
let _ = server.close();
assert_eq!(response_is_done(&response), true);
@ -629,7 +633,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(&mut request, None);
let _ = server.close();
assert_eq!(fetch_response.is_network_error(), should_error);
@ -669,9 +673,9 @@ fn setup_server_and_fetch(message: &'static [u8], redirect_cap: u32) -> Response
let (mut server, url) = make_server(handler);
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 mut request = Request::new(url, Some(origin), false, None);
request.referrer = Referrer::NoReferrer;
let fetch_response = fetch(&mut request, None);
let _ = server.close();
fetch_response
}
@ -752,11 +756,11 @@ fn test_fetch_redirect_updates_method_runner(tx: Sender<bool>, status_code: Stat
let (mut server, url) = make_server(handler);
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
*request.method.borrow_mut() = method;
let mut request = Request::new(url, Some(origin), false, None);
request.referrer = Referrer::NoReferrer;
request.method = method;
let _ = fetch(request, None);
let _ = fetch(&mut request, None);
let _ = server.close();
}
@ -827,10 +831,10 @@ fn test_fetch_async_returns_complete_response() {
let (mut server, url) = make_server(handler);
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
let mut request = Request::new(url, Some(origin), false, None);
request.referrer = Referrer::NoReferrer;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&mut request, None);
let _ = server.close();
assert_eq!(response_is_done(&fetch_response), true);
@ -846,10 +850,10 @@ fn test_opaque_filtered_fetch_async_returns_complete_response() {
// an origin mis-match will fall through to an Opaque filtered response
let origin = Origin::Origin(ImmutableOrigin::new_opaque());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
let mut request = Request::new(url, Some(origin), false, None);
request.referrer = Referrer::NoReferrer;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&mut request, None);
let _ = server.close();
@ -881,11 +885,11 @@ fn test_opaque_redirect_filtered_fetch_async_returns_complete_response() {
let (mut server, url) = make_server(handler);
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
request.redirect_mode.set(RedirectMode::Manual);
let mut request = Request::new(url, Some(origin), false, None);
request.referrer = Referrer::NoReferrer;
request.redirect_mode = RedirectMode::Manual;
let fetch_response = fetch(request, None);
let fetch_response = fetch(&mut request, None);
let _ = server.close();
@ -903,12 +907,12 @@ fn test_fetch_with_devtools() {
let (mut server, url) = make_server(handler);
let origin = Origin::Origin(url.origin());
let request = Request::new(url.clone(), Some(origin), false, Some(TEST_PIPELINE_ID));
*request.referrer.borrow_mut() = Referrer::NoReferrer;
let mut request = Request::new(url.clone(), Some(origin), false, Some(TEST_PIPELINE_ID));
request.referrer = Referrer::NoReferrer;
let (devtools_chan, devtools_port) = channel::<DevtoolsControlMsg>();
let _ = fetch(request, Some(devtools_chan));
let _ = fetch(&mut request, Some(devtools_chan));
let _ = server.close();
// notification received from devtools

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

@ -50,7 +50,7 @@ fn read_response(reader: &mut Read) -> String {
}
}
fn assert_cookie_for_domain(cookie_jar: Arc<RwLock<CookieStorage>>, domain: &str, cookie: Option<&str>) {
fn assert_cookie_for_domain(cookie_jar: &RwLock<CookieStorage>, domain: &str, cookie: Option<&str>) {
let mut cookie_jar = cookie_jar.write().unwrap();
let url = ServoUrl::parse(&*domain).unwrap();
let cookies = cookie_jar.cookies_for_url(&url, CookieSource::HTTP);
@ -134,7 +134,7 @@ fn test_check_default_headers_loaded_in_every_request() {
*expected_headers.lock().unwrap() = Some(headers.clone());
// Testing for method.GET
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
destination: Destination::Document,
@ -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(&mut request, None);
assert!(response.status.unwrap().is_success());
// Testing for method.POST
@ -153,7 +153,7 @@ fn test_check_default_headers_loaded_in_every_request() {
// "Origin: http://example.com/" which do not match for equality so strip trailing '/'
post_headers.set(Origin::from_str(&url_str[..url_str.len()-1]).unwrap());
*expected_headers.lock().unwrap() = Some(post_headers);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Post,
destination: Destination::Document,
@ -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(&mut request, None);
assert!(response.status.unwrap().is_success());
let _ = server.close();
@ -174,7 +174,7 @@ fn test_load_when_request_is_not_get_or_head_and_there_is_no_body_content_length
};
let (mut server, url) = make_server(handler);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Post,
body: None,
@ -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(&mut request, None);
assert!(response.status.unwrap().is_success());
let _ = server.close();
@ -199,7 +199,7 @@ fn test_request_and_response_data_with_network_messages() {
let mut request_headers = Headers::new();
request_headers.set(Host { hostname: "bar.foo".to_owned(), port: None });
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
headers: request_headers,
@ -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(&mut request, Some(devtools_chan));
assert!(response.status.unwrap().is_success());
let _ = server.close();
@ -288,7 +288,7 @@ fn test_request_and_response_message_from_devtool_without_pipeline_id() {
};
let (mut server, url) = make_server(handler);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
destination: Destination::Document,
@ -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(&mut request, Some(devtools_chan));
assert!(response.status.unwrap().is_success());
let _ = server.close();
@ -323,7 +323,7 @@ fn test_redirected_request_to_devtools() {
};
let (mut pre_server, pre_url) = make_server(pre_handler);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: pre_url.clone(),
method: Method::Post,
destination: Destination::Document,
@ -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(&mut request, Some(devtools_chan));
let _ = pre_server.close();
let _ = post_server.close();
@ -371,7 +371,7 @@ fn test_load_when_redirecting_from_a_post_should_rewrite_next_request_as_get() {
};
let (mut pre_server, pre_url) = make_server(pre_handler);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: pre_url.clone(),
method: Method::Post,
destination: Destination::Document,
@ -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(&mut request, None);
let _ = pre_server.close();
let _ = post_server.close();
@ -398,7 +398,7 @@ fn test_load_should_decode_the_response_as_deflate_when_response_headers_have_co
};
let (mut server, url) = make_server(handler);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
body: None,
@ -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(&mut request, None);
let _ = server.close();
@ -427,7 +427,7 @@ fn test_load_should_decode_the_response_as_gzip_when_response_headers_have_conte
};
let (mut server, url) = make_server(handler);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
body: None,
@ -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(&mut request, None);
let _ = server.close();
@ -465,7 +465,7 @@ fn test_load_doesnt_send_request_body_on_any_redirect() {
};
let (mut pre_server, pre_url) = make_server(pre_handler);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: pre_url.clone(),
body: Some(b"Body on POST!".to_vec()),
method: Method::Post,
@ -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(&mut request, None);
let _ = pre_server.close();
let _ = post_server.close();
@ -490,7 +490,7 @@ fn test_load_doesnt_add_host_to_sts_list_when_url_is_http_even_if_sts_headers_ar
};
let (mut server, url) = make_server(handler);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
body: None,
@ -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(&mut request, &context);
let _ = server.close();
@ -518,9 +518,9 @@ fn test_load_sets_cookies_in_the_resource_manager_when_it_get_set_cookie_header_
let context = new_fetch_context(None);
assert_cookie_for_domain(context.state.cookie_jar.clone(), url.as_str(), None);
assert_cookie_for_domain(&context.state.cookie_jar, url.as_str(), None);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
body: None,
@ -530,13 +530,13 @@ 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(&mut request, &context);
let _ = server.close();
assert!(response.status.unwrap().is_success());
assert_cookie_for_domain(context.state.cookie_jar.clone(), url.as_str(), Some("mozillaIs=theBest"));
assert_cookie_for_domain(&context.state.cookie_jar, url.as_str(), Some("mozillaIs=theBest"));
}
#[test]
@ -560,7 +560,7 @@ fn test_load_sets_requests_cookies_header_for_url_by_getting_cookies_from_the_re
cookie_jar.push(cookie, &url, CookieSource::HTTP);
}
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
body: None,
@ -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(&mut request, &context);
let _ = server.close();
@ -598,7 +598,7 @@ fn test_load_sends_cookie_if_nonhttp() {
cookie_jar.push(cookie, &url, CookieSource::HTTP);
}
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
body: None,
@ -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(&mut request, &context);
let _ = server.close();
@ -626,9 +626,9 @@ fn test_cookie_set_with_httponly_should_not_be_available_using_getcookiesforurl(
let context = new_fetch_context(None);
assert_cookie_for_domain(context.state.cookie_jar.clone(), url.as_str(), None);
assert_cookie_for_domain(&context.state.cookie_jar, url.as_str(), None);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
body: None,
@ -638,13 +638,13 @@ 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(&mut request, &context);
let _ = server.close();
assert!(response.status.unwrap().is_success());
assert_cookie_for_domain(context.state.cookie_jar.clone(), url.as_str(), Some("mozillaIs=theBest"));
assert_cookie_for_domain(&context.state.cookie_jar, url.as_str(), Some("mozillaIs=theBest"));
let mut cookie_jar = context.state.cookie_jar.write().unwrap();
assert!(cookie_jar.cookies_for_url(&url, CookieSource::NonHTTP).is_none());
}
@ -660,9 +660,9 @@ fn test_when_cookie_received_marked_secure_is_ignored_for_http() {
let context = new_fetch_context(None);
assert_cookie_for_domain(context.state.cookie_jar.clone(), url.as_str(), None);
assert_cookie_for_domain(&context.state.cookie_jar, url.as_str(), None);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
body: None,
@ -672,13 +672,13 @@ 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(&mut request, &context);
let _ = server.close();
assert!(response.status.unwrap().is_success());
assert_cookie_for_domain(context.state.cookie_jar.clone(), url.as_str(), None);
assert_cookie_for_domain(&context.state.cookie_jar, url.as_str(), None);
}
#[test]
@ -691,7 +691,7 @@ fn test_load_sets_content_length_to_length_of_request_body() {
};
let (mut server, url) = make_server(handler);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Post,
body: Some(content.to_vec()),
@ -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(&mut request, None);
let _ = server.close();
@ -719,7 +719,7 @@ fn test_load_uses_explicit_accept_from_headers_in_load_data() {
let mut accept_headers = Headers::new();
accept_headers.set(accept);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
headers: accept_headers,
@ -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(&mut request, None);
let _ = server.close();
@ -748,7 +748,7 @@ fn test_load_sets_default_accept_to_html_xhtml_xml_and_then_anything_else() {
};
let (mut server, url) = make_server(handler);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
destination: Destination::Document,
@ -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(&mut request, None);
let _ = server.close();
@ -775,7 +775,7 @@ fn test_load_uses_explicit_accept_encoding_from_load_data_headers() {
let mut accept_encoding_headers = Headers::new();
accept_encoding_headers.set(accept_encoding);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
headers: accept_encoding_headers,
@ -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(&mut request, None);
let _ = server.close();
@ -803,7 +803,7 @@ fn test_load_sets_default_accept_encoding_to_gzip_and_deflate() {
};
let (mut server, url) = make_server(handler);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
destination: Destination::Document,
@ -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(&mut request, None);
let _ = server.close();
@ -839,7 +839,7 @@ fn test_load_errors_when_there_a_redirect_loop() {
*url_b_for_a.lock().unwrap() = Some(url_b.clone());
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url_a.clone(),
method: Method::Get,
destination: Destination::Document,
@ -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(&mut request, None);
let _ = server_a.close();
let _ = server_b.close();
@ -882,7 +882,7 @@ fn test_load_succeeds_with_a_redirect_loop() {
*url_b_for_a.lock().unwrap() = Some(url_b.clone());
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url_a.clone(),
method: Method::Get,
destination: Destination::Document,
@ -890,14 +890,13 @@ fn test_load_succeeds_with_a_redirect_loop() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&mut request, None);
let _ = server_a.close();
let _ = server_b.close();
let response = response.to_actual();
assert_eq!(*response.url_list.borrow(),
[url_a.clone(), url_b, url_a]);
assert_eq!(response.url_list, [url_a.clone(), url_b, url_a]);
assert_eq!(*response.body.lock().unwrap(),
ResponseBody::Done(b"Success".to_vec()));
}
@ -919,7 +918,7 @@ fn test_load_follows_a_redirect() {
};
let (mut pre_server, pre_url) = make_server(pre_handler);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: pre_url.clone(),
method: Method::Get,
destination: Destination::Document,
@ -927,7 +926,7 @@ fn test_load_follows_a_redirect() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&mut request, None);
let _ = pre_server.close();
let _ = post_server.close();
@ -996,7 +995,7 @@ fn test_redirect_from_x_to_y_provides_y_cookies_from_y() {
cookie_jar.push(cookie_y, &url_y, CookieSource::HTTP);
}
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url_x.clone(),
method: Method::Get,
destination: Destination::Document,
@ -1005,7 +1004,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(&mut request, &context);
let _ = server.close();
@ -1040,7 +1039,7 @@ fn test_redirect_from_x_to_x_provides_x_with_cookie_from_first_response() {
let url = url.join("/initial/").unwrap();
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
destination: Destination::Document,
@ -1049,7 +1048,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(&mut request, None);
let _ = server.close();
@ -1071,7 +1070,7 @@ fn test_if_auth_creds_not_in_url_but_in_cache_it_sets_it() {
};
let (mut server, url) = make_server(handler);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
body: None,
@ -1090,7 +1089,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(&mut request, &context);
let _ = server.close();
@ -1105,7 +1104,7 @@ fn test_auth_ui_needs_www_auth() {
};
let (mut server, url) = make_server(handler);
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
body: None,
@ -1116,7 +1115,7 @@ fn test_auth_ui_needs_www_auth() {
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&mut request, None);
let _ = server.close();
@ -1139,20 +1138,20 @@ fn test_origin_set() {
let mut origin = Origin::new(url.scheme(), url.host_str().unwrap(), url.port());
*origin_header_clone.lock().unwrap() = Some(origin.clone());
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Post,
body: None,
origin: url.clone(),
.. RequestInit::default()
});
let response = fetch(request, None);
let response = fetch(&mut request, None);
assert!(response.status.unwrap().is_success());
let origin_url = ServoUrl::parse("http://example.com").unwrap();
origin = Origin::new(origin_url.scheme(), origin_url.host_str().unwrap(), origin_url.port());
// Test Origin header is set on Get request with CORS mode
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Get,
mode: RequestMode::CorsMode,
@ -1162,11 +1161,11 @@ fn test_origin_set() {
});
*origin_header_clone.lock().unwrap() = Some(origin.clone());
let response = fetch(request, None);
let response = fetch(&mut request, None);
assert!(response.status.unwrap().is_success());
// Test Origin header is not set on method Head
let request = Request::from_init(RequestInit {
let mut request = Request::from_init(RequestInit {
url: url.clone(),
method: Method::Head,
body: None,
@ -1175,7 +1174,7 @@ fn test_origin_set() {
});
*origin_header_clone.lock().unwrap() = None;
let response = fetch(request, None);
let response = fetch(&mut request, None);
assert!(response.status.unwrap().is_success());
let _ = server.close();

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

@ -34,6 +34,7 @@ extern crate url;
use devtools_traits::DevtoolsControlMsg;
use hyper::server::{Handler, Listening, Server};
use net::connector::{create_http_connector, create_ssl_client};
use net::fetch::cors_cache::CorsCache;
use net::fetch::methods::{self, FetchContext};
use net::filemanager_thread::FileManager;
@ -42,7 +43,7 @@ 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::Arc;
use std::sync::mpsc::{Sender, channel};
const DEFAULT_USER_AGENT: &'static str = "Such Browser. Very Layout. Wow.";
@ -52,11 +53,14 @@ struct FetchResponseCollector {
}
fn new_fetch_context(dc: Option<Sender<DevtoolsControlMsg>>) -> FetchContext {
let ssl_client = create_ssl_client("certs");
let connector = create_http_connector(ssl_client);
FetchContext {
state: HttpState::new("certs"),
state: Arc::new(HttpState::new()),
user_agent: DEFAULT_USER_AGENT.into(),
devtools_chan: dc,
filemanager: FileManager::new(),
connector: connector,
}
}
impl FetchTaskTarget for FetchResponseCollector {
@ -70,22 +74,22 @@ impl FetchTaskTarget for FetchResponseCollector {
}
}
fn fetch(request: Request, dc: Option<Sender<DevtoolsControlMsg>>) -> Response {
fn fetch(request: &mut 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: &mut 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: &mut Request, cache: &mut CorsCache) -> Response {
let (sender, receiver) = channel();
let mut target = FetchResponseCollector {
sender: sender,