expose server name via cli

Author: dlemel8

src/client/main.rs

@@ -85,13 +85,19 @@ async fn new_tunneler(
             )
             .await?,
         )),
-        TunnelerType::Tls { ca_cert, cert, key } => Ok(Box::new(
+        TunnelerType::Tls {
+            ca_cert,
+            cert,
+            key,
+            server_hostname,
+        } => Ok(Box::new(
             TlsTunneler::new(
                 address,
                 port,
                 ca_cert.to_path_buf(),
                 cert.to_path_buf(),
                 key.to_path_buf(),
+                server_hostname.clone(),
             )
             .await?,
         )),

src/client/tls.rs

@@ -26,6 +26,7 @@ impl TlsTunneler {
         ca_cert: PathBuf,
         client_cert: PathBuf,
         client_key: PathBuf,
+        server_hostname: String,
     ) -> Result<Self, Box<dyn Error>> {
         let mut config = ClientConfig::new();
         config.root_store.add(&load_certificate(ca_cert).await?)?;
@@ -37,7 +38,7 @@ impl TlsTunneler {
         log::debug!("connecting to {}", to_address);
         let tcp_stream = TcpStream::connect(to_address).await?;
 
-        let domain = DNSNameRef::try_from_ascii_str("server.tunneler")?;
+        let domain = DNSNameRef::try_from_ascii_str(&server_hostname)?;
         let stream = connector.connect(domain, tcp_stream).await?;
         let (reader, writer) = split(stream);
         Ok(Self {

src/common/cli.rs

@@ -24,6 +24,8 @@ pub enum TunnelerType {
         cert: PathBuf,
         #[structopt(env)]
         key: PathBuf,
+        #[structopt(env)]
+        server_hostname: String,
     },
 }
 

src/server/main.rs

@@ -72,8 +72,13 @@ async fn new_untunneler(
             )
             .await?,
         )),
-        TunnelerType::Tls { ca_cert, cert, key } => Ok(Box::new(
-            TlsUntunneler::new(address, port, ca_cert, cert, key).await?,
+        TunnelerType::Tls {
+            ca_cert,
+            cert,
+            key,
+            server_hostname,
+        } => Ok(Box::new(
+            TlsUntunneler::new(address, port, ca_cert, cert, key, server_hostname).await?,
         )),
     }
 }

src/server/tls.rs

@@ -30,6 +30,7 @@ impl TlsUntunneler {
         ca_cert: PathBuf,
         server_cert: PathBuf,
         server_key: PathBuf,
+        server_hostname: String,
     ) -> Result<Self, Box<dyn Error>> {
         let mut store = RootCertStore::empty();
         store.add(&load_certificate(ca_cert).await?)?;
@@ -40,7 +41,7 @@ impl TlsUntunneler {
         let mut resolver = ResolvesServerCertUsingSNI::new();
         let signing_key = load_signing_key(server_key).await?;
         resolver.add(
-            "server.tunneler",
+            &server_hostname,
             CertifiedKey::new(chain, Arc::new(signing_key)),
         )?;
         config.cert_resolver = Arc::new(resolver);