mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Moved pub_domains to net_traits and did a spring clean.
This commit is contained in:
parent
a03a5e814a
commit
a74fe58563
9 changed files with 262 additions and 114 deletions
|
@ -7,7 +7,7 @@
|
|||
|
||||
use cookie_rs;
|
||||
use net_traits::CookieSource;
|
||||
use pub_domains::is_pub_domain;
|
||||
use net_traits::pub_domains::is_pub_domain;
|
||||
use std::borrow::ToOwned;
|
||||
use std::net::{Ipv4Addr, Ipv6Addr};
|
||||
use time::{Tm, now, at, Duration};
|
||||
|
|
|
@ -63,7 +63,6 @@ pub mod hsts;
|
|||
pub mod http_loader;
|
||||
pub mod image_cache_thread;
|
||||
pub mod mime_classifier;
|
||||
pub mod pub_domains;
|
||||
pub mod resource_thread;
|
||||
pub mod storage_thread;
|
||||
pub mod websocket_loader;
|
||||
|
|
|
@ -1,73 +0,0 @@
|
|||
/* 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/. */
|
||||
|
||||
//! Implementation of public domain matching.
|
||||
//!
|
||||
//! The list is a file located on the `resources` folder and loaded once on first need.
|
||||
//!
|
||||
//! The list can be updated with `./mach update-pub-domains` from this source:
|
||||
//! https://publicsuffix.org/list/
|
||||
//!
|
||||
//! This implementation is not strictly following the specification of the list. Wildcards are not
|
||||
//! restricted to appear only in the leftmost position, but the current list has no such cases so
|
||||
//! we don't need to make the code more complex for it. The `mach` update command makes sure that
|
||||
//! those cases are not present.
|
||||
|
||||
use std::collections::HashSet;
|
||||
use std::str::from_utf8;
|
||||
use std::sync::Arc;
|
||||
use util::resource_files::read_resource_file;
|
||||
|
||||
lazy_static! {
|
||||
static ref PUB_DOMAINS: Arc<HashSet<String>> = load_pub_domains();
|
||||
}
|
||||
|
||||
fn load_pub_domains() -> Arc<HashSet<String>> {
|
||||
let content = read_resource_file("public_domains.txt")
|
||||
.expect("Could not find public suffix list file");
|
||||
let domains = from_utf8(&content)
|
||||
.expect("Could not read suffix list file")
|
||||
.lines()
|
||||
.filter_map(|i| {
|
||||
let domain = i.trim();
|
||||
if domain == "" { return None };
|
||||
if domain.starts_with("//") { return None };
|
||||
Some(domain.to_owned())
|
||||
});
|
||||
|
||||
Arc::new(domains.collect())
|
||||
}
|
||||
|
||||
/// Match the given domain against a static list of known public domains
|
||||
pub fn is_pub_domain(domain: &str) -> bool {
|
||||
let domain = domain.trim_left_matches(".");
|
||||
|
||||
// Start by looking for a plain match
|
||||
if PUB_DOMAINS.contains(&domain.to_string()) {
|
||||
return true
|
||||
}
|
||||
|
||||
// Then look for a wildcard match
|
||||
// To make things simpler, just look for the same domain with its leftmost part replaced by a
|
||||
// wildcard.
|
||||
match domain.find(".") {
|
||||
None => {
|
||||
// This is a domain with only one part, so there is no need to search for wildcards or
|
||||
// exceptions
|
||||
return false
|
||||
}
|
||||
Some(position) => {
|
||||
let wildcard_domain = "*".to_string() + domain.split_at(position).1;
|
||||
if PUB_DOMAINS.contains(&wildcard_domain) {
|
||||
// We have a wildcard match, search for an eventual exception
|
||||
let exception_domain = "!".to_string() + domain;
|
||||
return ! PUB_DOMAINS.contains(&exception_domain)
|
||||
} else {
|
||||
// No wildcard match -> this is not a public domain
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue