Skip to content

Commit

Permalink
Add an error message if we receive a non-hostname-based dest
Browse files Browse the repository at this point in the history
This is more helpful than an unwrap and at least points users at the right location.
Upstream issue is briansmith/webpki#54
  • Loading branch information
svenstaro committed Oct 4, 2019
1 parent 2667850 commit f6f9e1f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion actix-connect/src/ssl/rustls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ where
fn call(&mut self, stream: Connection<T, U>) -> Self::Future {
trace!("SSL Handshake start for: {:?}", stream.host());
let (io, stream) = stream.replace(());
let host = DNSNameRef::try_from_ascii_str(stream.host()).unwrap();
let host = DNSNameRef::try_from_ascii_str(stream.host())
.expect("rustls currently only handles hostname-based connections. See https://github.com/briansmith/webpki/issues/54");
ConnectAsyncExt {
fut: TlsConnector::from(self.connector.clone()).connect(host, io),
stream: Some(stream),
Expand Down
1 change: 1 addition & 0 deletions actix-connect/tests/test_connect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ fn test_rustls_string() {
let con = test::call_service(&mut conn, addr.into());
assert_eq!(con.peer_addr().unwrap(), srv.addr());
}

#[test]
fn test_static_str() {
let srv = TestServer::with(|| {
Expand Down

0 comments on commit f6f9e1f

Please sign in to comment.