From 7dbdda581e339c2e279c222d42c4e5a21ab4e534 Mon Sep 17 00:00:00 2001 From: roblabla Date: Mon, 25 Apr 2022 16:03:00 +0200 Subject: [PATCH] Revert "fix: Return error on non https uri instead of panic (#838)" This reverts commit ef6e245180936097e56f5f95ed8b182674f3131b. --- tonic/src/transport/service/connector.rs | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/tonic/src/transport/service/connector.rs b/tonic/src/transport/service/connector.rs index 158d98a45..d0625ef0b 100644 --- a/tonic/src/transport/service/connector.rs +++ b/tonic/src/transport/service/connector.rs @@ -3,7 +3,8 @@ use super::io::BoxedIo; #[cfg(feature = "tls")] use super::tls::TlsConnector; use http::Uri; -use std::fmt; +#[cfg(feature = "tls-roots-common")] +use std::convert::TryInto; use std::task::{Context, Poll}; use tower::make::MakeConnection; use tower_service::Service; @@ -77,8 +78,6 @@ where #[cfg(feature = "tls-roots-common")] let tls = self.tls_or_default(uri.scheme_str(), uri.host()); - #[cfg(feature = "tls")] - let is_https = uri.scheme_str() == Some("https"); let connect = self.inner.make_connection(uri); Box::pin(async move { @@ -89,8 +88,6 @@ where if let Some(tls) = tls { let conn = tls.connect(io).await?; return Ok(BoxedIo::new(conn)); - } else if is_https { - return Err(HttpsUriWithoutTlsSupport(()).into()); } } @@ -98,16 +95,3 @@ where }) } } - -/// Error returned when trying to connect to an HTTPS endpoint without TLS enabled. -#[derive(Debug)] -pub(crate) struct HttpsUriWithoutTlsSupport(()); - -impl fmt::Display for HttpsUriWithoutTlsSupport { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - write!(f, "Connecting to HTTPS without TLS enabled") - } -} - -// std::error::Error only requires a type to impl Debug and Display -impl std::error::Error for HttpsUriWithoutTlsSupport {}