refactor(proxy/http): create linkerd-http-upgrade crate

this moves the inter-related `upgrade` and `glue` submodules out of the
`linkerd-proxy-http` library and into a new standalone crate.

Signed-off-by: katelyn martin <[email protected]>

Author: cratelyn

Cargo.lock

@@ -1855,6 +1855,28 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "linkerd-http-upgrade"
+version = "0.1.0"
+dependencies = [
+ "bytes",
+ "drain",
+ "futures",
+ "http",
+ "http-body",
+ "hyper",
+ "linkerd-duplex",
+ "linkerd-error",
+ "linkerd-http-version",
+ "linkerd-io",
+ "linkerd-stack",
+ "pin-project",
+ "tokio",
+ "tower",
+ "tracing",
+ "try-lock",
+]
+
 [[package]]
 name = "linkerd-http-version"
 version = "0.1.0"
@@ -2228,6 +2250,7 @@ dependencies = [
  "linkerd-http-override-authority",
  "linkerd-http-retain",
  "linkerd-http-stream-timeouts",
+ "linkerd-http-upgrade",
  "linkerd-http-version",
  "linkerd-io",
  "linkerd-proxy-balance",

Cargo.toml

@@ -37,6 +37,7 @@ members = [
     "linkerd/http/retry",
     "linkerd/http/route",
     "linkerd/http/stream-timeouts",
+    "linkerd/http/upgrade",
     "linkerd/http/version",
     "linkerd/identity",
     "linkerd/idle-cache",

linkerd/http/upgrade/Cargo.toml

@@ -0,0 +1,29 @@
+[package]
+name = "linkerd-http-upgrade"
+version = "0.1.0"
+authors = ["Linkerd Developers <[email protected]>"]
+license = "Apache-2.0"
+edition = "2021"
+publish = false
+description = """
+Facilities for HTTP/1 upgrades.
+"""
+
+[dependencies]
+bytes = "1"
+drain = "0.1"
+futures = { version = "0.3", default-features = false }
+http = "0.2"
+http-body = "0.4"
+hyper = { version = "0.14", default-features = false, features = ["client"] }
+pin-project = "1"
+tokio = { version = "1", default-features = false }
+tower = { version = "0.4", default-features = false }
+tracing = "0.1"
+try-lock = "0.2"
+
+linkerd-duplex = { path = "../../duplex" }
+linkerd-error = { path = "../../error" }
+linkerd-http-version = { path = "../version" }
+linkerd-io = { path = "../../io" }
+linkerd-stack = { path = "../../stack" }

linkerd/proxy/http/src/glue.rs renamed to linkerd/http/upgrade/src/glue.rs

@@ -47,6 +47,7 @@ pub struct HyperConnectFuture<F> {
     inner: F,
     absolute_form: bool,
 }
+
 // === impl UpgradeBody ===
 
 impl HttpBody for UpgradeBody {
@@ -107,7 +108,7 @@ impl From<hyper::Body> for UpgradeBody {
 }
 
 impl UpgradeBody {
-    pub(crate) fn new(
+    pub fn new(
         body: hyper::Body,
         upgrade: Option<(Http11Upgrade, hyper::upgrade::OnUpgrade)>,
     ) -> Self {
@@ -129,7 +130,7 @@ impl PinnedDrop for UpgradeBody {
 // === impl HyperConnect ===
 
 impl<C, T> HyperConnect<C, T> {
-    pub(super) fn new(connect: C, target: T, absolute_form: bool) -> Self {
+    pub fn new(connect: C, target: T, absolute_form: bool) -> Self {
         HyperConnect {
             connect,
             target,
@@ -140,7 +141,7 @@ impl<C, T> HyperConnect<C, T> {
 
 impl<C, T> Service<hyper::Uri> for HyperConnect<C, T>
 where
-    C: MakeConnection<(crate::Version, T)> + Clone + Send + Sync,
+    C: MakeConnection<(linkerd_http_version::Version, T)> + Clone + Send + Sync,
     C::Connection: Unpin + Send,
     C::Future: Unpin + Send + 'static,
     T: Clone + Send + Sync,
@@ -157,7 +158,7 @@ where
         HyperConnectFuture {
             inner: self
                 .connect
-                .connect((crate::Version::Http1, self.target.clone())),
+                .connect((linkerd_http_version::Version::Http1, self.target.clone())),
             absolute_form: self.absolute_form,
         }
     }

linkerd/http/upgrade/src/lib.rs

@@ -0,0 +1,29 @@
+//! Facilities for HTTP/1 upgrades.
+
+pub use self::upgrade::Service;
+
+pub mod glue;
+pub mod upgrade;
+
+pub fn strip_connection_headers(headers: &mut http::HeaderMap) {
+    use http::header;
+    if let Some(val) = headers.remove(header::CONNECTION) {
+        if let Ok(conn_header) = val.to_str() {
+            // A `Connection` header may have a comma-separated list of
+            // names of other headers that are meant for only this specific
+            // connection.
+            //
+            // Iterate these names and remove them as headers.
+            for name in conn_header.split(',') {
+                let name = name.trim();
+                headers.remove(name);
+            }
+        }
+    }
+
+    // Additionally, strip these "connection-level" headers always, since
+    // they are otherwise illegal if upgraded to HTTP2.
+    headers.remove(header::UPGRADE);
+    headers.remove("proxy-connection");
+    headers.remove("keep-alive");
+}

linkerd/proxy/http/src/upgrade.rs renamed to linkerd/http/upgrade/src/upgrade.rs

@@ -162,6 +162,7 @@ impl Drop for Inner {
 }
 
 // === impl Service ===
+
 impl<S> Service<S> {
     pub fn new(service: S, upgrade_drain_signal: drain::Watch) -> Self {
         Self {

linkerd/proxy/http/Cargo.toml

@@ -49,6 +49,7 @@ linkerd-http-insert = { path = "../../http/insert" }
 linkerd-http-override-authority = { path = "../../http/override-authority" }
 linkerd-http-retain = { path = "../../http/retain" }
 linkerd-http-stream-timeouts = { path = "../../http/stream-timeouts" }
+linkerd-http-upgrade = { path = "../../http/upgrade" }
 linkerd-http-version = { path = "../../http/version" }
 linkerd-io = { path = "../../io" }
 linkerd-proxy-balance = { path = "../balance" }

linkerd/proxy/http/src/h1.rs

@@ -1,15 +1,15 @@
-use crate::{
-    glue::HyperConnect,
-    upgrade::{Http11Upgrade, HttpConnect},
-    TracingExecutor,
-};
+use crate::TracingExecutor;
 use futures::prelude::*;
 use http::{
     header::{CONTENT_LENGTH, TRANSFER_ENCODING},
     uri::Uri,
 };
 use linkerd_error::{Error, Result};
 use linkerd_http_box::BoxBody;
+use linkerd_http_upgrade::{
+    glue::HyperConnect,
+    upgrade::{Http11Upgrade, HttpConnect},
+};
 use linkerd_stack::MakeConnection;
 use std::{pin::Pin, time::Duration};
 use tracing::{debug, trace};
@@ -161,7 +161,7 @@ where
                     upgrade.insert_half(hyper::upgrade::on(&mut rsp));
                 }
             } else {
-                crate::strip_connection_headers(rsp.headers_mut());
+                linkerd_http_upgrade::strip_connection_headers(rsp.headers_mut());
             }
 
             rsp.map(BoxBody::new)

linkerd/proxy/http/src/lib.rs

@@ -8,7 +8,6 @@ pub mod balance;
 pub mod client;
 pub mod client_handle;
 pub mod detect;
-mod glue;
 pub mod h1;
 pub mod h2;
 mod header_from_target;
@@ -17,7 +16,6 @@ pub mod orig_proto;
 mod server;
 pub mod strip_header;
 pub mod timeout;
-pub mod upgrade;
 
 pub use self::{
     balance::NewBalance,
@@ -45,6 +43,7 @@ pub use linkerd_http_insert as insert;
 pub use linkerd_http_override_authority::{AuthorityOverride, NewOverrideAuthority};
 pub use linkerd_http_retain::{self as retain, Retain};
 pub use linkerd_http_stream_timeouts::{self as stream_timeouts, EnforceTimeouts, StreamTimeouts};
+pub use linkerd_http_upgrade as upgrade;
 pub use linkerd_http_version::{self as version, Version};
 
 #[derive(Clone, Debug)]
@@ -90,25 +89,3 @@ where
     let v = req.headers().get(header)?;
     v.to_str().ok()?.parse().ok()
 }
-
-fn strip_connection_headers(headers: &mut http::HeaderMap) {
-    if let Some(val) = headers.remove(header::CONNECTION) {
-        if let Ok(conn_header) = val.to_str() {
-            // A `Connection` header may have a comma-separated list of
-            // names of other headers that are meant for only this specific
-            // connection.
-            //
-            // Iterate these names and remove them as headers.
-            for name in conn_header.split(',') {
-                let name = name.trim();
-                headers.remove(name);
-            }
-        }
-    }
-
-    // Additionally, strip these "connection-level" headers always, since
-    // they are otherwise illegal if upgraded to HTTP2.
-    headers.remove(header::UPGRADE);
-    headers.remove("proxy-connection");
-    headers.remove("keep-alive");
-}

linkerd/proxy/http/src/orig_proto.rs

@@ -1,4 +1,4 @@
-use super::{h1, h2, upgrade};
+use super::{h1, h2};
 use futures::prelude::*;
 use http::header::{HeaderValue, TRANSFER_ENCODING};
 use hyper::body::HttpBody;
@@ -71,7 +71,11 @@ where
 
     fn call(&mut self, mut req: http::Request<B>) -> Self::Future {
         debug_assert!(req.version() != http::Version::HTTP_2);
-        if req.extensions().get::<upgrade::Http11Upgrade>().is_some() {
+        if req
+            .extensions()
+            .get::<linkerd_http_upgrade::upgrade::Http11Upgrade>()
+            .is_some()
+        {
             debug!("Skipping orig-proto upgrade due to HTTP/1.1 upgrade");
             return Box::pin(self.http1.request(req).map_ok(|rsp| rsp.map(BoxBody::new)));
         }