Make it an error to connect to a https URL without TLS

hyperium · Nov 15, 2021 · 836c79c · 836c79c
1 parent c62f382
commit 836c79c
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/tonic/src/transport/service/connector.rs b/tonic/src/transport/service/connector.rs
@@ -80,16 +80,26 @@ where
         #[cfg(feature = "tls-roots-common")]
         let tls = self.tls_or_default(uri.scheme_str(), uri.host());
 
+        let is_https = uri.scheme_str() == Some("https");
         let connect = self.inner.make_connection(uri);
 
         Box::pin(async move {
+            #[cfg(not(feature = "tls"))]
+            {
+                if is_https && tls.is_some() {
+                    return Err("connecting to HTTPS without TLS enabled".to_owned().into());
+                }
+            }
+
             let io = connect.await?;
 
             #[cfg(feature = "tls")]
             {
                 if let Some(tls) = tls {
                     let conn = tls.connect(io).await?;
                     return Ok(BoxedIo::new(conn));
+                } else if is_https {
+                    return Err("connecting to HTTPS without TLS enabled".to_owned().into());
                 }
             }