From 31dd67380ed26d7b4c7e9bd3b36a5b375a4ac604 Mon Sep 17 00:00:00 2001
From: Malloc Voidstar <1284317+AlyoshaVasilieva@users.noreply.github.com>
Date: Fri, 12 Nov 2021 17:15:39 -0800
Subject: [PATCH] Return error for InvalidDnsNameError, don't panic (#436)

Can't provide src for the error as rustls 0.20 didn't implement stdlib Error for it; it's on main and targeted for 0.20.1.
---
 src/stream.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/stream.rs b/src/stream.rs
index b9cc26c..65a7c06 100644
--- a/src/stream.rs
+++ b/src/stream.rs
@@ -367,9 +367,10 @@ pub(crate) fn connect_https(unit: &Unit, hostname: &str) -> Result<Stream, Error
     let mut sock = connect_host(unit, hostname, port)?;
     let mut sess = rustls::ClientConnection::new(
         tls_conf,
-        rustls::ServerName::try_from(hostname).expect("invalid DNS name"),
+        rustls::ServerName::try_from(hostname).map_err(|_e| ErrorKind::Dns.new())?,
     )
     .map_err(|e| ErrorKind::Io.new().src(e))?;
+    // TODO rustls 0.20.1: Add src to ServerName error (0.20 didn't implement StdError trait for it)
 
     sess.complete_io(&mut sock)
         .map_err(|err| ErrorKind::ConnectionFailed.new().src(err))?;