From 941659bb309bf8633051c91eabd539ea461ed88b Mon Sep 17 00:00:00 2001 From: Jan Andre Ikenmeyer Date: Sun, 10 Nov 2019 20:16:53 +0100 Subject: [PATCH] Use HSTS preload list for private HttpState, too. --- components/net/resource_thread.rs | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs index e3cd2fb59aa..4be209f9d6d 100644 --- a/components/net/resource_thread.rs +++ b/components/net/resource_thread.rs @@ -141,19 +141,31 @@ fn create_http_states( None => resources::read_string(Resource::SSLCertificates), }; - let ssl_connector_builder = create_ssl_connector_builder(&certs); let http_state = HttpState { + hsts_list: RwLock::new(hsts_list), cookie_jar: RwLock::new(cookie_jar), auth_cache: RwLock::new(auth_cache), + history_states: RwLock::new(HashMap::new()), http_cache: RwLock::new(http_cache), http_cache_state: Mutex::new(HashMap::new()), - hsts_list: RwLock::new(hsts_list), - history_states: RwLock::new(HashMap::new()), - client: create_http_client(ssl_connector_builder, HANDLE.lock().unwrap().executor()), + client: create_http_client( + create_ssl_connector_builder(&certs), + HANDLE.lock().unwrap().executor(), + ), }; - let private_ssl_client = create_ssl_connector_builder(&certs); - let private_http_state = HttpState::new(private_ssl_client); + let private_http_state = HttpState { + hsts_list: RwLock::new(HstsList::from_servo_preload()), + cookie_jar: RwLock::new(CookieStorage::new(150)), + auth_cache: RwLock::new(AuthCache::new()), + history_states: RwLock::new(HashMap::new()), + http_cache: RwLock::new(HttpCache::new()), + http_cache_state: Mutex::new(HashMap::new()), + client: create_http_client( + create_ssl_connector_builder(&certs), + HANDLE.lock().unwrap().executor(), + ), + }; (Arc::new(http_state), Arc::new(private_http_state)) }