refactor(dgw): rename module rdp_extension to rd_clean_path

Author: CBenoit

devolutions-gateway/src/api/fwd.rs

@@ -249,7 +249,7 @@ where
 
             // Establish TLS connection with server
 
-            let server_stream = crate::tls::connect(selected_target.host(), server_stream)
+            let server_stream = crate::tls::connect(selected_target.host().to_owned(), server_stream)
                 .await
                 .context("TLS connect")
                 .map_err(ForwardError::BadGateway)?;

devolutions-gateway/src/api/rdp.rs

@@ -69,7 +69,7 @@ async fn handle_socket(
         Duration::from_secs(conf.debug.ws_keep_alive_interval),
     );
 
-    let result = crate::rdp_extension::handle(
+    let result = crate::rd_clean_path::handle(
         stream,
         source_addr,
         conf,

devolutions-gateway/src/lib.rs

@@ -28,7 +28,7 @@ pub mod middleware;
 pub mod ngrok;
 pub mod plugin_manager;
 pub mod proxy;
-pub mod rdp_extension;
+pub mod rd_clean_path;
 pub mod rdp_pcb;
 pub mod recording;
 pub mod session;

devolutions-gateway/src/rdp_extension.rs renamed to devolutions-gateway/src/rd_clean_path.rs

@@ -237,7 +237,7 @@ async fn process_cleanpath(
 
     // Establish TLS connection with server
 
-    let server_stream = crate::tls::connect(selected_target.host(), server_stream)
+    let server_stream = crate::tls::connect(selected_target.host().to_owned(), server_stream)
         .await
         .map_err(|source| CleanPathError::TlsHandshake {
             source,
@@ -321,7 +321,7 @@ pub async fn handle(
         .recording_policy(claims.jet_rec)
         .build();
 
-    info!("RDP-TLS forwarding");
+    info!("RDP-TLS forwarding (RDCleanPath)");
 
     Proxy::builder()
         .conf(conf)

devolutions-gateway/src/tls.rs

@@ -2,7 +2,6 @@ use std::io;
 use std::sync::{Arc, LazyLock};
 
 use anyhow::Context as _;
-use tokio::net::TcpStream;
 use tokio_rustls::client::TlsStream;
 use tokio_rustls::rustls::{self, pki_types};
 
@@ -32,10 +31,13 @@ static TLS_CONNECTOR: LazyLock<tokio_rustls::TlsConnector> = LazyLock::new(|| {
     tokio_rustls::TlsConnector::from(Arc::new(config))
 });
 
-pub async fn connect(dns_name: &str, stream: TcpStream) -> io::Result<TlsStream<TcpStream>> {
+pub async fn connect<IO>(dns_name: String, stream: IO) -> io::Result<TlsStream<IO>>
+where
+    IO: tokio::io::AsyncRead + tokio::io::AsyncWrite + Unpin,
+{
     use tokio::io::AsyncWriteExt as _;
 
-    let dns_name = pki_types::ServerName::try_from(dns_name.to_owned()).map_err(io::Error::other)?;
+    let dns_name = pki_types::ServerName::try_from(dns_name).map_err(io::Error::other)?;
 
     let mut tls_stream = TLS_CONNECTOR.connect(dns_name, stream).await?;