Merge pull request #92 from vkill/client-encode-with-Connect

fix request line url when method is CONNECT

Author: yoshuawuyts

src/client/encode.rs

@@ -2,7 +2,7 @@ use async_std::io::{self, Read};
 use async_std::prelude::*;
 use async_std::task::{Context, Poll};
 use http_types::format_err;
-use http_types::Request;
+use http_types::{Method, Request};
 
 use std::pin::Pin;
 
@@ -41,6 +41,17 @@ impl Encoder {
             url.push_str(query);
         }
 
+        // A client sending a CONNECT request MUST consists of only the host
+        // name and port number of the tunnel destination, separated by a colon.
+        // See: https://tools.ietf.org/html/rfc7231#section-4.3.6
+        if req.method() == Method::Connect {
+            let host = req.url().host_str();
+            let host = host.ok_or_else(|| format_err!("Missing hostname"))?;
+            let port = req.url().port_or_known_default();
+            let port = port.ok_or_else(|| format_err!("Missing port"))?;
+            url = format!("{}:{}", host, port);
+        }
+
         let val = format!("{} {} HTTP/1.1\r\n", req.method(), url);
         log::trace!("> {}", &val);
         buf.write_all(val.as_bytes()).await?;
@@ -58,6 +69,13 @@ impl Encoder {
         log::trace!("> {}", &val);
         buf.write_all(val.as_bytes()).await?;
 
+        // Insert Proxy-Connection header when method is CONNECT
+        if req.method() == Method::Connect {
+            let val = "proxy-connection: keep-alive\r\n".to_owned();
+            log::trace!("> {}", &val);
+            buf.write_all(val.as_bytes()).await?;
+        }
+
         // If the body isn't streaming, we can set the content-length ahead of time. Else we need to
         // send all items in chunks.
         if let Some(len) = req.len() {

tests/client.rs

@@ -67,3 +67,20 @@ async fn test_response_newlines() {
         78
     );
 }
+
+#[async_std::test]
+async fn test_encode_request_with_connect() {
+    let case = TestCase::new_client(
+        "fixtures/request-with-connect.txt",
+        "fixtures/response-with-connect.txt",
+    )
+    .await;
+
+    let url = Url::parse("https://example.com:443").unwrap();
+    let req = Request::new(Method::Connect, url);
+
+    let res = client::connect(case.clone(), req).await.unwrap();
+    assert_eq!(res.status(), StatusCode::Ok);
+
+    case.assert().await;
+}

tests/fixtures/request-with-connect.txt

@@ -0,0 +1,6 @@
+CONNECT example.com:443 HTTP/1.1
+host: example.com
+proxy-connection: keep-alive
+content-length: 0
+date: {DATE}
+

tests/fixtures/response-with-connect.txt

@@ -0,0 +1,2 @@
+HTTP/1.1 200 Tunnel established
+