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

Auto merge of #9298 - nikkisquared:test_fetch, r=KiChjang

Browse source 
Implement a basic test for Fetch

As per @jdm's suggestion that I start minimally testing the Fetch protocol to catch any errors, I wrote a very simple test that just calls Fetch and checks that the response isn't a network error. I've made changes as necessary for every failure I encountered, although this doesn't mean the implementation is faultless yet.

As always, I look forward to any feedback for improvements regarding the test itself, the changes to the fetch files I've made, and anything that I missed and should update.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9298)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-01-14 08:20:05 +05:30
commit 9c713cb468
5 changed files with 89 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

47
components/net/fetch/request.rs
View file

@ -116,7 +116,7 @@ pub struct Request {
pub origin: Option<Url>, // FIXME: Use Url::Origin
pub force_origin_header: bool,
pub omit_origin_header: bool,
pub same_origin_data: bool,
pub same_origin_data: Cell<bool>,
pub referer: Referer,
pub authentication: bool,
pub sync: bool,
@ -145,7 +145,7 @@ impl Request {
origin: None,
force_origin_header: false,
omit_origin_header: false,
same_origin_data: false,
same_origin_data: Cell::new(false),
referer: Referer::Client,
authentication: false,
sync: false,
@ -235,8 +235,8 @@ pub fn fetch(request: Rc<Request>, cors_flag: bool) -> Response {
/// [Main fetch](https://fetch.spec.whatwg.org/#concept-main-fetch)
fn main_fetch(request: Rc<Request>, _cors_flag: bool) -> Response {
// TODO: Implement main fetch spec
let _ = basic_fetch(request);
Response::network_error()
let response = basic_fetch(request);
response
}
/// [Basic fetch](https://fetch.spec.whatwg.org#basic-fetch)
@ -305,6 +305,7 @@ fn http_fetch(request: Rc<Request>,
if !request.skip_service_worker.get() && !request.is_service_worker_global_scope {
// TODO: Substep 1 (handle fetch unimplemented)
if let Some(ref res) = response {
// Substep 2
@ -361,7 +362,7 @@ fn http_fetch(request: Rc<Request>,
destination: url.clone(),
credentials: credentials
}, view.name()) && !is_simple_header(&view)
);
);
if method_mismatch || header_mismatch {
let preflight_result = preflight_fetch(request.clone());
@ -396,10 +397,11 @@ fn http_fetch(request: Rc<Request>,
actual_response = response.clone();
}
// Step 5
let actual_response = Rc::try_unwrap(actual_response.unwrap()).ok().unwrap();
let mut response = Rc::try_unwrap(response.unwrap()).ok().unwrap();
// response and actual_response are guaranteed to be something by now
let mut response = response.unwrap();
let actual_response = actual_response.unwrap();
// Step 5
match actual_response.status.unwrap() {
// Code 301, 302, 303, 307, 308
@ -411,13 +413,16 @@ fn http_fetch(request: Rc<Request>,
return Response::network_error();
}
// Step 2-4
// Step 3
if !actual_response.headers.has::<Location>() {
return actual_response;
drop(actual_response);
return Rc::try_unwrap(response).ok().unwrap();
}
// Step 2
let location = match actual_response.headers.get::<Location>() {
Some(&Location(ref location)) => location.clone(),
// Step 4
_ => return Response::network_error(),
};
@ -426,7 +431,6 @@ fn http_fetch(request: Rc<Request>,
// Step 6
let location_url = match location_url {
Ok(ref url) if url.scheme == "data" => { return Response::network_error(); }
Ok(url) => url,
_ => { return Response::network_error(); }
};
@ -439,14 +443,17 @@ fn http_fetch(request: Rc<Request>,
// Step 8
request.redirect_count.set(request.redirect_count.get() + 1);
// Step 9
request.same_origin_data.set(false);
match request.redirect_mode {
// Step 9
// Step 10
RedirectMode::Manual => {
response = actual_response.to_filtered(ResponseType::Opaque);
response = Rc::new(Response::to_filtered(actual_response, ResponseType::Opaque));
}
// Step 10
// Step 11
RedirectMode::Follow => {
// Substep 1
@ -493,7 +500,8 @@ fn http_fetch(request: Rc<Request>,
// Step 1
// FIXME: Figure out what to do with request window objects
if cors_flag {
return response;
drop(actual_response);
return Rc::try_unwrap(response).ok().unwrap();
}
// Step 2
@ -526,7 +534,7 @@ fn http_fetch(request: Rc<Request>,
authentication_fetch_flag);
}
_ => { }
_ => drop(actual_response)
}
// Step 6
@ -535,7 +543,7 @@ fn http_fetch(request: Rc<Request>,
}
// Step 7
response
Rc::try_unwrap(response).ok().unwrap()
}
/// [HTTP network or cache fetch](https://fetch.spec.whatwg.org#http-network-or-cache-fetch)
@ -744,10 +752,7 @@ fn http_network_fetch(request: Rc<Request>,
let cancellation_listener = CancellationListener::new(None);
let wrapped_response = obtain_response(&factory, &url, &request.method.borrow(),
// TODO nikkisquared: use this line instead
// after merging with another branch
// &request.headers.borrow()
&mut *request.headers.borrow_mut(),
&request.headers.borrow(),
&cancellation_listener, &None, &request.method.borrow(),
&None, request.redirect_count.get(), &None, "");

23
components/net/fetch/response.rs
View file

@ -13,7 +13,7 @@ use url::Url;
pub trait ResponseMethods {
fn new() -> Response;
fn to_filtered(self, ResponseType) -> Response;
fn to_filtered(Rc<Response>, ResponseType) -> Response;
}
impl ResponseMethods for Response {
@ -34,17 +34,23 @@ impl ResponseMethods for Response {
/// Convert to a filtered response, of type `filter_type`.
/// Do not use with type Error or Default
fn to_filtered(self, filter_type: ResponseType) -> Response {
fn to_filtered(old_response: Rc<Response>, filter_type: ResponseType) -> Response {
assert!(filter_type != ResponseType::Error);
assert!(filter_type != ResponseType::Default);
if self.is_network_error() {
return self;
if Response::is_network_error(&old_response) {
return Response::network_error();
}
let old_headers = self.headers.clone();
let mut response = self.clone();
response.internal_response = Some(Rc::new(self));
let old_headers = old_response.headers.clone();
let mut response = (*old_response).clone();
response.internal_response = Some(old_response);
match filter_type {
ResponseType::Default | ResponseType::Error => unreachable!(),
ResponseType::Basic => {
let headers = old_headers.iter().filter(|header| {
match &*header.name().to_ascii_lowercase() {
@ -55,6 +61,7 @@ impl ResponseMethods for Response {
response.headers = headers;
response.response_type = filter_type;
},
ResponseType::CORS => {
let headers = old_headers.iter().filter(|header| {
match &*header.name().to_ascii_lowercase() {
@ -67,6 +74,7 @@ impl ResponseMethods for Response {
response.headers = headers;
response.response_type = filter_type;
},
ResponseType::Opaque |
ResponseType::OpaqueRedirect => {
response.headers = Headers::new();
@ -74,6 +82,7 @@ impl ResponseMethods for Response {
response.body = ResponseBody::Empty;
}
}
response
}
}

4
components/net/http_loader.rs
View file

@ -554,7 +554,7 @@ pub fn process_response_headers(response: &HttpResponse,
pub fn obtain_response<A>(request_factory: &HttpRequestFactory<R=A>,
url: &Url,
method: &Method,
request_headers: &mut Headers,
request_headers: &Headers,
cancel_listener: &CancellationListener,
data: &Option<Vec<u8>>,
load_data_method: &Method,
@ -706,7 +706,7 @@ pub fn load<A>(load_data: LoadData,
modify_request_headers(&mut request_headers, &doc_url, &user_agent, &cookie_jar, &load_data);
let response = try!(obtain_response(request_factory, &url, &method, &mut request_headers,
let response = try!(obtain_response(request_factory, &url, &method, &request_headers,
&cancel_listener, &load_data.data, &load_data.method,
&load_data.pipeline_id, iters, &devtools_chan, &request_id));