DGNum/rust-irc
6
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Reverted some of the TLS changes from #141 because they broke TLS completely.

Browse source
This commit is contained in:
Aaron Weiss 2018-06-18 21:29:45 +02:00
parent cc666838a7
commit c69e944033
No known key found for this signature in database
GPG key ID: 047D32DF25DC22EF
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/client/conn.rs
View file

@ -42,12 +42,14 @@ impl fmt::Debug for Connection {
} }
} }
type TlsFuture = Box<Future<Error = error::IrcError, Item = TlsStream<TcpStream>> + Send>;
/// A future representing an eventual `Connection`. /// A future representing an eventual `Connection`.
pub enum ConnectionFuture { pub enum ConnectionFuture {
#[doc(hidden)] #[doc(hidden)]
Unsecured(Config, ConnectFuture), Unsecured(Config, ConnectFuture),
#[doc(hidden)] #[doc(hidden)]
Secured(Config, ConnectFuture, TlsConnector), Secured(Config, TlsFuture),
#[doc(hidden)] #[doc(hidden)]
Mock(Config), Mock(Config),
} }
@ -59,12 +61,12 @@ impl fmt::Debug for ConnectionFuture {
"{}({:?}, ...)", "{}({:?}, ...)",
match *self { match *self {
ConnectionFuture::Unsecured(_, _) => "ConnectionFuture::Unsecured", ConnectionFuture::Unsecured(_, _) => "ConnectionFuture::Unsecured",
ConnectionFuture::Secured(_, _, _) => "ConnectionFuture::Secured", ConnectionFuture::Secured(_, _) => "ConnectionFuture::Secured",
ConnectionFuture::Mock(_) => "ConnectionFuture::Mock", ConnectionFuture::Mock(_) => "ConnectionFuture::Mock",
}, },
match *self { match *self {
ConnectionFuture::Unsecured(ref cfg, _) | ConnectionFuture::Unsecured(ref cfg, _) |
ConnectionFuture::Secured(ref cfg, _, _) | ConnectionFuture::Secured(ref cfg, _) |
ConnectionFuture::Mock(ref cfg) => cfg, ConnectionFuture::Mock(ref cfg) => cfg,
} }
) )
@ -83,16 +85,7 @@ impl Future for ConnectionFuture {
Ok(Async::Ready(Connection::Unsecured(transport))) Ok(Async::Ready(Connection::Unsecured(transport)))
} }
ConnectionFuture::Secured(ref config, ref mut inner, ref connector) => { ConnectionFuture::Secured(ref config, ref mut inner) => {
let domain = format!("{}", config.server().expect("should already be tested"));
let mut inner = inner.map_err(|e| {
let res: error::IrcError = e.into();
res
}).and_then(move |socket| {
connector.connect_async(&domain, socket).map_err(
|e| e.into(),
)
});
let framed = try_ready!(inner.poll()).framed(IrcCodec::new(config.encoding())?); let framed = try_ready!(inner.poll()).framed(IrcCodec::new(config.encoding())?);
let transport = IrcTransport::new(config, framed); let transport = IrcTransport::new(config, framed);
@ -138,6 +131,7 @@ impl Connection {
let domain = format!("{}", config.server()?); let domain = format!("{}", config.server()?);
info!("Connecting via SSL to {}.", domain); info!("Connecting via SSL to {}.", domain);
let mut builder = TlsConnector::builder()?; let mut builder = TlsConnector::builder()?;
if let Some(cert_path) = config.cert_path() { if let Some(cert_path) = config.cert_path() {
let mut file = File::open(cert_path)?; let mut file = File::open(cert_path)?;
let mut cert_data = vec![]; let mut cert_data = vec![];
@ -146,6 +140,7 @@ impl Connection {
builder.add_root_certificate(cert)?; builder.add_root_certificate(cert)?;
info!("Added {} to trusted certificates.", cert_path); info!("Added {} to trusted certificates.", cert_path);
} }
if let Some(client_cert_path) = config.client_cert_path() { if let Some(client_cert_path) = config.client_cert_path() {
let client_cert_pass = config.client_cert_pass(); let client_cert_pass = config.client_cert_pass();
let mut file = File::open(client_cert_path)?; let mut file = File::open(client_cert_path)?;
@ -155,13 +150,18 @@ impl Connection {
builder.identity(pkcs12_archive)?; builder.identity(pkcs12_archive)?;
info!("Using {} for client certificate authentication.", client_cert_path); info!("Using {} for client certificate authentication.", client_cert_path);
} }
let connector = builder.build()?; let connector = builder.build()?;
let socket_addr = config.socket_addr()?; let socket_addr = config.socket_addr()?;
Ok(ConnectionFuture::Secured(
config, let stream = TcpStream::connect(&socket_addr).map_err(|e| {
TcpStream::connect(&socket_addr), let res: error::IrcError = e.into();
connector res
)) }).and_then(move |socket| {
connector.connect_async(&domain, socket).map_err(|e| e.into())
});
Ok(ConnectionFuture::Secured(config, Box::new(stream)))
} else { } else {
info!("Connecting to {}.", config.server()?); info!("Connecting to {}.", config.server()?);
let socket_addr = config.socket_addr()?; let socket_addr = config.socket_addr()?;