mirror of
https://github.com/servo/servo.git
synced 2025-08-07 06:25:32 +01:00
Replace hsts preload list hashmap with an FST (#37015)
This reduces the memory used by the preload list to just 1.9MB. The
total memory savings in HSTS from
pre-103cbed928
is now 62MB, or 96%. And in terms of total resident memory is a 7.5%
reduction. The DAFSA/DAWG used by Firefox is 1.1MB so there could be
additional gains available but this seems like the best option based on
maintained libraries available (I could not find a good maintained
library for DAFSAs in Rust).
The main trick is this: the FST map API is currently designed to map
byte sequences to u64 values. Because we only need to determine if a
preloaded domain has the `includeSubdomains` flag set, we encode that
into the lowest bit of the ids in the map. This way finding an entry in
the map directly provides us with the `includeSubdomains` flag and we
don't need to keep another mapping in memory or on disk.
Updated the `./mach update-hsts-preload` command to generate the new FST
map file. (Not sure if I need to update any dev-dependencies anywhere
for this change)
This change also replaces the use of "mozilla.org" with "example.com" in
the HSTS unit tests to make sure that entries in the preload list do not
influence the tests (since example.com should not ever end up on the
preload list)
Testing: Updated unit tests
Fixes: #25929
---------
Signed-off-by: Sebastian C <sebsebmc@gmail.com>
This commit is contained in:
Sebastian C
GitHub
parent
3a6d3c7bed
commit
27c8a899ea
11 changed files with 139 additions and 373010 deletions
|
|
@ -9,9 +9,11 @@ use std::sync::LazyLock;
|
|||
use std::time::Duration;
|
||||
|
||||
use embedder_traits::resources::{self, Resource};
|
||||
use fst::{Map, MapBuilder};
|
||||
use headers::{HeaderMapExt, StrictTransportSecurity};
|
||||
use http::HeaderMap;
|
||||
use log::{debug, error, info};
|
||||
use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
|
||||
use malloc_size_of_derive::MallocSizeOf;
|
||||
use net_traits::IncludeSubdomains;
|
||||
use net_traits::pub_domains::reg_suffix;
|
||||
|
|
@ -85,99 +87,67 @@ pub struct HstsList {
|
|||
/// it is split out to allow sharing between the private and public http state
|
||||
/// as well as potentially swpaping out the underlying type to something immutable
|
||||
/// and more efficient like FSTs or DAFSA/DAWGs.
|
||||
#[derive(Clone, Debug, Default, Deserialize, MallocSizeOf, Serialize)]
|
||||
pub struct HstsPreloadList {
|
||||
pub entries_map: HashMap<String, Vec<HstsEntry>>,
|
||||
/// To generate a new version of the FST map file run `./mach update-hsts-preload`
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct HstsPreloadList(pub fst::Map<Vec<u8>>);
|
||||
|
||||
impl MallocSizeOf for HstsPreloadList {
|
||||
#[allow(unsafe_code)]
|
||||
fn size_of(&self, ops: &mut malloc_size_of::MallocSizeOfOps) -> usize {
|
||||
unsafe { ops.malloc_size_of(self.0.as_fst().as_inner().as_ptr()) }
|
||||
}
|
||||
}
|
||||
|
||||
pub static PRELOAD_LIST_ENTRIES: LazyLock<HstsPreloadList> =
|
||||
static PRELOAD_LIST_ENTRIES: LazyLock<HstsPreloadList> =
|
||||
LazyLock::new(HstsPreloadList::from_servo_preload);
|
||||
|
||||
pub fn hsts_preload_size_of(ops: &mut MallocSizeOfOps) -> usize {
|
||||
PRELOAD_LIST_ENTRIES.size_of(ops)
|
||||
}
|
||||
|
||||
impl HstsPreloadList {
|
||||
/// Create an `HstsList` from the bytes of a JSON preload file.
|
||||
pub fn from_preload(preload_content: &str) -> Option<HstsPreloadList> {
|
||||
#[derive(Deserialize)]
|
||||
struct HstsEntries {
|
||||
entries: Vec<HstsEntry>,
|
||||
}
|
||||
|
||||
let hsts_entries: Option<HstsEntries> = serde_json::from_str(preload_content).ok();
|
||||
|
||||
hsts_entries.map(|hsts_entries| {
|
||||
let mut hsts_list: HstsPreloadList = HstsPreloadList::default();
|
||||
|
||||
for hsts_entry in hsts_entries.entries {
|
||||
hsts_list.push(hsts_entry);
|
||||
}
|
||||
|
||||
hsts_list
|
||||
})
|
||||
pub fn from_preload(preload_content: Vec<u8>) -> Option<HstsPreloadList> {
|
||||
Map::new(preload_content).map(HstsPreloadList).ok()
|
||||
}
|
||||
|
||||
pub fn from_servo_preload() -> HstsPreloadList {
|
||||
debug!("Intializing HSTS Preload list");
|
||||
let list = resources::read_string(Resource::HstsPreloadList);
|
||||
HstsPreloadList::from_preload(&list).unwrap_or_else(|| {
|
||||
let map_bytes = resources::read_bytes(Resource::HstsPreloadList);
|
||||
HstsPreloadList::from_preload(map_bytes).unwrap_or_else(|| {
|
||||
error!("HSTS preload file is invalid. Setting HSTS list to default values");
|
||||
HstsPreloadList {
|
||||
entries_map: Default::default(),
|
||||
}
|
||||
HstsPreloadList(MapBuilder::memory().into_map())
|
||||
})
|
||||
}
|
||||
|
||||
pub fn is_host_secure(&self, host: &str) -> bool {
|
||||
let base_domain = reg_suffix(host);
|
||||
self.entries_map.get(base_domain).is_some_and(|entries| {
|
||||
// No need to check for expiration in the preload list
|
||||
entries.iter().any(|e| {
|
||||
if e.include_subdomains {
|
||||
e.matches_subdomain(host) || e.matches_domain(host)
|
||||
} else {
|
||||
e.matches_domain(host)
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
let parts = host[..host.len() - base_domain.len()].rsplit_terminator('.');
|
||||
let mut domain_to_test = base_domain.to_owned();
|
||||
|
||||
pub fn has_domain(&self, host: &str, base_domain: &str) -> bool {
|
||||
self.entries_map
|
||||
.get(base_domain)
|
||||
.is_some_and(|entries| entries.iter().any(|e| e.matches_domain(host)))
|
||||
}
|
||||
if self.0.get(&domain_to_test).is_some_and(|id| {
|
||||
// The FST map ids were constructed such that the parity represents the includeSubdomain flag
|
||||
id % 2 == 1 || domain_to_test == host
|
||||
}) {
|
||||
return true;
|
||||
}
|
||||
|
||||
pub fn has_subdomain(&self, host: &str, base_domain: &str) -> bool {
|
||||
self.entries_map.get(base_domain).is_some_and(|entries| {
|
||||
entries
|
||||
.iter()
|
||||
.any(|e| e.include_subdomains && 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_default();
|
||||
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;
|
||||
// TODO(sebsebmc): We could shrink the the HSTS preload memory use further by using a type
|
||||
// that doesn't store an expiry since all preload entries should be "forever"
|
||||
e.expires_at = entry.expires_at;
|
||||
}
|
||||
// Check all further subdomains up to the passed host
|
||||
for part in parts {
|
||||
domain_to_test = format!("{}.{}", part, domain_to_test);
|
||||
if self.0.get(&domain_to_test).is_some_and(|id| {
|
||||
// The FST map ids were constructed such that the parity represents the includeSubdomain flag
|
||||
id % 2 == 1 || domain_to_test == host
|
||||
}) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
false
|
||||
}
|
||||
}
|
||||
|
||||
impl HstsList {
|
||||
pub fn is_host_secure(&self, host: &str) -> bool {
|
||||
debug!("HSTS: is {host} secure?");
|
||||
if PRELOAD_LIST_ENTRIES.is_host_secure(host) {
|
||||
info!("{host} is in the preload list");
|
||||
return true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue