Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Introduce create_ssl_client

Browse source 
This lets us reuse the same SSL context for all HTTPS requests.
This commit is contained in:
Anthony Ramine 2017-04-02 15:14:19 +02:00
parent ecd9ac9b68
commit 20e0b6cd56
3 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/net/connector.rs
View file

@ -12,7 +12,7 @@ use std::sync::Arc;
pub type Connector = HttpsConnector<OpensslClient>; pub type Connector = HttpsConnector<OpensslClient>;
pub fn create_http_connector(certificate_file: &str) -> Arc<Pool<Connector>> { pub fn create_ssl_client(certificate_file: &str) -> OpensslClient {
let ca_file = &resources_dir_path() let ca_file = &resources_dir_path()
.expect("Need certificate file to make network requests") .expect("Need certificate file to make network requests")
.join(certificate_file); .join(certificate_file);
@ -25,9 +25,11 @@ pub fn create_http_connector(certificate_file: &str) -> Arc<Pool<Connector>> {
context.set_options(SSL_OP_NO_SSLV2 | SSL_OP_NO_SSLV3 | SSL_OP_NO_COMPRESSION); context.set_options(SSL_OP_NO_SSLV2 | SSL_OP_NO_SSLV3 | SSL_OP_NO_COMPRESSION);
} }
let ssl_connector = ssl_connector_builder.build(); let ssl_connector = ssl_connector_builder.build();
let ssl_client = OpensslClient::from(ssl_connector); OpensslClient::from(ssl_connector)
let https_connector = HttpsConnector::new(ssl_client); }
pub fn create_http_connector(ssl_client: OpensslClient) -> Arc<Pool<Connector>> {
let https_connector = HttpsConnector::new(ssl_client);
Arc::new(Pool::with_connector(Default::default(), https_connector)) Arc::new(Pool::with_connector(Default::default(), https_connector))
} }

5
components/net/http_loader.rs
View file

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use brotli::Decompressor; use brotli::Decompressor;
use connector::{Connector, create_http_connector}; use connector::{Connector, create_http_connector, create_ssl_client};
use cookie; use cookie;
use cookie_storage::CookieStorage; use cookie_storage::CookieStorage;
use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg, HttpRequest as DevtoolsHttpRequest}; use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg, HttpRequest as DevtoolsHttpRequest};
@ -75,11 +75,12 @@ pub struct HttpState {
impl HttpState { impl HttpState {
pub fn new(certificate_path: &str) -> HttpState { pub fn new(certificate_path: &str) -> HttpState {
let ssl_client = create_ssl_client(certificate_path);
HttpState { HttpState {
hsts_list: Arc::new(RwLock::new(HstsList::new())), hsts_list: Arc::new(RwLock::new(HstsList::new())),
cookie_jar: Arc::new(RwLock::new(CookieStorage::new(150))), cookie_jar: Arc::new(RwLock::new(CookieStorage::new(150))),
auth_cache: Arc::new(RwLock::new(AuthCache::new())), auth_cache: Arc::new(RwLock::new(AuthCache::new())),
connector_pool: create_http_connector(certificate_path), connector_pool: create_http_connector(ssl_client),
} }
} }
} }

13
components/net/resource_thread.rs
View file

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
//! A thread that takes a URL and streams back the binary data. //! A thread that takes a URL and streams back the binary data.
use connector::{Connector, create_http_connector}; use connector::{Connector, create_http_connector, create_ssl_client};
use cookie; use cookie;
use cookie_rs; use cookie_rs;
use cookie_storage::CookieStorage; use cookie_storage::CookieStorage;
@ -13,6 +13,7 @@ use filemanager_thread::{FileManager, TFDProvider};
use hsts::HstsList; use hsts::HstsList;
use http_loader::HttpState; use http_loader::HttpState;
use hyper::client::pool::Pool; use hyper::client::pool::Pool;
use hyper_openssl::OpensslClient;
use hyper_serde::Serde; use hyper_serde::Serde;
use ipc_channel::ipc::{self, IpcReceiver, IpcReceiverSet, IpcSender}; use ipc_channel::ipc::{self, IpcReceiver, IpcReceiverSet, IpcSender};
use net_traits::{CookieSource, CoreResourceThread}; use net_traits::{CookieSource, CoreResourceThread};
@ -46,6 +47,7 @@ pub struct ResourceGroup {
cookie_jar: Arc<RwLock<CookieStorage>>, cookie_jar: Arc<RwLock<CookieStorage>>,
auth_cache: Arc<RwLock<AuthCache>>, auth_cache: Arc<RwLock<AuthCache>>,
hsts_list: Arc<RwLock<HstsList>>, hsts_list: Arc<RwLock<HstsList>>,
ssl_client: OpensslClient,
connector: Arc<Pool<Connector>>, connector: Arc<Pool<Connector>>,
} }
@ -104,17 +106,20 @@ fn create_resource_groups(config_dir: Option<&Path>)
read_json_from_file(&mut hsts_list, config_dir, "hsts_list.json"); read_json_from_file(&mut hsts_list, config_dir, "hsts_list.json");
read_json_from_file(&mut cookie_jar, config_dir, "cookie_jar.json"); read_json_from_file(&mut cookie_jar, config_dir, "cookie_jar.json");
} }
let ssl_client = create_ssl_client("certs");
let resource_group = ResourceGroup { let resource_group = ResourceGroup {
cookie_jar: Arc::new(RwLock::new(cookie_jar)), cookie_jar: Arc::new(RwLock::new(cookie_jar)),
auth_cache: Arc::new(RwLock::new(auth_cache)), auth_cache: Arc::new(RwLock::new(auth_cache)),
hsts_list: Arc::new(RwLock::new(hsts_list.clone())), hsts_list: Arc::new(RwLock::new(hsts_list.clone())),
connector: create_http_connector("certs"), ssl_client: ssl_client.clone(),
connector: create_http_connector(ssl_client.clone()),
}; };
let private_resource_group = ResourceGroup { let private_resource_group = ResourceGroup {
cookie_jar: Arc::new(RwLock::new(CookieStorage::new(150))), cookie_jar: Arc::new(RwLock::new(CookieStorage::new(150))),
auth_cache: Arc::new(RwLock::new(AuthCache::new())), auth_cache: Arc::new(RwLock::new(AuthCache::new())),
hsts_list: Arc::new(RwLock::new(HstsList::new())), hsts_list: Arc::new(RwLock::new(HstsList::new())),
connector: create_http_connector("certs"), ssl_client: ssl_client.clone(),
connector: create_http_connector(ssl_client),
}; };
(resource_group, private_resource_group) (resource_group, private_resource_group)
} }
@ -327,7 +332,7 @@ impl CoreResourceManager {
cookie_jar: group.cookie_jar.clone(), cookie_jar: group.cookie_jar.clone(),
auth_cache: group.auth_cache.clone(), auth_cache: group.auth_cache.clone(),
// FIXME(#15694): use group.connector.clone() instead. // FIXME(#15694): use group.connector.clone() instead.
connector_pool: create_http_connector("certs"), connector_pool: create_http_connector(group.ssl_client.clone()),
}; };
let ua = self.user_agent.clone(); let ua = self.user_agent.clone();
let dc = self.devtools_chan.clone(); let dc = self.devtools_chan.clone();