refactor(proxy/http): create linkerd-http-override-authority crate

NB: based on #3379 and #3380.

this pull the `override_authority` submodule out of
`linkerd-http-proxy` and into a standalone crate.

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

Author: cratelyn

Cargo.lock

@@ -1753,6 +1753,16 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "linkerd-http-override-authority"
+version = "0.1.0"
+dependencies = [
+ "http",
+ "linkerd-stack",
+ "tower",
+ "tracing",
+]
+
 [[package]]
 name = "linkerd-http-prom"
 version = "0.1.0"
@@ -2178,6 +2188,7 @@ dependencies = [
  "linkerd-http-executor",
  "linkerd-http-h2",
  "linkerd-http-insert",
+ "linkerd-http-override-authority",
  "linkerd-http-version",
  "linkerd-io",
  "linkerd-proxy-balance",

Cargo.toml

@@ -85,7 +85,7 @@ members = [
     "opencensus-proto",
     "opentelemetry-proto",
     "spiffe-proto",
-    "tools",
+    "tools", "linkerd/http/override-authority",
 ]
 
 [profile.release]

linkerd/http/override-authority/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "linkerd-http-override-authority"
+version = "0.1.0"
+authors = ["Linkerd Developers <[email protected]>"]
+license = "Apache-2.0"
+edition = "2021"
+publish = false
+description = """
+Tower middleware to override request authorities.
+"""
+
+[dependencies]
+http = "0.2"
+tower = { version = "0.4", default-features = false }
+tracing = "0.1"
+
+linkerd-stack = { path = "../../stack" }

linkerd/proxy/http/src/override_authority.rs renamed to linkerd/http/override-authority/src/lib.rs

@@ -1,4 +1,7 @@
-use http::{header::AsHeaderName, uri::Authority};
+use http::{
+    header::AsHeaderName,
+    uri::{self, Authority},
+};
 use linkerd_stack::{layer, NewService, Param};
 use std::{
     fmt,
@@ -23,6 +26,27 @@ pub struct OverrideAuthority<S, H> {
     inner: S,
 }
 
+/// Sets the [`Authority`][uri::Authority] of the given URI.
+pub fn set_authority(uri: &mut uri::Uri, auth: Authority) {
+    let mut parts = uri::Parts::from(std::mem::take(uri));
+
+    parts.authority = Some(auth);
+
+    // If this was an origin-form target (path only),
+    // then we can't *only* set the authority, as that's
+    // an illegal target (such as `example.com/docs`).
+    //
+    // But don't set a scheme if this was authority-form (CONNECT),
+    // since that would change its meaning (like `https://example.com`).
+    if parts.path_and_query.is_some() {
+        parts.scheme = Some(http::uri::Scheme::HTTP);
+    }
+
+    let new = http::uri::Uri::from_parts(parts).expect("absolute uri");
+
+    *uri = new;
+}
+
 // === impl NewOverrideAuthority ===
 
 impl<H: Clone, N> NewOverrideAuthority<H, N> {

linkerd/proxy/http/Cargo.toml

@@ -46,6 +46,7 @@ linkerd-http-classify = { path = "../../http/classify" }
 linkerd-http-executor = { path = "../../http/executor" }
 linkerd-http-h2 = { path = "../../http/h2" }
 linkerd-http-insert = { path = "../../http/insert" }
+linkerd-http-override-authority = { path = "../../http/override-authority" }
 linkerd-http-version = { path = "../../http/version" }
 linkerd-io = { path = "../../io" }
 linkerd-proxy-balance = { path = "../balance" }

linkerd/proxy/http/src/lib.rs

@@ -15,7 +15,6 @@ pub mod h2;
 mod header_from_target;
 pub mod normalize_uri;
 pub mod orig_proto;
-mod override_authority;
 mod retain;
 mod server;
 pub mod stream_timeouts;
@@ -33,7 +32,6 @@ pub use self::{
     detect::DetectHttp,
     header_from_target::NewHeaderFromTarget,
     normalize_uri::{MarkAbsoluteForm, NewNormalizeUri},
-    override_authority::{AuthorityOverride, NewOverrideAuthority},
     retain::Retain,
     server::{NewServeHttp, Params as ServerParams, ServeHttp},
     stream_timeouts::{EnforceTimeouts, StreamTimeouts},
@@ -48,6 +46,7 @@ pub use hyper::body::HttpBody;
 pub use linkerd_http_box::{BoxBody, BoxRequest, BoxResponse, EraseResponse};
 pub use linkerd_http_executor::TracingExecutor;
 pub use linkerd_http_insert as insert;
+pub use linkerd_http_override_authority::{AuthorityOverride, NewOverrideAuthority};
 pub use linkerd_http_version::{self as version, Version};
 
 #[derive(Clone, Debug)]
@@ -94,26 +93,6 @@ where
     v.to_str().ok()?.parse().ok()
 }
 
-fn set_authority(uri: &mut uri::Uri, auth: uri::Authority) {
-    let mut parts = uri::Parts::from(std::mem::take(uri));
-
-    parts.authority = Some(auth);
-
-    // If this was an origin-form target (path only),
-    // then we can't *only* set the authority, as that's
-    // an illegal target (such as `example.com/docs`).
-    //
-    // But don't set a scheme if this was authority-form (CONNECT),
-    // since that would change its meaning (like `https://example.com`).
-    if parts.path_and_query.is_some() {
-        parts.scheme = Some(http::uri::Scheme::HTTP);
-    }
-
-    let new = http::uri::Uri::from_parts(parts).expect("absolute uri");
-
-    *uri = new;
-}
-
 fn strip_connection_headers(headers: &mut http::HeaderMap) {
     if let Some(val) = headers.remove(header::CONNECTION) {
         if let Ok(conn_header) = val.to_str() {

linkerd/proxy/http/src/normalize_uri.rs

@@ -123,7 +123,7 @@ where
                 };
 
                 trace!(%authority, "Normalizing URI");
-                crate::set_authority(req.uri_mut(), authority);
+                linkerd_http_override_authority::set_authority(req.uri_mut(), authority);
             }
         }