set request url host from host header

Author: jbr

src/server/decode.rs

@@ -5,7 +5,7 @@ use std::str::FromStr;
 use async_std::io::BufReader;
 use async_std::io::Read;
 use async_std::prelude::*;
-use http_types::headers::{HeaderName, HeaderValue, CONTENT_LENGTH, TRANSFER_ENCODING};
+use http_types::headers::{HeaderName, HeaderValue, CONTENT_LENGTH, HOST, TRANSFER_ENCODING};
 use http_types::{ensure, ensure_eq, format_err};
 use http_types::{Body, Method, Request};
 
@@ -57,9 +57,9 @@ where
     let method = httparse_req.method;
     let method = method.ok_or_else(|| format_err!("No method found"))?;
 
-    let uri = httparse_req.path;
-    let uri = uri.ok_or_else(|| format_err!("No uri found"))?;
-    let uri = url::Url::parse(&format!("{}{}", addr, uri))?;
+    let path = httparse_req.path;
+    let path = path.ok_or_else(|| format_err!("No uri found"))?;
+    let uri = url::Url::parse(&format!("{}{}", addr, path))?;
 
     let version = httparse_req.version;
     let version = version.ok_or_else(|| format_err!("No version found"))?;
@@ -72,6 +72,12 @@ where
         req.insert_header(name, value)?;
     }
 
+    if let Some(host) = req.header(&HOST).cloned() {
+        if let Some(host) = host.last() {
+            *req.url_mut() = url::Url::parse(&format!("http://{}{}", host, path))?;
+        }
+    }
+
     let content_length = req.header(&CONTENT_LENGTH);
     let transfer_encoding = req.header(&TRANSFER_ENCODING);
 

tests/fixtures/request-with-host.txt

@@ -0,0 +1,4 @@
+GET /pub/WWW/TheProject.html HTTP/1.1
+Host: www.w3.org
+Content-Length: 0
+

tests/fixtures/response-with-host.txt

@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+content-length: 41
+date: {DATE}
+content-type: text/plain; charset=utf-8
+
+http://www.w3.org/pub/WWW/TheProject.html

tests/server.rs

@@ -25,6 +25,26 @@ async fn test_basic_request() {
     case.assert().await;
 }
 
+#[async_std::test]
+async fn test_host() {
+    let case = TestCase::new_server(
+        "fixtures/request-with-host.txt",
+        "fixtures/response-with-host.txt",
+    )
+    .await;
+    let addr = "http://127.0.0.1:8000";
+
+    async_h1::accept(addr, case.clone(), |req| async move {
+        let mut res = Response::new(StatusCode::Ok);
+        res.set_body(req.url().as_str());
+        Ok(res)
+    })
+    .await
+    .unwrap();
+
+    case.assert().await;
+}
+
 #[async_std::test]
 async fn test_chunked_basic() {
     let case = TestCase::new_server(