http: Put normalize_uri back on the stack (#659)

In b59172a, we moved the NormalizeUri logic into the HTTP server, but
this misses downgraded requests.

This change extracts NormalizeUri from the server, putting it back on
the HTTP stack so that it can be applied after `orig_proto::Downgrade`
is applied on the inbound proxy.

Author: olix0r

linkerd/app/inbound/src/lib.rs

@@ -346,6 +346,7 @@ impl Config {
             // Used by tap.
             .push_http_insert_target()
             .check_new_service::<tls::accept::Meta, http::Request<_>>()
+            .push(svc::layer::mk(http::normalize_uri::MakeNormalizeUri::new))
             .push_on_response(
                 svc::layers()
                     .push(http_admit_request)

linkerd/app/outbound/src/lib.rs

@@ -523,6 +523,7 @@ impl Config {
                     .box_http_request()
                     .box_http_response(),
             )
+            .push(svc::layer::mk(http::normalize_uri::MakeNormalizeUri::new))
             .instrument(
                 |addrs: &listen::Addrs| info_span!("source", target.addr = %addrs.target_addr()),
             )

linkerd/proxy/http/src/detect.rs

@@ -2,7 +2,6 @@ use crate::{
     self as http,
     glue::{Body, HyperServerSvc},
     h2::Settings as H2Settings,
-    normalize_uri::{MakeNormalizeUri, NormalizeUri},
     trace, upgrade, Version as HttpVersion,
 };
 use futures::prelude::*;
@@ -11,7 +10,6 @@ use linkerd2_error::Error;
 use linkerd2_io::{self as io, PrefixedIo};
 use std::{
     future::Future,
-    net::SocketAddr,
     pin::Pin,
     task::{Context, Poll},
     time::Duration,
@@ -74,7 +72,6 @@ impl<F, H> DetectHttp<F, H> {
 impl<T, F, S> Service<T> for DetectHttp<F, S>
 where
     T: Clone + Send + 'static,
-    for<'t> &'t T: Into<SocketAddr>,
     F: tower::Service<T> + Clone + Send + 'static,
     F::Error: Into<Error>,
     F::Response: Send + 'static,
@@ -84,7 +81,7 @@ where
     S::Response: Send + 'static,
     S::Future: Send + 'static,
 {
-    type Response = AcceptHttp<F::Response, NormalizeUri<S::Response>>;
+    type Response = AcceptHttp<F::Response, S::Response>;
     type Error = Error;
     type Future =
         Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send + 'static>>;
@@ -96,7 +93,7 @@ where
     fn call(&mut self, target: T) -> Self::Future {
         let drain = self.drain.clone();
         let tcp = self.tcp.clone();
-        let http = MakeNormalizeUri::new(self.http.clone());
+        let http = self.http.clone();
         let server = self.server.clone();
         let timeout = self.timeout;
 

linkerd/proxy/http/src/lib.rs

@@ -14,7 +14,7 @@ pub mod h1;
 pub mod h2;
 pub mod header_from_target;
 pub mod insert;
-mod normalize_uri;
+pub mod normalize_uri;
 pub mod orig_proto;
 pub mod override_authority;
 pub mod strip_header;

linkerd/proxy/http/src/normalize_uri.rs

@@ -39,7 +39,7 @@ pub struct NormalizeUri<S> {
 // === impl MakeNormalizeUri ===
 
 impl<N> MakeNormalizeUri<N> {
-    pub(crate) fn new(inner: N) -> Self {
+    pub fn new(inner: N) -> Self {
         Self { inner }
     }
 }