mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-31 21:21:08 +00:00
3fa74a14ad
…so with proper alignment. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [X] These changes fix #16486 (github issue number if applicable). <!-- Either: --> - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 195100f3cac99b979e25157eb437e63bd3262e6f --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 1f340388b3b70f620cbfba6d216955d3ef23b7cb
149 lines
4.7 KiB
Rust
149 lines
4.7 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
use net_traits::IncludeSubdomains;
|
|
use net_traits::pub_domains::reg_suffix;
|
|
use serde_json;
|
|
use servo_config::resource_files::read_resource_file;
|
|
use servo_url::ServoUrl;
|
|
use std::collections::HashMap;
|
|
use std::net::{Ipv4Addr, Ipv6Addr};
|
|
use std::str::from_utf8;
|
|
use time;
|
|
|
|
#[derive(Clone, Deserialize, Serialize)]
|
|
pub struct HstsEntry {
|
|
pub host: String,
|
|
pub include_subdomains: bool,
|
|
pub max_age: Option<u64>,
|
|
pub timestamp: Option<u64>
|
|
}
|
|
|
|
impl HstsEntry {
|
|
pub fn new(host: String, subdomains: IncludeSubdomains, max_age: Option<u64>) -> Option<HstsEntry> {
|
|
if host.parse::<Ipv4Addr>().is_ok() || host.parse::<Ipv6Addr>().is_ok() {
|
|
None
|
|
} else {
|
|
Some(HstsEntry {
|
|
host: host,
|
|
include_subdomains: (subdomains == IncludeSubdomains::Included),
|
|
max_age: max_age,
|
|
timestamp: Some(time::get_time().sec as u64)
|
|
})
|
|
}
|
|
}
|
|
|
|
pub fn is_expired(&self) -> bool {
|
|
match (self.max_age, self.timestamp) {
|
|
(Some(max_age), Some(timestamp)) => {
|
|
(time::get_time().sec as u64) - timestamp >= max_age
|
|
}
|
|
|
|
_ => false
|
|
}
|
|
}
|
|
|
|
fn matches_domain(&self, host: &str) -> bool {
|
|
!self.is_expired() && self.host == host
|
|
}
|
|
|
|
fn matches_subdomain(&self, host: &str) -> bool {
|
|
!self.is_expired() && host.ends_with(&format!(".{}", self.host))
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Deserialize, Serialize)]
|
|
pub struct HstsList {
|
|
pub entries_map: HashMap<String, Vec<HstsEntry>>,
|
|
}
|
|
|
|
impl HstsList {
|
|
pub fn new() -> HstsList {
|
|
HstsList { entries_map: HashMap::new() }
|
|
}
|
|
|
|
/// Create an `HstsList` from the bytes of a JSON preload file.
|
|
pub fn from_preload(preload_content: &[u8]) -> Option<HstsList> {
|
|
#[derive(Deserialize)]
|
|
struct HstsEntries {
|
|
entries: Vec<HstsEntry>,
|
|
}
|
|
|
|
let hsts_entries: Option<HstsEntries> = from_utf8(&preload_content)
|
|
.ok()
|
|
.and_then(|c| serde_json::from_str(c).ok());
|
|
|
|
hsts_entries.map_or(None, |hsts_entries| {
|
|
let mut hsts_list: HstsList = HstsList::new();
|
|
|
|
for hsts_entry in hsts_entries.entries {
|
|
hsts_list.push(hsts_entry);
|
|
}
|
|
|
|
return Some(hsts_list);
|
|
})
|
|
}
|
|
|
|
pub fn from_servo_preload() -> HstsList {
|
|
let file_bytes = read_resource_file("hsts_preload.json")
|
|
.expect("Could not find Servo HSTS preload file");
|
|
HstsList::from_preload(&file_bytes)
|
|
.expect("Servo HSTS preload file is invalid")
|
|
}
|
|
|
|
pub fn is_host_secure(&self, host: &str) -> bool {
|
|
let base_domain = reg_suffix(host);
|
|
self.entries_map.get(base_domain).map_or(false, |entries| {
|
|
entries.iter().any(|e| {
|
|
if e.include_subdomains {
|
|
e.matches_subdomain(host) || e.matches_domain(host)
|
|
} else {
|
|
e.matches_domain(host)
|
|
}
|
|
})
|
|
})
|
|
}
|
|
|
|
fn has_domain(&self, host: &str, base_domain: &str) -> bool {
|
|
self.entries_map.get(base_domain).map_or(false, |entries| {
|
|
entries.iter().any(|e| e.matches_domain(&host))
|
|
})
|
|
}
|
|
|
|
fn has_subdomain(&self, host: &str, base_domain: &str) -> bool {
|
|
self.entries_map.get(base_domain).map_or(false, |entries| {
|
|
entries.iter().any(|e| e.matches_subdomain(host))
|
|
})
|
|
}
|
|
|
|
pub fn push(&mut self, entry: HstsEntry) {
|
|
let host = entry.host.clone();
|
|
let base_domain = reg_suffix(&host);
|
|
let have_domain = self.has_domain(&entry.host, base_domain);
|
|
let have_subdomain = self.has_subdomain(&entry.host, base_domain);
|
|
|
|
let entries = self.entries_map.entry(base_domain.to_owned()).or_insert(vec![]);
|
|
if !have_domain && !have_subdomain {
|
|
entries.push(entry);
|
|
} else if !have_subdomain {
|
|
for e in entries {
|
|
if e.matches_domain(&entry.host) {
|
|
e.include_subdomains = entry.include_subdomains;
|
|
e.max_age = entry.max_age;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Step 10 of https://fetch.spec.whatwg.org/#concept-main-fetch.
|
|
pub fn switch_known_hsts_host_domain_url_to_https(&self, url: &mut ServoUrl) {
|
|
if url.scheme() != "http" {
|
|
return;
|
|
}
|
|
if url.domain().map_or(false, |domain| self.is_host_secure(domain)) {
|
|
url.as_mut_url().set_scheme("https").unwrap();
|
|
}
|
|
}
|
|
}
|