refactor: implement RemoteAddr trait

Author: joseluisq

src/lib.rs

@@ -13,9 +13,11 @@
 //!
 
 pub mod middleware;
+pub mod remote_addr;
 pub mod service;
 pub mod types;
 
 pub use middleware::*;
+pub use remote_addr::*;
 pub use service::*;
 pub use types::*;

src/remote_addr.rs

@@ -0,0 +1,18 @@
+//! Module representing the remote (peer) address of a connection.
+
+use hyper::server::conn::AddrStream;
+use std::net::SocketAddr;
+
+/// Defines a method to get the remote (peer) address of a connection.
+///
+/// This trait might be needed to be implemented by for example custom TLS implementations.
+pub trait RemoteAddr {
+    /// Returns the remote (peer) address of this connection.
+    fn remote_addr(&self) -> Option<SocketAddr>;
+}
+
+impl RemoteAddr for AddrStream {
+    fn remote_addr(&self) -> Option<SocketAddr> {
+        Some(self.remote_addr())
+    }
+}

src/service.rs

@@ -37,14 +37,14 @@
 //! }
 //! ```
 
-use hyper::server::conn::AddrStream;
 use hyper::service::Service as HyperService;
 use std::convert::Infallible;
 use std::future::{ready, Ready};
 use std::task::{Context, Poll};
 
 use self::handler_service::{HandlerService, HandlerServiceBuilder};
 use crate::middleware::Handler;
+use crate::remote_addr::RemoteAddr;
 
 /// A [Hyper Service][`hyper::service::Service`] entry point which hosts a [`Handler`].
 pub struct Service<H> {
@@ -63,9 +63,10 @@ where
     }
 }
 
-impl<H> HyperService<&AddrStream> for Service<H>
+impl<H, T> HyperService<&T> for Service<H>
 where
     H: Handler,
+    T: RemoteAddr + Send + 'static,
 {
     type Response = HandlerService<H>;
     type Error = Infallible;
@@ -75,7 +76,7 @@ where
         Poll::Ready(Ok(()))
     }
 
-    fn call(&mut self, conn: &AddrStream) -> Self::Future {
+    fn call(&mut self, conn: &T) -> Self::Future {
         ready(Ok(self.builder.build(conn.remote_addr())))
     }
 }
@@ -93,7 +94,7 @@ mod handler_service {
 
     pub struct HandlerService<H> {
         handler: Arc<H>,
-        remote_addr: SocketAddr,
+        remote_addr: Option<SocketAddr>,
     }
 
     impl<H> HyperService<Request> for HandlerService<H>
@@ -109,7 +110,9 @@ mod handler_service {
         }
 
         fn call(&mut self, mut req: Request) -> Self::Future {
-            req.extensions_mut().insert(self.remote_addr);
+            if let Some(remote_addr) = self.remote_addr {
+                req.extensions_mut().insert(remote_addr);
+            }
             let res = self.handler.handle(&mut req);
             Box::pin(async { res })
         }
@@ -129,7 +132,7 @@ mod handler_service {
             }
         }
 
-        pub fn build(&self, remote_addr: SocketAddr) -> HandlerService<H> {
+        pub fn build(&self, remote_addr: Option<SocketAddr>) -> HandlerService<H> {
             HandlerService {
                 handler: self.handler.clone(),
                 remote_addr,