Skip to content

Commit

Permalink
Revert "fix: Return error on non https uri instead of panic (hyperium…
Browse files Browse the repository at this point in the history
…#838)"

This reverts commit ef6e245.
  • Loading branch information
roblabla authored and poliorcetics committed Aug 12, 2022
1 parent afcaea8 commit 692eb03
Showing 1 changed file with 0 additions and 18 deletions.
18 changes: 0 additions & 18 deletions tonic/src/transport/service/connector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use super::tls::TlsConnector;
use http::Uri;
#[cfg(feature = "tls-roots-common")]
use std::convert::TryInto;
use std::fmt;
use std::task::{Context, Poll};
use tower::make::MakeConnection;
use tower_service::Service;
Expand Down Expand Up @@ -79,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 {
Expand All @@ -91,25 +88,10 @@ 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());
}
}

Ok(BoxedIo::new(io))
})
}
}

/// 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 {}

0 comments on commit 692eb03

Please sign in to comment.