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

Filter response headers

Browse source
This commit is contained in:
Manish Goregaokar 2014-06-29 12:34:16 +05:30
parent 3c1a477e10
commit 17631ffcb8
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
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() self.status_text.deref().borrow().clone()
} }
fn GetResponseHeader(&self, name: ByteString) -> Option<ByteString> { 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()) name.eq_ignore_case(&FromStr::from_str(h.header_name().as_slice()).unwrap())
}).map(|h| { }).map(|h| {
FromStr::from_str(h.header_value().as_slice()).unwrap() 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 { fn GetAllResponseHeaders(&self) -> ByteString {
let mut writer = MemWriter::new(); 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(); let mut vec = writer.unwrap();
// rust-http appends an extra "\r\n" when using write_all // rust-http appends an extra "\r\n" when using write_all
@ -669,6 +669,7 @@ trait PrivateXMLHttpRequestHelpers {
fn text_response(&self) -> DOMString; fn text_response(&self) -> DOMString;
fn set_timeout(&self, timeout:u32); fn set_timeout(&self, timeout:u32);
fn cancel_timeout(&self); fn cancel_timeout(&self);
fn filter_response_headers(&self) -> ResponseHeaderCollection;
} }
impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> { impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
@ -904,4 +905,16 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
// the result should be fine. XXXManishearth have a closer look at this later // 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() 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
}
} }