forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(net): Move SSL verification to unboxed closures

Browse Source
This commit is contained in:
Manish Goregaokar
2015-01-15 22:22:20 +05:30
parent af5778510d
commit bca9a53c66
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/mod.rs
View File

@@ -47,15 +47,15 @@ pub struct Client<C> {
redirect_policy: RedirectPolicy, redirect_policy: RedirectPolicy,
} }
impl Client<HttpConnector> { impl<'v> Client<HttpConnector<'v>> {
/// Create a new Client. /// Create a new Client.
pub fn new() -> Client<HttpConnector> { pub fn new() -> Client<HttpConnector<'v>> {
Client::with_connector(HttpConnector(None)) Client::with_connector(HttpConnector(None))
} }
/// Set the SSL verifier callback for use with OpenSSL. /// Set the SSL verifier callback for use with OpenSSL.
pub fn set_ssl_verifier(&mut self, verifier: ContextVerifier) { pub fn set_ssl_verifier(&mut self, verifier: ContextVerifier<'v>) {
self.connector = HttpConnector(Some(verifier)); self.connector = HttpConnector(Some(verifier));
} }

10
src/net.rs
View File

@@ -309,12 +309,12 @@ impl NetworkStream for HttpStream {
/// A connector that will produce HttpStreams. /// A connector that will produce HttpStreams.
#[allow(missing_copy_implementations)] #[allow(missing_copy_implementations)]
pub struct HttpConnector(pub Option<ContextVerifier>); pub struct HttpConnector<'v>(pub Option<ContextVerifier<'v>>);
/// A method that can set verification methods on an SSL context /// A method that can set verification methods on an SSL context
pub type ContextVerifier = for <'a> fn(&'a mut SslContext) -> (); pub type ContextVerifier<'v> = Box<FnMut(&mut SslContext) -> ()+'v>;
impl NetworkConnector for HttpConnector { impl<'v> NetworkConnector for HttpConnector<'v> {
type Stream = HttpStream; type Stream = HttpStream;
fn connect(&mut self, host: &str, port: Port, scheme: &str) -> IoResult<HttpStream> { fn connect(&mut self, host: &str, port: Port, scheme: &str) -> IoResult<HttpStream> {
@@ -328,8 +328,8 @@ impl NetworkConnector for HttpConnector {
debug!("https scheme"); debug!("https scheme");
let stream = try!(TcpStream::connect(addr)); let stream = try!(TcpStream::connect(addr));
let mut context = try!(SslContext::new(Sslv23).map_err(lift_ssl_error)); let mut context = try!(SslContext::new(Sslv23).map_err(lift_ssl_error));
if let Some(ref v) = self.0 { if let Some(ref mut verifier) = self.0 {
v(&mut context); verifier(&mut context);
} }
let ssl = try!(Ssl::new(&context).map_err(lift_ssl_error)); let ssl = try!(Ssl::new(&context).map_err(lift_ssl_error));
try!(ssl.set_hostname(host).map_err(lift_ssl_error)); try!(ssl.set_hostname(host).map_err(lift_ssl_error));