Skip to content

Commit b04c1c6

Browse files
authored
configure tls automatically when possible (#445)
1 parent d414206 commit b04c1c6

File tree

1 file changed

+26
-3
lines changed

1 file changed

+26
-3
lines changed

tonic/src/transport/service/connector.rs

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,26 @@ impl<C> Connector<C> {
3636
fn new(inner: C, tls: Option<TlsConnector>) -> Self {
3737
Self { inner, tls }
3838
}
39+
40+
#[cfg(feature = "tls-roots")]
41+
fn tls_or_default(&self, scheme: Option<&str>, host: Option<&str>) -> Option<TlsConnector> {
42+
use tokio_rustls::webpki::DNSNameRef;
43+
44+
if self.tls.is_some() {
45+
return self.tls.clone();
46+
}
47+
48+
match (scheme, host) {
49+
(Some("https"), Some(host)) => {
50+
if DNSNameRef::try_from_ascii(host.as_bytes()).is_ok() {
51+
TlsConnector::new_with_rustls_cert(None, None, host.to_owned()).ok()
52+
} else {
53+
None
54+
}
55+
}
56+
_ => None,
57+
}
58+
}
3959
}
4060

4161
impl<C> Service<Uri> for Connector<C>
@@ -54,11 +74,14 @@ where
5474
}
5575

5676
fn call(&mut self, uri: Uri) -> Self::Future {
57-
let connect = self.inner.make_connection(uri);
58-
59-
#[cfg(feature = "tls")]
77+
#[cfg(all(feature = "tls", not(feature = "tls-roots")))]
6078
let tls = self.tls.clone();
6179

80+
#[cfg(feature = "tls-roots")]
81+
let tls = self.tls_or_default(uri.scheme_str(), uri.host());
82+
83+
let connect = self.inner.make_connection(uri);
84+
6285
Box::pin(async move {
6386
let io = connect.await?;
6487

0 commit comments

Comments
 (0)