tools/unitctl: use hyper-rustls instead of hyper-tls

Signed-off-by: Ava Hahn <[email protected]>
nginx · Sep 23, 2024 · 4f050af · 4f050af
1 parent ba234b4
commit 4f050af
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 6 deletions.
diff --git a/tools/unitctl/Cargo.lock b/tools/unitctl/Cargo.lock
diff --git a/tools/unitctl/unit-client-rs/Cargo.toml b/tools/unitctl/unit-client-rs/Cargo.toml
@@ -15,7 +15,7 @@ default = ["serde_json/preserve_order"]
 [dependencies]
 custom_error = "1.9"
 hyper = { version = "0.14", features = ["stream"] }
-hyper-tls = "0.5"
+hyper-rustls = { version = "0.25.0", features = ["rustls-native-certs", "webpki-roots"] }
 hyperlocal = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

diff --git a/tools/unitctl/unit-client-rs/src/lib.rs b/tools/unitctl/unit-client-rs/src/lib.rs
@@ -1,7 +1,6 @@
 extern crate custom_error;
 extern crate futures;
 extern crate hyper;
-extern crate hyper_tls;
 extern crate hyperlocal;
 extern crate serde;
 extern crate serde_json;

diff --git a/tools/unitctl/unit-client-rs/src/unit_client.rs b/tools/unitctl/unit-client-rs/src/unit_client.rs
@@ -9,7 +9,7 @@ use hyper::body::{Buf, HttpBody};
 use hyper::client::{HttpConnector, ResponseFuture};
 use hyper::Error as HyperError;
 use hyper::{http, Body, Client, Request};
-use hyper_tls::HttpsConnector;
+use hyper_rustls::{HttpsConnectorBuilder, HttpsConnector};
 use hyperlocal::{UnixClientExt, UnixConnector};
 use serde::{Deserialize, Serialize};
 
@@ -185,7 +185,14 @@ impl UnitClient {
     }
 
     pub fn new_http(control_socket: ControlSocket) -> Self {
-        let remote_client = Client::builder().build(HttpsConnector::new());
+        let remote_client = Client::builder()
+            .build(HttpsConnectorBuilder::default()
+                   .with_native_roots()
+                   .unwrap_or_else(|_| HttpsConnectorBuilder::default()
+                                   .with_webpki_roots())
+                   .https_or_http()
+                   .enable_http1()
+                   .wrap_connector(HttpConnector::new()));
         Self {
             control_socket,
             client: Box::from(RemoteClient::Tcp { client: remote_client }),