Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +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

28
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,10 +291,10 @@ impl HSTSList {
});
}
}
}
pub fn make_hsts_secure(&self, load_data: LoadData) -> LoadData {
pub fn secure_load_data(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();
@ -302,14 +302,12 @@ impl HSTSList {
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> {

76
tests/unit/net/resource_task.rs
View file

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use net::resource_task::{
new_resource_task, parse_hostsfile, replace_hosts, HSTSList, HSTSEntry
new_resource_task, parse_hostsfile, replace_hosts, HSTSList, HSTSEntry, secure_load_data
};
use net_traits::{ControlMsg, LoadData, LoadConsumer};
use net_traits::ProgressMsg;
@ -97,11 +97,11 @@ fn test_push_entry_to_hsts_list_should_update_existing_domain_entrys_include_sub
entries: vec!(HSTSEntry::new("mozilla.org".to_string(), true, None).unwrap())
};
assert!(list.always_secure("servo.mozilla.org"));
assert!(list.is_host_secure("servo.mozilla.org"));
list.push(HSTSEntry::new("mozilla.org".to_string(), false, None).unwrap());
assert!(!list.always_secure("servo.mozilla.org"))
assert!(!list.is_host_secure("servo.mozilla.org"))
}
#[test]
@ -121,11 +121,11 @@ fn test_push_entry_to_hsts_list_should_add_an_entry() {
entries: Vec::new()
};
assert!(!list.always_secure("mozilla.org"));
assert!(!list.is_host_secure("mozilla.org"));
list.push(HSTSEntry::new("mozilla.org".to_string(), true, None).unwrap());
assert!(list.always_secure("mozilla.org"));
assert!(list.is_host_secure("mozilla.org"));
}
#[test]
@ -162,61 +162,61 @@ fn test_parse_hsts_preload_should_decode_host_and_includes_subdomains() {
}
#[test]
fn test_hsts_list_with_no_entries_does_not_always_secure() {
fn test_hsts_list_with_no_entries_does_not_is_host_secure() {
let hsts_list = HSTSList {
entries: Vec::new()
};
assert!(hsts_list.always_secure("mozilla.org") == false);
assert!(hsts_list.is_host_secure("mozilla.org") == false);
}
#[test]
fn test_hsts_list_with_exact_domain_entry_is_always_secure() {
fn test_hsts_list_with_exact_domain_entry_is_is_host_secure() {
let hsts_list = HSTSList {
entries: vec![HSTSEntry::new("mozilla.org".to_string(), false, None).unwrap()]
};
assert!(hsts_list.always_secure("mozilla.org") == true);
assert!(hsts_list.is_host_secure("mozilla.org") == true);
}
#[test]
fn test_hsts_list_with_subdomain_when_include_subdomains_is_true_is_always_secure() {
fn test_hsts_list_with_subdomain_when_include_subdomains_is_true_is_is_host_secure() {
let hsts_list = HSTSList {
entries: vec![HSTSEntry::new("mozilla.org".to_string(), true, None).unwrap()]
};
assert!(hsts_list.always_secure("servo.mozilla.org") == true);
assert!(hsts_list.is_host_secure("servo.mozilla.org") == true);
}
#[test]
fn test_hsts_list_with_subdomain_when_include_subdomains_is_false_is_not_always_secure() {
fn test_hsts_list_with_subdomain_when_include_subdomains_is_false_is_not_is_host_secure() {
let hsts_list = HSTSList {
entries: vec![HSTSEntry::new("mozilla.org".to_string(), false, None).unwrap()]
};
assert!(hsts_list.always_secure("servo.mozilla.org") == false);
assert!(hsts_list.is_host_secure("servo.mozilla.org") == false);
}
#[test]
fn test_hsts_list_with_subdomain_when_host_is_not_a_subdomain_is_not_always_secure() {
fn test_hsts_list_with_subdomain_when_host_is_not_a_subdomain_is_not_is_host_secure() {
let hsts_list = HSTSList {
entries: vec![HSTSEntry::new("mozilla.org".to_string(), true, None).unwrap()]
};
assert!(hsts_list.always_secure("servo-mozilla.org") == false);
assert!(hsts_list.is_host_secure("servo-mozilla.org") == false);
}
#[test]
fn test_hsts_list_with_subdomain_when_host_is_exact_match_is_always_secure() {
fn test_hsts_list_with_subdomain_when_host_is_exact_match_is_is_host_secure() {
let hsts_list = HSTSList {
entries: vec![HSTSEntry::new("mozilla.org".to_string(), true, None).unwrap()]
};
assert!(hsts_list.always_secure("mozilla.org") == true);
assert!(hsts_list.is_host_secure("mozilla.org") == true);
}
#[test]
fn test_hsts_list_with_expired_entry_is_not_always_secure() {
fn test_hsts_list_with_expired_entry_is_not_is_host_secure() {
let hsts_list = HSTSList {
entries: vec![HSTSEntry {
host: "mozilla.org".to_string(),
@ -226,51 +226,31 @@ fn test_hsts_list_with_expired_entry_is_not_always_secure() {
}]
};
assert!(!hsts_list.always_secure("mozilla.org"));
assert!(!hsts_list.is_host_secure("mozilla.org"));
}
#[test]
fn test_make_hsts_secure_does_not_change_explicit_port() {
fn test_secure_load_data_does_not_change_explicit_port() {
let load_data = LoadData::new(Url::parse("http://mozilla.org:8080/").unwrap(), None);
let hsts_list = HSTSList {
entries: vec![HSTSEntry::new("mozilla.org".to_string(), false, None).unwrap()]
};
let secure_load_data = hsts_list.make_hsts_secure(load_data);
let secure = secure_load_data(&load_data);
assert!(secure_load_data.url.port().unwrap() == 8080u16);
assert!(secure.url.port().unwrap() == 8080u16);
}
#[test]
fn test_make_hsts_secure_doesnt_affect_non_http_schemas() {
fn test_secure_load_data_does_not_affect_non_http_schemas() {
let load_data = LoadData::new(Url::parse("file://mozilla.org").unwrap(), None);
let hsts_list = HSTSList {
entries: vec![HSTSEntry::new("mozilla.org".to_string(), false, None).unwrap()]
};
let secure_load_data = hsts_list.make_hsts_secure(load_data);
let secure = secure_load_data(&load_data);
assert!(&secure_load_data.url.scheme == "file");
assert!(&secure.url.scheme == "file");
}
#[test]
fn test_make_hsts_secure_sets_secure_schema_on_subdomains_when_include_subdomains_is_true() {
let load_data = LoadData::new(Url::parse("http://servo.mozilla.org").unwrap(), None);
let hsts_list = HSTSList {
entries: vec![HSTSEntry::new("mozilla.org".to_string(), true, None).unwrap()]
};
let secure_load_data = hsts_list.make_hsts_secure(load_data);
assert!(&secure_load_data.url.scheme == "https");
}
#[test]
fn test_make_hsts_secure_forces_an_http_host_in_list_to_https() {
fn test_secure_load_data_forces_an_http_host_in_list_to_https() {
let load_data = LoadData::new(Url::parse("http://mozilla.org").unwrap(), None);
let hsts_list = HSTSList {
entries: vec![HSTSEntry::new("mozilla.org".to_string(), false, None).unwrap()]
};
let secure_load_data = hsts_list.make_hsts_secure(load_data);
let secure = secure_load_data(&load_data);
assert!(&secure_load_data.url.scheme == "https");
assert!(&secure.url.scheme == "https");
}
#[test]