Upgrade rustls and update mas-http client bits

Author: sandhose

Cargo.lock

@@ -109,6 +109,10 @@ version = "1.1.0"
 [workspace.dependencies.http-body]
 version = "1.0.0"
 
+# http-body utilities
+[workspace.dependencies.http-body-util]
+version = "0.1.2"
+
 # HTTP client and server
 [workspace.dependencies.hyper]
 version = "1.4.0"
@@ -117,7 +121,15 @@ features = ["client", "http1", "http2"]
 # Additional Hyper utilties
 [workspace.dependencies.hyper-util]
 version = "0.1.6"
-features = ["server", "server-auto", "service", "http1", "http2", "tokio"]
+features = [
+    "client",
+    "server",
+    "server-auto",
+    "service",
+    "http1",
+    "http2",
+    "tokio",
+]
 
 # Hyper Rustls support
 [workspace.dependencies.hyper-rustls]
@@ -127,7 +139,7 @@ default-features = false
 
 # Email sending
 [workspace.dependencies.lettre]
-version = "=0.11.4"
+version = "0.11.7"
 default-features = false
 features = [
     "tokio1-rustls-tls",
@@ -149,11 +161,11 @@ version = "0.8.5"
 
 # TLS stack
 [workspace.dependencies.rustls]
-version = "0.22.4"
+version = "0.23.10"
 
 # Use platform-specific verifier for TLS
 [workspace.dependencies.rustls-platform-verifier]
-version = "0.2.0"
+version = "0.3.1"
 
 # JSON Schema generation
 [workspace.dependencies.schemars]

Cargo.toml

@@ -17,7 +17,9 @@ futures-util = "0.3.30"
 headers.workspace = true
 http.workspace = true
 http-body.workspace = true
+http-body-util.workspace = true
 hyper.workspace = true
+hyper-util.workspace = true
 hyper-rustls = { workspace = true, optional = true }
 opentelemetry.workspace = true
 opentelemetry-semantic-conventions.workspace = true
@@ -28,7 +30,7 @@ serde_json.workspace = true
 serde_urlencoded = "0.7.1"
 thiserror.workspace = true
 tower.workspace = true
-tower-http = { version = "0.4.4", features = ["cors"] }
+tower-http = { version = "0.5.2", features = ["cors"] }
 tracing.workspace = true
 tracing-opentelemetry.workspace = true
 

crates/http/Cargo.toml

@@ -12,12 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use hyper::client::{
-    connect::dns::{GaiResolver, Name},
-    HttpConnector,
-};
-pub use hyper::Client;
 use hyper_rustls::{HttpsConnector, HttpsConnectorBuilder};
+pub use hyper_util::client::legacy::Client;
+use hyper_util::{
+    client::legacy::connect::{
+        dns::{GaiResolver, Name},
+        HttpConnector,
+    },
+    rt::TokioExecutor,
+};
 use mas_tower::{
     DurationRecorderLayer, DurationRecorderService, FnWrapper, InFlightCounterLayer,
     InFlightCounterService, TraceLayer, TraceService,
@@ -26,8 +29,8 @@ use opentelemetry_semantic_conventions::trace::SERVER_ADDRESS;
 use tower::Layer;
 use tracing::Span;
 
-pub type UntracedClient<B> = hyper::Client<UntracedConnector, B>;
-pub type TracedClient<B> = hyper::Client<TracedConnector, B>;
+pub type UntracedClient<B> = Client<UntracedConnector, B>;
+pub type TracedClient<B> = Client<TracedConnector, B>;
 
 /// Create a basic Hyper HTTP & HTTPS client without any tracing
 #[must_use]
@@ -37,7 +40,7 @@ where
     B::Data: Send,
 {
     let https = make_untraced_connector();
-    Client::builder().build(https)
+    Client::builder(TokioExecutor::new()).build(https)
 }
 
 pub type TraceResolver<S> =

crates/http/src/client.rs

@@ -16,6 +16,7 @@ use bytes::Bytes;
 use futures_util::future::BoxFuture;
 use http::{Request, Response};
 use http_body::Body;
+use http_body_util::BodyExt;
 use thiserror::Error;
 use tower::{Layer, Service};
 
@@ -82,7 +83,7 @@ where
             let response = inner.await.map_err(Error::service)?;
             let (parts, body) = response.into_parts();
 
-            let body = hyper::body::to_bytes(body).await.map_err(Error::body)?;
+            let body = body.collect().await.map_err(Error::body)?.to_bytes();
 
             let response = Response::from_parts(parts, body);
             Ok(response)

crates/http/src/layers/body_to_bytes_response.rs

@@ -14,7 +14,7 @@
 
 use bytes::Bytes;
 use http::Request;
-use http_body::Full;
+use http_body_util::Full;
 use tower::{Layer, Service};
 
 #[derive(Clone)]

crates/http/src/layers/bytes_to_body_request.rs

@@ -44,4 +44,4 @@ pub use self::{
     service::{BoxCloneSyncService, HttpService},
 };
 
-pub type EmptyBody = http_body::Empty<bytes::Bytes>;
+pub type EmptyBody = http_body_util::Empty<bytes::Bytes>;

crates/http/src/lib.rs

@@ -23,7 +23,7 @@ pin-project-lite = "0.2.14"
 socket2 = "0.5.7"
 thiserror.workspace = true
 tokio.workspace = true
-tokio-rustls = "0.25.0"
+tokio-rustls = "0.26.0"
 tower.workspace = true
 tower-http = { version = "0.5.2", features = ["add-extension"] }
 tracing.workspace = true