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

Rename/refactor

Browse source
This commit is contained in:
Sam Gibson 2015-06-23 14:59:23 -07:00
parent 15c90a58b2
commit 690ac636eb
2 changed files with 53 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

46
components/net/resource_task.rs
View file

@ -243,7 +243,7 @@ impl HSTSList {
}
}
pub fn always_secure(&self, host: &str) -> bool {
pub fn is_host_secure(&self, host: &str) -> bool {
// TODO - Should this be faster than O(n)? The HSTS list is only a few
// hundred or maybe thousand entries...
//
@ -291,25 +291,23 @@ impl HSTSList {
});
}
}
}
pub fn make_hsts_secure(&self, load_data: LoadData) -> LoadData {
if let Some(h) = load_data.url.domain() {
if self.always_secure(h) {
match &*load_data.url.scheme {
"http" => {
let mut secure_load_data = load_data.clone();
let mut secure_url = load_data.url.clone();
secure_url.scheme = "https".to_string();
secure_load_data.url = secure_url;
pub fn secure_load_data(load_data: &LoadData) -> LoadData {
if let Some(h) = load_data.url.domain() {
match &*load_data.url.scheme {
"http" => {
let mut secure_load_data = load_data.clone();
let mut secure_url = load_data.url.clone();
secure_url.scheme = "https".to_string();
secure_load_data.url = secure_url;
return secure_load_data
},
_ => ()
};
}
secure_load_data
},
_ => load_data.clone()
}
load_data
} else {
load_data.clone()
}
}
@ -416,10 +414,16 @@ impl ResourceManager {
load_data.preserved_headers.set(UserAgent(ua.clone()));
});
match self.hsts_list {
Some(ref l) => load_data = l.make_hsts_secure(load_data),
_ => ()
}
load_data = match (self.hsts_list.as_ref(), load_data.url.domain()) {
(Some(ref l), Some(ref h)) => {
if l.is_host_secure(h) {
secure_load_data(&load_data)
} else {
load_data.clone()
}
},
_ => load_data.clone()
};
fn from_factory(factory: fn(LoadData, LoadConsumer, Arc<MIMEClassifier>))
-> Box<FnBox(LoadData, LoadConsumer, Arc<MIMEClassifier>) + Send> {