tls feature flag for Endpoint::new

hyperium · Aug 9, 2024 · 03913b9 · 03913b9
1 parent 7f46d3a
commit 03913b9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/tests/integration_tests/tests/connection.rs b/tests/integration_tests/tests/connection.rs
@@ -22,6 +22,7 @@ impl test_server::Test for Svc {
 #[tokio::test]
 async fn connect_returns_err() {
     let res = TestClient::connect("http://thisdoesntexist").await;
+    dbg!(&res);
 
     assert!(res.is_err());
 }

diff --git a/tonic/src/transport/channel/endpoint.rs b/tonic/src/transport/channel/endpoint.rs
@@ -49,6 +49,24 @@ impl Endpoint {
         D::Error: Into<crate::Error>,
     {
         let me = dst.try_into().map_err(|e| Error::from_source(e.into()))?;
+        #[cfg(feature = "tls")]
+        if let Some(tls_config) = me
+            .uri
+            .scheme()
+            .map(|s| s.as_str() == http::uri::Scheme::HTTPS.as_str())
+            .unwrap_or(false)
+            .then(|| {
+                let config = ClientTlsConfig::new();
+                #[cfg(feature = "tls-native-roots")]
+                let config = config.with_native_roots();
+                #[cfg(feature = "tls-webpki-roots")]
+                let config = config.with_webpki_roots();
+                config
+            })
+        {
+            return me.tls_config(tls_config);
+        }
+
         Ok(me)
     }