mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Moves the HSTS replacement code to http_loader
This respects STS for redirects as well.
This commit is contained in:
parent
826f56bdf3
commit
f2148f06b1
4 changed files with 49 additions and 50 deletions
|
@ -7,6 +7,7 @@ use net_traits::ProgressMsg::{Payload, Done};
|
|||
use devtools_traits::{DevtoolsControlMsg, NetworkEvent};
|
||||
use mime_classifier::MIMEClassifier;
|
||||
use resource_task::{start_sending_opt, start_sending_sniffed_opt};
|
||||
use hsts::{HSTSList, secure_url};
|
||||
|
||||
use log;
|
||||
use std::collections::HashSet;
|
||||
|
@ -33,11 +34,13 @@ use uuid;
|
|||
use std::borrow::ToOwned;
|
||||
use std::boxed::FnBox;
|
||||
|
||||
pub fn factory(cookies_chan: Sender<ControlMsg>, devtools_chan: Option<Sender<DevtoolsControlMsg>>)
|
||||
pub fn factory(cookies_chan: Sender<ControlMsg>,
|
||||
devtools_chan: Option<Sender<DevtoolsControlMsg>>,
|
||||
hsts_list: Option<HSTSList>)
|
||||
-> Box<FnBox(LoadData, LoadConsumer, Arc<MIMEClassifier>) + Send> {
|
||||
box move |load_data, senders, classifier| {
|
||||
spawn_named("http_loader".to_owned(),
|
||||
move || load(load_data, senders, classifier, cookies_chan, devtools_chan))
|
||||
move || load(load_data, senders, classifier, cookies_chan, devtools_chan, hsts_list))
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -69,8 +72,21 @@ fn read_block<R: Read>(reader: &mut R) -> Result<ReadResult, ()> {
|
|||
}
|
||||
}
|
||||
|
||||
fn load(mut load_data: LoadData, start_chan: LoadConsumer, classifier: Arc<MIMEClassifier>,
|
||||
cookies_chan: Sender<ControlMsg>, devtools_chan: Option<Sender<DevtoolsControlMsg>>) {
|
||||
fn request_must_be_secured(hsts_list: Option<&HSTSList>, url: &Url) -> bool {
|
||||
match (hsts_list.as_ref(), url.domain()) {
|
||||
(Some(ref l), Some(ref h)) => {
|
||||
l.is_host_secure(h)
|
||||
},
|
||||
_ => false
|
||||
}
|
||||
}
|
||||
|
||||
fn load(mut load_data: LoadData,
|
||||
start_chan: LoadConsumer,
|
||||
classifier: Arc<MIMEClassifier>,
|
||||
cookies_chan: Sender<ControlMsg>,
|
||||
devtools_chan: Option<Sender<DevtoolsControlMsg>>,
|
||||
hsts_list: Option<HSTSList>) {
|
||||
// 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.
|
||||
|
@ -101,6 +117,11 @@ fn load(mut load_data: LoadData, start_chan: LoadConsumer, classifier: Arc<MIMEC
|
|||
loop {
|
||||
iters = iters + 1;
|
||||
|
||||
if request_must_be_secured(hsts_list.as_ref(), &url) {
|
||||
info!("{} is in the strict transport security list, requesting secure host", url);
|
||||
url = secure_url(&url);
|
||||
}
|
||||
|
||||
if iters > max_redirects {
|
||||
send_error(url, "too many redirects".to_string(), start_chan);
|
||||
return;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue