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

Merge pull request #2731 from Manishearth/xhr-wpt-header-filter

Browse source 
Filter response headers, fix responseType's error in XHR
This commit is contained in:
Josh Matthews 2014-07-02 16:51:55 -04:00
commit 568e7ed0c6
4 changed files with 18 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/components/script/dom/xmlhttprequest.rs
View file

@ -553,7 +553,7 @@ impl<'a> XMLHttpRequestMethods<'a> for JSRef<'a, XMLHttpRequest> {
self.status_text.deref().borrow().clone()
}
fn GetResponseHeader(&self, name: ByteString) -> Option<ByteString> {
self.response_headers.deref().borrow().iter().find(|h| {
self.filter_response_headers().iter().find(|h| {
name.eq_ignore_case(&FromStr::from_str(h.header_name().as_slice()).unwrap())
}).map(|h| {
FromStr::from_str(h.header_value().as_slice()).unwrap()
@ -561,7 +561,7 @@ impl<'a> XMLHttpRequestMethods<'a> for JSRef<'a, XMLHttpRequest> {
}
fn GetAllResponseHeaders(&self) -> ByteString {
let mut writer = MemWriter::new();
self.response_headers.deref().borrow().write_all(&mut writer).ok().expect("Writing response headers failed");
self.filter_response_headers().write_all(&mut writer).ok().expect("Writing response headers failed");
let mut vec = writer.unwrap();
// rust-http appends an extra "\r\n" when using write_all
@ -577,13 +577,11 @@ impl<'a> XMLHttpRequestMethods<'a> for JSRef<'a, XMLHttpRequest> {
self.response_type.deref().get()
}
fn SetResponseType(&self, response_type: XMLHttpRequestResponseType) -> ErrorResult {
if self.sync.deref().get() {
// FIXME: When Workers are implemented, there should be
// an additional check that this is a document environment
return Err(InvalidState);
}
match self.ready_state.deref().get() {
Loading | XHRDone => Err(InvalidState),
_ if self.sync.deref().get() => Err(InvalidAccess),
_ => {
self.response_type.deref().set(response_type);
Ok(())
@ -669,6 +667,7 @@ trait PrivateXMLHttpRequestHelpers {
fn text_response(&self) -> DOMString;
fn set_timeout(&self, timeout:u32);
fn cancel_timeout(&self);
fn filter_response_headers(&self) -> ResponseHeaderCollection;
}
impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
@ -904,4 +903,16 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
// the result should be fine. XXXManishearth have a closer look at this later
encoding.decode(self.response.deref().borrow().as_slice(), DecodeReplace).unwrap().to_string()
}
fn filter_response_headers(&self) -> ResponseHeaderCollection {
// http://fetch.spec.whatwg.org/#concept-response-header-list
let mut headers = ResponseHeaderCollection::new();
for header in self.response_headers.deref().borrow().iter() {
match header.header_name().as_slice().to_ascii_lower().as_slice() {
"set-cookie" | "set-cookie2" => {},
// XXXManishearth additional CORS filtering goes here
_ => headers.insert(header)
};
}
headers
}
}

5
src/test/wpt/metadata/XMLHttpRequest/getallresponseheaders-cookies.htm.ini
View file

@ -1,5 +0,0 @@
[getallresponseheaders-cookies.htm]
type: testharness
[XMLHttpRequest: getAllResponseHeaders() excludes cookies]
expected: FAIL

5
src/test/wpt/metadata/XMLHttpRequest/getresponseheader-cookies-and-more.htm.ini
View file

@ -1,5 +0,0 @@
[getresponseheader-cookies-and-more.htm]
type: testharness
[XMLHttpRequest: getResponseHeader() custom/non-existent headers and cookies]
expected: FAIL

20
src/test/wpt/metadata/XMLHttpRequest/responsetype.html.ini
View file

@ -1,20 +0,0 @@
[responsetype.html]
type: testharness
[Set responseType to "" when readyState is OPENED and the sync flag is set.]
expected: FAIL
[Set responseType to "json" when readyState is OPENED and the sync flag is set.]
expected: FAIL
[Set responseType to "document" when readyState is OPENED and the sync flag is set.]
expected: FAIL
[Set responseType to "arraybuffer" when readyState is OPENED and the sync flag is set.]
expected: FAIL
[Set responseType to "blob" when readyState is OPENED and the sync flag is set.]
expected: FAIL
[Set responseType to "text" when readyState is OPENED and the sync flag is set.]
expected: FAIL