fix(transport): Handle tls accepting on task (#320)

Signed-off-by: Lucio Franco <[email protected]>

tonic/src/transport/server/conn.rs

@@ -1,9 +1,11 @@
+#[cfg(feature = "tls")]
+use super::TlsStream;
 use crate::transport::Certificate;
 use hyper::server::conn::AddrStream;
 use std::net::SocketAddr;
 use tokio::net::TcpStream;
 #[cfg(feature = "tls")]
-use tokio_rustls::{rustls::Session, server::TlsStream};
+use tokio_rustls::rustls::Session;
 
 /// Trait that connected IO resources implement.
 ///
@@ -37,19 +39,24 @@ impl Connected for TcpStream {
 #[cfg(feature = "tls")]
 impl<T: Connected> Connected for TlsStream<T> {
     fn remote_addr(&self) -> Option<SocketAddr> {
-        let (inner, _) = self.get_ref();
+        if let Some((inner, _)) = self.get_ref() {
-        inner.remote_addr()
+            inner.remote_addr()
+        } else {
+            None
+        }
     }
 
     fn peer_certs(&self) -> Option<Vec<Certificate>> {
-        let (_, session) = self.get_ref();
+        if let Some((_, session)) = self.get_ref() {
-
+            if let Some(certs) = session.get_peer_certificates() {
-        if let Some(certs) = session.get_peer_certificates() {
+                let certs = certs
-            let certs = certs
+                    .into_iter()
-                .into_iter()
+                    .map(|c| Certificate::from_pem(c.0))
-                .map(|c| Certificate::from_pem(c.0))
+                    .collect();
-                .collect();
+                Some(certs)
-            Some(certs)
+            } else {
+                None
+            }
         } else {
             None
         }

tonic/src/transport/server/incoming.rs

@@ -13,8 +13,6 @@ use std::{
     time::Duration,
 };
 use tokio::io::{AsyncRead, AsyncWrite};
-#[cfg(feature = "tls")]
-use tracing::error;
 
 #[cfg_attr(not(feature = "tls"), allow(unused_variables))]
 pub(crate) fn tcp_incoming<IO, IE>(
@@ -32,13 +30,7 @@ where
             #[cfg(feature = "tls")]
             {
                 if let Some(tls) = &server.tls {
-                    let io = match tls.accept(stream).await {
+                    let io = tls.accept(stream);
-                        Ok(io) => io,
-                        Err(error) => {
-                            error!(message = "Unable to accept incoming connection.", %error);
-                            continue
-                        },
-                    };
                     yield ServerIo::new(io);
                     continue;
                 }
@@ -73,3 +65,106 @@ impl Stream for TcpIncoming {
         Pin::new(&mut self.inner).poll_accept(cx)
     }
 }
+
+// tokio_rustls::server::TlsStream doesn't expose constructor methods,
+// so we have to TlsAcceptor::accept and handshake to have access to it
+// TlsStream implements AsyncRead/AsyncWrite handshaking tokio_rustls::Accept first
+#[cfg(feature = "tls")]
+pub(crate) struct TlsStream<IO> {
+    state: State<IO>,
+}
+
+#[cfg(feature = "tls")]
+enum State<IO> {
+    Handshaking(tokio_rustls::Accept<IO>),
+    Streaming(tokio_rustls::server::TlsStream<IO>),
+}
+
+#[cfg(feature = "tls")]
+impl<IO> TlsStream<IO> {
+    pub(crate) fn new(accept: tokio_rustls::Accept<IO>) -> Self {
+        TlsStream {
+            state: State::Handshaking(accept),
+        }
+    }
+
+    pub(crate) fn get_ref(&self) -> Option<(&IO, &tokio_rustls::rustls::ServerSession)> {
+        if let State::Streaming(tls) = &self.state {
+            Some(tls.get_ref())
+        } else {
+            None
+        }
+    }
+}
+
+#[cfg(feature = "tls")]
+impl<IO> AsyncRead for TlsStream<IO>
+where
+    IO: AsyncRead + AsyncWrite + Connected + Unpin + Send + 'static,
+{
+    fn poll_read(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &mut [u8],
+    ) -> Poll<std::io::Result<usize>> {
+        use std::future::Future;
+
+        let pin = self.get_mut();
+        match pin.state {
+            State::Handshaking(ref mut accept) => {
+                match futures_core::ready!(Pin::new(accept).poll(cx)) {
+                    Ok(mut stream) => {
+                        let result = Pin::new(&mut stream).poll_read(cx, buf);
+                        pin.state = State::Streaming(stream);
+                        result
+                    }
+                    Err(err) => Poll::Ready(Err(err)),
+                }
+            }
+            State::Streaming(ref mut stream) => Pin::new(stream).poll_read(cx, buf),
+        }
+    }
+}
+
+#[cfg(feature = "tls")]
+impl<IO> AsyncWrite for TlsStream<IO>
+where
+    IO: AsyncRead + AsyncWrite + Connected + Unpin + Send + 'static,
+{
+    fn poll_write(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &[u8],
+    ) -> Poll<std::io::Result<usize>> {
+        use std::future::Future;
+
+        let pin = self.get_mut();
+        match pin.state {
+            State::Handshaking(ref mut accept) => {
+                match futures_core::ready!(Pin::new(accept).poll(cx)) {
+                    Ok(mut stream) => {
+                        let result = Pin::new(&mut stream).poll_write(cx, buf);
+                        pin.state = State::Streaming(stream);
+                        result
+                    }
+                    Err(err) => Poll::Ready(Err(err)),
+                }
+            }
+            State::Streaming(ref mut stream) => Pin::new(stream).poll_write(cx, buf),
+        }
+    }
+
+    fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<std::io::Result<()>> {
+        match self.state {
+            State::Handshaking(_) => Poll::Ready(Ok(())),
+            State::Streaming(ref mut stream) => Pin::new(stream).poll_flush(cx),
+        }
+    }
+
+    fn poll_shutdown(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<std::io::Result<()>> {
+        match self.state {
+            State::Handshaking(_) => Poll::Ready(Ok(())),
+            State::Streaming(ref mut stream) => Pin::new(stream).poll_shutdown(cx),
+        }
+    }
+}

tonic/src/transport/server/mod.rs

@@ -15,6 +15,9 @@ use super::service::TlsAcceptor;
 
 use incoming::TcpIncoming;
 
+#[cfg(feature = "tls")]
+pub(crate) use incoming::TlsStream;
+
 use super::service::{Or, Routes, ServerIo, ServiceBuilderExt};
 use crate::{body::BoxBody, request::ConnectionInfo};
 use futures_core::Stream;

tonic/src/transport/service/tls.rs

@@ -1,5 +1,8 @@
 use super::io::BoxedIo;
-use crate::transport::{server::Connected, Certificate, Identity};
+use crate::transport::{
+    server::{Connected, TlsStream},
+    Certificate, Identity,
+};
 #[cfg(feature = "tls-roots")]
 use rustls_native_certs;
 use std::{fmt, sync::Arc};
@@ -157,17 +160,14 @@ impl TlsAcceptor {
         })
     }
 
-    pub(crate) async fn accept<IO>(
+    pub(crate) fn accept<IO>(&self, io: IO) -> TlsStream<IO>
-        &self,
-        io: IO,
-    ) -> Result<tokio_rustls::server::TlsStream<IO>, crate::Error>
     where
         IO: AsyncRead + AsyncWrite + Connected + Unpin + Send + 'static,
     {
         let acceptor = RustlsAcceptor::from(self.inner.clone());
-        let tls = acceptor.accept(io).await?;
+        let accept = acceptor.accept(io);
 
-        Ok(tls)
+        TlsStream::new(accept)
     }
 }