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

Added bound to number of HTTP redirects, and prevented redirect loops.

Browse source
This commit is contained in:
Clark Gaebel 2014-01-25 18:29:04 -05:00
parent 75acf1175a
commit 015902f778
1 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/components/net/http_loader.rs
View file

@ -5,6 +5,7 @@
use resource_task::{Metadata, Payload, Done, LoadResponse, LoaderTask, start_sending};
use std::vec;
use std::hashmap::HashSet;
use extra::url::Url;
use http::client::RequestWriter;
use http::method::Get;
@ -19,9 +20,37 @@ pub fn factory() -> LoaderTask {
f
}
fn send_error(url: Url, start_chan: Chan<LoadResponse>) {
start_sending(start_chan, Metadata::default(url)).send(Done(Err(())));
}
fn load(mut url: Url, start_chan: Chan<LoadResponse>) {
// 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
// repository DOES exist, please update this constant to use it.
let max_redirects = 50u;
let mut iters = 0u;
let mut redirected_to = HashSet::new();
// Loop to handle redirects.
loop {
iters = iters + 1;
if iters > max_redirects {
info!("too many redirects");
send_error(url, start_chan);
return;
}
if redirected_to.contains(&url) {
info!("redirect loop");
send_error(url, start_chan);
return;
}
redirected_to.insert(url.clone());
assert!("http" == url.scheme);
info!("requesting {:s}", url.to_str());
@ -30,7 +59,7 @@ fn load(mut url: Url, start_chan: Chan<LoadResponse>) {
let mut response = match request.read_response() {
Ok(r) => r,
Err(_) => {
start_sending(start_chan, Metadata::default(url)).send(Done(Err(())));
send_error(url, start_chan);
return;
}
};
@ -42,7 +71,6 @@ fn load(mut url: Url, start_chan: Chan<LoadResponse>) {
info!(" - {:s}: {:s}", header.header_name(), header.header_value());
});
// FIXME: detect redirect loops
if 3 == (response.status.code() / 100) {
match response.headers.location {
Some(new_url) => {