Merge pull request #530 from jbr/populate-local-and-peer-addrs

set local and peer addrs in tide

Author: yoshuawuyts

src/request.rs

@@ -309,6 +309,18 @@ impl<State> Request<State> {
     pub fn is_empty(&self) -> Option<bool> {
         Some(self.request.len()? == 0)
     }
+
+    /// Peer address of the underlying transport
+    #[must_use]
+    pub fn peer_addr(&self) -> Option<&str> {
+        self.request.peer_addr()
+    }
+
+    /// Local address of the underlying transport
+    #[must_use]
+    pub fn local_addr(&self) -> Option<&str> {
+        self.request.local_addr()
+    }
 }
 
 impl<State> AsMut<http::Request> for Request<State> {

src/server.rs

@@ -296,8 +296,12 @@ impl<State: Send + Sync + 'static> Server<State> {
         while let Some(stream) = incoming.next().await {
             let stream = stream?;
             let this = self.clone();
+            let local_addr = stream.local_addr().ok();
+            let peer_addr = stream.peer_addr().ok();
             task::spawn(async move {
-                let res = async_h1::accept(stream, |req| async {
+                let res = async_h1::accept(stream, |mut req| async {
+                    req.set_local_addr(local_addr);
+                    req.set_peer_addr(peer_addr);
                     let res = this.respond(req).await;
                     let res = res.map_err(|_| io::Error::from(io::ErrorKind::Other))?;
                     Ok(res)

tests/server.rs

@@ -12,8 +12,10 @@ fn hello_world() -> Result<(), http_types::Error> {
         let port = test_utils::find_port().await;
         let server = task::spawn(async move {
             let mut app = tide::new();
-            app.at("/").get(|mut req: Request<()>| async move {
+            app.at("/").get(move |mut req: Request<()>| async move {
                 assert_eq!(req.body_string().await.unwrap(), "nori".to_string());
+                assert!(req.local_addr().unwrap().contains(&port.to_string()));
+                assert!(req.peer_addr().is_some());
                 let res = Response::new(StatusCode::Ok).body_string("says hello".to_string());
                 Ok(res)
             });