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

Auto merge of #8523 - Wafflespeanut:redirects, r=jdm

Browse source 
Listen for cancellation message during loads and redirects...

fixes #8495

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8523)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-14 19:25:33 +05:30
commit bda46179b6
3 changed files with 125 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

28
components/net/http_loader.rs
View file

@ -115,7 +115,10 @@ fn load_for_consumer(load_data: LoadData,
let factory = NetworkHttpRequestFactory { let factory = NetworkHttpRequestFactory {
connector: connector, connector: connector,
}; };
match load::<WrappedHttpRequest>(load_data, hsts_list, cookie_jar, devtools_chan, &factory, user_agent) { match load::<WrappedHttpRequest>(load_data, hsts_list,
cookie_jar, devtools_chan,
&factory, user_agent,
&cancel_listener) {
Err(LoadError::UnsupportedScheme(url)) => { Err(LoadError::UnsupportedScheme(url)) => {
let s = format!("{} request, but we don't support that scheme", &*url.scheme); let s = format!("{} request, but we don't support that scheme", &*url.scheme);
send_error(url, s, start_chan) send_error(url, s, start_chan)
@ -127,6 +130,7 @@ fn load_for_consumer(load_data: LoadData,
send_error(url, "too many redirects".to_owned(), start_chan) send_error(url, "too many redirects".to_owned(), start_chan)
} }
Err(LoadError::Cors(url, msg)) | Err(LoadError::Cors(url, msg)) |
Err(LoadError::Cancelled(url, msg)) |
Err(LoadError::InvalidRedirect(url, msg)) | Err(LoadError::InvalidRedirect(url, msg)) |
Err(LoadError::Decoding(url, msg)) => { Err(LoadError::Decoding(url, msg)) => {
send_error(url, msg, start_chan) send_error(url, msg, start_chan)
@ -143,7 +147,7 @@ fn load_for_consumer(load_data: LoadData,
Err(LoadError::ConnectionAborted(_)) => unreachable!(), Err(LoadError::ConnectionAborted(_)) => unreachable!(),
Ok(mut load_response) => { Ok(mut load_response) => {
let metadata = load_response.metadata.clone(); let metadata = load_response.metadata.clone();
send_data(&mut load_response, start_chan, metadata, classifier, cancel_listener) send_data(&mut load_response, start_chan, metadata, classifier, &cancel_listener)
} }
} }
} }
@ -291,6 +295,7 @@ pub enum LoadError {
Decoding(Url, String), Decoding(Url, String),
MaxRedirects(Url), MaxRedirects(Url),
ConnectionAborted(String), ConnectionAborted(String),
Cancelled(Url, String),
} }
fn set_default_accept_encoding(headers: &mut Headers) { fn set_default_accept_encoding(headers: &mut Headers) {
@ -516,7 +521,8 @@ pub fn load<A>(load_data: LoadData,
cookie_jar: Arc<RwLock<CookieStorage>>, cookie_jar: Arc<RwLock<CookieStorage>>,
devtools_chan: Option<Sender<DevtoolsControlMsg>>, devtools_chan: Option<Sender<DevtoolsControlMsg>>,
request_factory: &HttpRequestFactory<R=A>, request_factory: &HttpRequestFactory<R=A>,
user_agent: String) user_agent: String,
cancel_listener: &CancellationListener)
-> Result<StreamedResponse<A::R>, LoadError> where A: HttpRequest + 'static { -> Result<StreamedResponse<A::R>, LoadError> where A: HttpRequest + 'static {
// FIXME: At the time of writing this FIXME, servo didn't have any central // FIXME: At the time of writing this FIXME, servo didn't have any central
// location for configuration. If you're reading this and such a // location for configuration. If you're reading this and such a
@ -531,6 +537,10 @@ pub fn load<A>(load_data: LoadData,
let mut redirected_to = HashSet::new(); let mut redirected_to = HashSet::new();
let mut method = load_data.method.clone(); let mut method = load_data.method.clone();
if cancel_listener.is_cancelled() {
return Err(LoadError::Cancelled(url, "load cancelled".to_owned()));
}
// If the URL is a view-source scheme then the scheme data contains the // If the URL is a view-source scheme then the scheme data contains the
// real URL that should be used for which the source is to be viewed. // real URL that should be used for which the source is to be viewed.
// Change our existing URL to that and keep note that we are viewing // Change our existing URL to that and keep note that we are viewing
@ -558,6 +568,10 @@ pub fn load<A>(load_data: LoadData,
return Err(LoadError::UnsupportedScheme(url)); return Err(LoadError::UnsupportedScheme(url));
} }
if cancel_listener.is_cancelled() {
return Err(LoadError::Cancelled(url, "load cancelled".to_owned()));
}
info!("requesting {}", url.serialize()); info!("requesting {}", url.serialize());
// Avoid automatically preserving request headers when redirects occur. // Avoid automatically preserving request headers when redirects occur.
@ -586,6 +600,10 @@ pub fn load<A>(load_data: LoadData,
let mut req = try!(request_factory.create(url.clone(), method.clone())); let mut req = try!(request_factory.create(url.clone(), method.clone()));
*req.headers_mut() = request_headers.clone(); *req.headers_mut() = request_headers.clone();
if cancel_listener.is_cancelled() {
return Err(LoadError::Cancelled(url, "load cancelled".to_owned()));
}
if log_enabled!(log::LogLevel::Info) { if log_enabled!(log::LogLevel::Info) {
info!("{}", method); info!("{}", method);
for header in req.headers_mut().iter() { for header in req.headers_mut().iter() {
@ -623,7 +641,7 @@ pub fn load<A>(load_data: LoadData,
method.clone(), request_headers.clone(), method.clone(), request_headers.clone(),
cloned_data, pipeline_id cloned_data, pipeline_id
); );
} }
response = match maybe_response { response = match maybe_response {
Ok(r) => r, Ok(r) => r,
@ -715,7 +733,7 @@ fn send_data<R: Read>(reader: &mut R,
start_chan: LoadConsumer, start_chan: LoadConsumer,
metadata: Metadata, metadata: Metadata,
classifier: Arc<MIMEClassifier>, classifier: Arc<MIMEClassifier>,
cancel_listener: CancellationListener) { cancel_listener: &CancellationListener) {
let (progress_chan, mut chunk) = { let (progress_chan, mut chunk) = {
let buf = match read_block(reader) { let buf = match read_block(reader) {
Ok(ReadResult::Payload(buf)) => buf, Ok(ReadResult::Payload(buf)) => buf,

16
components/net/resource_task.rs
View file

@ -208,6 +208,16 @@ pub struct CancellableResource {
resource_task: ResourceTask, resource_task: ResourceTask,
} }
impl CancellableResource {
pub fn new(receiver: Receiver<()>, res_id: ResourceId, res_task: ResourceTask) -> CancellableResource {
CancellableResource {
cancel_receiver: receiver,
resource_id: res_id,
resource_task: res_task,
}
}
}
/// A listener which is basically a wrapped optional receiver which looks /// A listener which is basically a wrapped optional receiver which looks
/// for the load cancellation message. Some of the loading processes always keep /// for the load cancellation message. Some of the loading processes always keep
/// an eye out for this message and stop loading stuff once they receive it. /// an eye out for this message and stop loading stuff once they receive it.
@ -313,11 +323,7 @@ impl ResourceManager {
let (cancel_sender, cancel_receiver) = channel(); let (cancel_sender, cancel_receiver) = channel();
self.cancel_load_map.insert(current_res_id, cancel_sender); self.cancel_load_map.insert(current_res_id, cancel_sender);
self.next_resource_id.0 += 1; self.next_resource_id.0 += 1;
CancellableResource { CancellableResource::new(cancel_receiver, current_res_id, resource_task)
cancel_receiver: cancel_receiver,
resource_id: current_res_id,
resource_task: resource_task,
}
}); });
let cancel_listener = CancellationListener::new(cancel_resource); let cancel_listener = CancellationListener::new(cancel_resource);

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

@ -21,6 +21,7 @@ use net::cookie::Cookie;
use net::cookie_storage::CookieStorage; use net::cookie_storage::CookieStorage;
use net::hsts::{HSTSList}; use net::hsts::{HSTSList};
use net::http_loader::{load, LoadError, HttpRequestFactory, HttpRequest, HttpResponse}; use net::http_loader::{load, LoadError, HttpRequestFactory, HttpRequest, HttpResponse};
use net::resource_task::CancellationListener;
use net_traits::{LoadData, CookieSource}; use net_traits::{LoadData, CookieSource};
use std::borrow::Cow; use std::borrow::Cow;
use std::io::{self, Write, Read, Cursor}; use std::io::{self, Write, Read, Cursor};
@ -373,7 +374,7 @@ fn test_check_default_headers_loaded_in_every_request() {
&AssertMustHaveHeadersRequestFactory { &AssertMustHaveHeadersRequestFactory {
expected_headers: headers.clone(), expected_headers: headers.clone(),
body: <[_]>::to_vec(&[]) body: <[_]>::to_vec(&[])
}, DEFAULT_USER_AGENT.to_string()); }, DEFAULT_USER_AGENT.to_string(), &CancellationListener::new(None));
// Testing for method.POST // Testing for method.POST
load_data.method = Method::Post; load_data.method = Method::Post;
@ -384,7 +385,7 @@ fn test_check_default_headers_loaded_in_every_request() {
&AssertMustHaveHeadersRequestFactory { &AssertMustHaveHeadersRequestFactory {
expected_headers: headers, expected_headers: headers,
body: <[_]>::to_vec(&[]) body: <[_]>::to_vec(&[])
}, DEFAULT_USER_AGENT.to_string()); }, DEFAULT_USER_AGENT.to_string(), &CancellationListener::new(None));
} }
#[test] #[test]
@ -406,7 +407,7 @@ fn test_load_when_request_is_not_get_or_head_and_there_is_no_body_content_length
&AssertMustIncludeHeadersRequestFactory { &AssertMustIncludeHeadersRequestFactory {
expected_headers: content_length, expected_headers: content_length,
body: <[_]>::to_vec(&[]) body: <[_]>::to_vec(&[])
}, DEFAULT_USER_AGENT.to_string()); }, DEFAULT_USER_AGENT.to_string(), &CancellationListener::new(None));
} }
#[test] #[test]
@ -437,7 +438,7 @@ fn test_request_and_response_data_with_network_messages() {
request_headers.set(Host { hostname: "bar.foo".to_owned(), port: None }); request_headers.set(Host { hostname: "bar.foo".to_owned(), port: None });
load_data.headers = request_headers.clone(); load_data.headers = request_headers.clone();
let _ = load::<MockRequest>(load_data, hsts_list, cookie_jar, Some(devtools_chan), &Factory, let _ = load::<MockRequest>(load_data, hsts_list, cookie_jar, Some(devtools_chan), &Factory,
DEFAULT_USER_AGENT.to_string()); DEFAULT_USER_AGENT.to_string(), &CancellationListener::new(None));
// notification received from devtools // notification received from devtools
let devhttprequest = expect_devtools_http_request(&devtools_port); let devhttprequest = expect_devtools_http_request(&devtools_port);
@ -507,7 +508,7 @@ fn test_request_and_response_message_from_devtool_without_pipeline_id() {
let (devtools_chan, devtools_port) = mpsc::channel::<DevtoolsControlMsg>(); let (devtools_chan, devtools_port) = mpsc::channel::<DevtoolsControlMsg>();
let load_data = LoadData::new(url.clone(), None); let load_data = LoadData::new(url.clone(), None);
let _ = load::<MockRequest>(load_data, hsts_list, cookie_jar, Some(devtools_chan), &Factory, let _ = load::<MockRequest>(load_data, hsts_list, cookie_jar, Some(devtools_chan), &Factory,
DEFAULT_USER_AGENT.to_string()); DEFAULT_USER_AGENT.to_string(), &CancellationListener::new(None));
// notification received from devtools // notification received from devtools
assert!(devtools_port.try_recv().is_err()); assert!(devtools_port.try_recv().is_err());
@ -540,7 +541,8 @@ fn test_load_when_redirecting_from_a_post_should_rewrite_next_request_as_get() {
let hsts_list = Arc::new(RwLock::new(HSTSList::new())); let hsts_list = Arc::new(RwLock::new(HSTSList::new()));
let cookie_jar = Arc::new(RwLock::new(CookieStorage::new())); let cookie_jar = Arc::new(RwLock::new(CookieStorage::new()));
let _ = load::<MockRequest>(load_data, hsts_list, cookie_jar, None, &Factory, DEFAULT_USER_AGENT.to_string()); let _ = load::<MockRequest>(load_data, hsts_list, cookie_jar, None, &Factory,
DEFAULT_USER_AGENT.to_string(), &CancellationListener::new(None));
} }
#[test] #[test]
@ -570,7 +572,8 @@ fn test_load_should_decode_the_response_as_deflate_when_response_headers_have_co
let mut response = load::<MockRequest>( let mut response = load::<MockRequest>(
load_data, hsts_list, cookie_jar, None, load_data, hsts_list, cookie_jar, None,
&Factory, &Factory,
DEFAULT_USER_AGENT.to_string()) DEFAULT_USER_AGENT.to_string(),
&CancellationListener::new(None))
.unwrap(); .unwrap();
assert_eq!(read_response(&mut response), "Yay!"); assert_eq!(read_response(&mut response), "Yay!");
@ -604,7 +607,8 @@ fn test_load_should_decode_the_response_as_gzip_when_response_headers_have_conte
hsts_list, hsts_list,
cookie_jar, cookie_jar,
None, &Factory, None, &Factory,
DEFAULT_USER_AGENT.to_string()) DEFAULT_USER_AGENT.to_string(),
&CancellationListener::new(None))
.unwrap(); .unwrap();
assert_eq!(read_response(&mut response), "Yay!"); assert_eq!(read_response(&mut response), "Yay!");
@ -647,7 +651,8 @@ fn test_load_doesnt_send_request_body_on_any_redirect() {
load_data, hsts_list, cookie_jar, load_data, hsts_list, cookie_jar,
None, None,
&Factory, &Factory,
DEFAULT_USER_AGENT.to_string()); DEFAULT_USER_AGENT.to_string(),
&CancellationListener::new(None));
} }
#[test] #[test]
@ -677,7 +682,8 @@ fn test_load_doesnt_add_host_to_sts_list_when_url_is_http_even_if_sts_headers_ar
cookie_jar, cookie_jar,
None, None,
&Factory, &Factory,
DEFAULT_USER_AGENT.to_string()); DEFAULT_USER_AGENT.to_string(),
&CancellationListener::new(None));
assert_eq!(hsts_list.read().unwrap().is_host_secure("mozilla.com"), false); assert_eq!(hsts_list.read().unwrap().is_host_secure("mozilla.com"), false);
} }
@ -709,7 +715,8 @@ fn test_load_adds_host_to_sts_list_when_url_is_https_and_sts_headers_are_present
cookie_jar, cookie_jar,
None, None,
&Factory, &Factory,
DEFAULT_USER_AGENT.to_string()); DEFAULT_USER_AGENT.to_string(),
&CancellationListener::new(None));
assert!(hsts_list.read().unwrap().is_host_secure("mozilla.com")); assert!(hsts_list.read().unwrap().is_host_secure("mozilla.com"));
} }
@ -743,7 +750,8 @@ fn test_load_sets_cookies_in_the_resource_manager_when_it_get_set_cookie_header_
cookie_jar.clone(), cookie_jar.clone(),
None, None,
&Factory, &Factory,
DEFAULT_USER_AGENT.to_string()); DEFAULT_USER_AGENT.to_string(),
&CancellationListener::new(None));
assert_cookie_for_domain(cookie_jar.clone(), "http://mozilla.com", "mozillaIs=theBest"); assert_cookie_for_domain(cookie_jar.clone(), "http://mozilla.com", "mozillaIs=theBest");
} }
@ -776,7 +784,8 @@ fn test_load_sets_requests_cookies_header_for_url_by_getting_cookies_from_the_re
&AssertMustIncludeHeadersRequestFactory { &AssertMustIncludeHeadersRequestFactory {
expected_headers: cookie, expected_headers: cookie,
body: <[_]>::to_vec(&*load_data.data.unwrap()) body: <[_]>::to_vec(&*load_data.data.unwrap())
}, DEFAULT_USER_AGENT.to_string()); }, DEFAULT_USER_AGENT.to_string(),
&CancellationListener::new(None));
} }
#[test] #[test]
@ -808,7 +817,7 @@ fn test_load_sends_cookie_if_nonhttp() {
&AssertMustIncludeHeadersRequestFactory { &AssertMustIncludeHeadersRequestFactory {
expected_headers: headers, expected_headers: headers,
body: <[_]>::to_vec(&*load_data.data.unwrap()) body: <[_]>::to_vec(&*load_data.data.unwrap())
}, DEFAULT_USER_AGENT.to_string()); }, DEFAULT_USER_AGENT.to_string(), &CancellationListener::new(None));
} }
#[test] #[test]
@ -836,7 +845,8 @@ fn test_cookie_set_with_httponly_should_not_be_available_using_getcookiesforurl(
cookie_jar.clone(), cookie_jar.clone(),
None, None,
&Factory, &Factory,
DEFAULT_USER_AGENT.to_string()); DEFAULT_USER_AGENT.to_string(),
&CancellationListener::new(None));
let mut cookie_jar = cookie_jar.write().unwrap(); let mut cookie_jar = cookie_jar.write().unwrap();
assert!(cookie_jar.cookies_for_url(&url, CookieSource::NonHTTP).is_none()); assert!(cookie_jar.cookies_for_url(&url, CookieSource::NonHTTP).is_none());
@ -865,7 +875,8 @@ fn test_when_cookie_received_marked_secure_is_ignored_for_http() {
cookie_jar.clone(), cookie_jar.clone(),
None, None,
&Factory, &Factory,
DEFAULT_USER_AGENT.to_string()); DEFAULT_USER_AGENT.to_string(),
&CancellationListener::new(None));
assert_cookie_for_domain(cookie_jar, "http://mozilla.com", ""); assert_cookie_for_domain(cookie_jar, "http://mozilla.com", "");
} }
@ -900,7 +911,7 @@ fn test_when_cookie_set_marked_httpsonly_secure_isnt_sent_on_http_request() {
&AssertMustNotHaveHeadersRequestFactory { &AssertMustNotHaveHeadersRequestFactory {
headers_not_expected: vec!["Cookie".to_owned()], headers_not_expected: vec!["Cookie".to_owned()],
body: <[_]>::to_vec(&*load_data.data.unwrap()) body: <[_]>::to_vec(&*load_data.data.unwrap())
}, DEFAULT_USER_AGENT.to_string()); }, DEFAULT_USER_AGENT.to_string(), &CancellationListener::new(None));
} }
#[test] #[test]
@ -921,7 +932,8 @@ fn test_load_sets_content_length_to_length_of_request_body() {
None, &AssertMustIncludeHeadersRequestFactory { None, &AssertMustIncludeHeadersRequestFactory {
expected_headers: content_len_headers, expected_headers: content_len_headers,
body: <[_]>::to_vec(&*load_data.data.unwrap()) body: <[_]>::to_vec(&*load_data.data.unwrap())
}, DEFAULT_USER_AGENT.to_string()); }, DEFAULT_USER_AGENT.to_string(),
&CancellationListener::new(None));
} }
#[test] #[test]
@ -946,7 +958,8 @@ fn test_load_uses_explicit_accept_from_headers_in_load_data() {
&AssertMustIncludeHeadersRequestFactory { &AssertMustIncludeHeadersRequestFactory {
expected_headers: accept_headers, expected_headers: accept_headers,
body: <[_]>::to_vec("Yay!".as_bytes()) body: <[_]>::to_vec("Yay!".as_bytes())
}, DEFAULT_USER_AGENT.to_string()); }, DEFAULT_USER_AGENT.to_string(),
&CancellationListener::new(None));
} }
#[test] #[test]
@ -973,7 +986,8 @@ fn test_load_sets_default_accept_to_html_xhtml_xml_and_then_anything_else() {
&AssertMustIncludeHeadersRequestFactory { &AssertMustIncludeHeadersRequestFactory {
expected_headers: accept_headers, expected_headers: accept_headers,
body: <[_]>::to_vec("Yay!".as_bytes()) body: <[_]>::to_vec("Yay!".as_bytes())
}, DEFAULT_USER_AGENT.to_string()); }, DEFAULT_USER_AGENT.to_string(),
&CancellationListener::new(None));
} }
#[test] #[test]
@ -996,7 +1010,8 @@ fn test_load_uses_explicit_accept_encoding_from_load_data_headers() {
&AssertMustIncludeHeadersRequestFactory { &AssertMustIncludeHeadersRequestFactory {
expected_headers: accept_encoding_headers, expected_headers: accept_encoding_headers,
body: <[_]>::to_vec("Yay!".as_bytes()) body: <[_]>::to_vec("Yay!".as_bytes())
}, DEFAULT_USER_AGENT.to_string()); }, DEFAULT_USER_AGENT.to_string(),
&CancellationListener::new(None));
} }
#[test] #[test]
@ -1020,7 +1035,8 @@ fn test_load_sets_default_accept_encoding_to_gzip_and_deflate() {
&AssertMustIncludeHeadersRequestFactory { &AssertMustIncludeHeadersRequestFactory {
expected_headers: accept_encoding_headers, expected_headers: accept_encoding_headers,
body: <[_]>::to_vec("Yay!".as_bytes()) body: <[_]>::to_vec("Yay!".as_bytes())
}, DEFAULT_USER_AGENT.to_string()); }, DEFAULT_USER_AGENT.to_string(),
&CancellationListener::new(None));
} }
#[test] #[test]
@ -1047,7 +1063,8 @@ fn test_load_errors_when_there_a_redirect_loop() {
let hsts_list = Arc::new(RwLock::new(HSTSList::new())); let hsts_list = Arc::new(RwLock::new(HSTSList::new()));
let cookie_jar = Arc::new(RwLock::new(CookieStorage::new())); let cookie_jar = Arc::new(RwLock::new(CookieStorage::new()));
match load::<MockRequest>(load_data, hsts_list, cookie_jar, None, &Factory, DEFAULT_USER_AGENT.to_string()) { match load::<MockRequest>(load_data, hsts_list, cookie_jar, None, &Factory,
DEFAULT_USER_AGENT.to_string(), &CancellationListener::new(None)) {
Err(LoadError::InvalidRedirect(_, msg)) => { Err(LoadError::InvalidRedirect(_, msg)) => {
assert_eq!(msg, "redirect loop"); assert_eq!(msg, "redirect loop");
}, },
@ -1077,7 +1094,8 @@ fn test_load_errors_when_there_is_too_many_redirects() {
let hsts_list = Arc::new(RwLock::new(HSTSList::new())); let hsts_list = Arc::new(RwLock::new(HSTSList::new()));
let cookie_jar = Arc::new(RwLock::new(CookieStorage::new())); let cookie_jar = Arc::new(RwLock::new(CookieStorage::new()));
match load::<MockRequest>(load_data, hsts_list, cookie_jar, None, &Factory, DEFAULT_USER_AGENT.to_string()) { match load::<MockRequest>(load_data, hsts_list, cookie_jar, None, &Factory,
DEFAULT_USER_AGENT.to_string(), &CancellationListener::new(None)) {
Err(LoadError::MaxRedirects(url)) => { Err(LoadError::MaxRedirects(url)) => {
assert_eq!(url.domain().unwrap(), "mozilla.com") assert_eq!(url.domain().unwrap(), "mozilla.com")
}, },
@ -1115,7 +1133,8 @@ fn test_load_follows_a_redirect() {
let hsts_list = Arc::new(RwLock::new(HSTSList::new())); let hsts_list = Arc::new(RwLock::new(HSTSList::new()));
let cookie_jar = Arc::new(RwLock::new(CookieStorage::new())); let cookie_jar = Arc::new(RwLock::new(CookieStorage::new()));
match load::<MockRequest>(load_data, hsts_list, cookie_jar, None, &Factory, DEFAULT_USER_AGENT.to_string()) { match load::<MockRequest>(load_data, hsts_list, cookie_jar, None, &Factory,
DEFAULT_USER_AGENT.to_string(), &CancellationListener::new(None)) {
Err(e) => panic!("expected to follow a redirect {:?}", e), Err(e) => panic!("expected to follow a redirect {:?}", e),
Ok(mut lr) => { Ok(mut lr) => {
let response = read_response(&mut lr); let response = read_response(&mut lr);
@ -1147,7 +1166,8 @@ fn test_load_errors_when_scheme_is_not_http_or_https() {
cookie_jar, cookie_jar,
None, None,
&DontConnectFactory, &DontConnectFactory,
DEFAULT_USER_AGENT.to_string()) { DEFAULT_USER_AGENT.to_string(),
&CancellationListener::new(None)) {
Err(LoadError::UnsupportedScheme(_)) => {} Err(LoadError::UnsupportedScheme(_)) => {}
_ => panic!("expected ftp scheme to be unsupported") _ => panic!("expected ftp scheme to be unsupported")
} }
@ -1166,8 +1186,52 @@ fn test_load_errors_when_viewing_source_and_inner_url_scheme_is_not_http_or_http
cookie_jar, cookie_jar,
None, None,
&DontConnectFactory, &DontConnectFactory,
DEFAULT_USER_AGENT.to_string()) { DEFAULT_USER_AGENT.to_string(),
&CancellationListener::new(None)) {
Err(LoadError::UnsupportedScheme(_)) => {} Err(LoadError::UnsupportedScheme(_)) => {}
_ => panic!("expected ftp scheme to be unsupported") _ => panic!("expected ftp scheme to be unsupported")
} }
} }
#[test]
fn test_load_errors_when_cancelled() {
use ipc_channel::ipc;
use net::resource_task::CancellableResource;
use net_traits::ResourceId;
struct Factory;
impl HttpRequestFactory for Factory {
type R = MockRequest;
fn create(&self, _: Url, _: Method) -> Result<MockRequest, LoadError> {
let mut headers = Headers::new();
headers.set(Host { hostname: "Kaboom!".to_owned(), port: None });
Ok(MockRequest::new(
ResponseType::WithHeaders(<[_]>::to_vec("BOOM!".as_bytes()), headers))
)
}
}
let (id_sender, _id_receiver) = ipc::channel().unwrap();
let (cancel_sender, cancel_receiver) = mpsc::channel();
let cancel_resource = CancellableResource::new(cancel_receiver, ResourceId(0), id_sender);
let cancel_listener = CancellationListener::new(Some(cancel_resource));
cancel_sender.send(()).unwrap();
let url = Url::parse("https://mozilla.com").unwrap();
let load_data = LoadData::new(url.clone(), None);
let hsts_list = Arc::new(RwLock::new(HSTSList::new()));
let cookie_jar = Arc::new(RwLock::new(CookieStorage::new()));
match load::<MockRequest>(load_data,
hsts_list,
cookie_jar,
None,
&Factory,
DEFAULT_USER_AGENT.to_string(),
&cancel_listener) {
Err(LoadError::Cancelled(_, _)) => (),
_ => panic!("expected load cancelled error!")
}
}