refactor(devolutions-gateway): small refactoring;

Author: TheBestTvarynka

devolutions-gateway/src/generic_client.rs

@@ -103,7 +103,6 @@ where
                 span.record("target", selected_target.to_string());
 
                 let is_rdp = claims.jet_ap == token::ApplicationProtocol::Known(token::Protocol::Rdp);
-                trace!(is_rdp, "IS_RDP????");
 
                 let info = SessionInfo::builder()
                     .association_id(claims.jet_aid)

devolutions-gateway/src/rdp_proxy.rs

@@ -54,8 +54,6 @@ where
     C: AsyncRead + AsyncWrite + Unpin + Send + Sync,
     S: AsyncRead + AsyncWrite + Unpin + Send + Sync,
 {
-    info!("started RDP proxy!");
-
     let RdpProxy {
         conf,
         session_info,
@@ -85,42 +83,31 @@ where
         tls_conf.acceptor.clone(),
     ));
 
-    info!("gateway public key is here");
-
     // -- Dual handshake with the client and the server until the TLS security upgrade -- //
 
     let mut client_framed = ironrdp_tokio::TokioFramed::new_with_leftover(client_stream, client_stream_leftover_bytes);
     let mut server_framed = ironrdp_tokio::TokioFramed::new(server_stream);
 
-    info!("framed streams are here");
-
     let handshake_result =
         dual_handshake_until_tls_upgrade(&mut client_framed, &mut server_framed, credential_mapping).await?;
-    info!("the handshakes are done!");
 
     let client_stream = client_framed.into_inner_no_leftover();
     let server_stream = server_framed.into_inner_no_leftover();
 
-    info!("Handshake is done!");
-
     // -- Perform the TLS upgrading for both the client and the server, effectively acting as a man-in-the-middle -- //
 
     let client_tls_upgrade_fut = tls_conf.acceptor.accept(client_stream);
     let server_tls_upgrade_fut = crate::tls::connect(server_dns_name.clone(), server_stream);
 
     let (client_stream, server_stream) = tokio::join!(client_tls_upgrade_fut, server_tls_upgrade_fut);
 
-    info!("TLS upgrade futures finished!");
-
     let client_stream = client_stream
         .inspect_err(|err| warn!(?err, "client stream error"))
         .context("TLS upgrade with client failed")?;
     let server_stream = server_stream
         .inspect_err(|err| warn!(?err, "server stream error"))
         .context("TLS upgrade with server failed")?;
 
-    info!("TLS upgrade is done!");
-
     let server_public_key =
         extract_tls_server_public_key(&server_stream).context("extract target server TLS public key")?;
     let gateway_public_key = gateway_public_key_handle.await??;
@@ -130,8 +117,6 @@ where
     let mut client_framed = ironrdp_tokio::TokioFramed::new(client_stream);
     let mut server_framed = ironrdp_tokio::TokioFramed::new(server_stream);
 
-    warn!("START CREDSSPS STAGES");
-
     let krb_server_config = if conf.debug.enable_unstable {
         if let Some(KerberosServer {
             max_time_skew,
@@ -193,7 +178,6 @@ where
     // client_credssp_res.context("CredSSP with client")?;
     // server_credssp_res.context("CredSSP with server")?;
     client_credssp_fut.await.context("CredSSP with client")?;
-    warn!("CREDSASPWITHCLIENTFINISHED");
     server_credssp_fut.await.context("CredSSP with server")?;
 
     // -- Intercept the Connect Confirm PDU, to override the server_security_protocol field -- //
@@ -341,17 +325,11 @@ where
         .await
         .context("send connection request to server")?;
 
-    info!("sent");
-
     let (_, received_frame) = server_framed.read_pdu().await.context("read PDU from server")?;
-    info!("pdu has been read");
-
     let received_connection_confirm: x224::X224<nego::ConnectionConfirm> =
         ironrdp_core::decode(&received_frame).context("decode PDU from server")?;
     trace!(message = ?received_connection_confirm, "Received Connection Confirm PDU from server");
 
-    debug!("before match");
-
     let (connection_confirm_to_send, handshake_result) = match &received_connection_confirm.0 {
         nego::ConnectionConfirm::Response {
             flags,
@@ -408,8 +386,6 @@ where
 {
     use ironrdp_tokio::FramedWrite as _;
 
-    info!(?credentials, "CREDSFORTHESERVER targetccredscheck");
-
     let (credentials, domain) = match credentials {
         crate::credential::AppCredential::UsernamePassword {
             username,
@@ -424,8 +400,6 @@ where
         ),
     };
 
-    info!(?credentials, "CREDSFORTHESERVER");
-
     let (mut sequence, mut ts_request) = ironrdp_connector::credssp::CredsspSequence::init(
         credentials,
         domain,
@@ -445,10 +419,9 @@ where
             let mut generator = sequence.process_ts_request(ts_request);
 
             if let Some(network_client_ref) = network_client.as_deref_mut() {
-                trace!("resolving network");
                 resolve_client_generator(&mut generator, network_client_ref).await?
             } else {
-                panic!("network client is missing")
+                generator.resolve_to_result().context("sspi generator resolve")?
             }
         }; // drop generator
 
@@ -482,7 +455,7 @@ where
 async fn resolve_server_generator(
     generator: &mut CredsspServerProcessGenerator<'_>,
     network_client: &mut dyn AsyncSendableNetworkClient,
-) -> Result<ServerState, Box<ServerError>> {
+) -> Result<ServerState, ServerError> {
     let mut state = generator.start();
 
     loop {
@@ -553,8 +526,6 @@ where
     .await;
 
     if security_protocol.intersects(nego::SecurityProtocol::HYBRID_EX) {
-        trace!(?result, "HYBRID_EX");
-
         let result = if result.is_ok() {
             EarlyUserAuthResult::Success
         } else {
@@ -595,8 +566,6 @@ where
             password: password.expose_secret().to_owned().into(),
         };
 
-        info!(?identity, ?client_computer_name, "CREDSFORTHECLIENT");
-
         let mut sequence = ironrdp_acceptor::credssp::CredsspSequence::init(
             &identity,
             client_computer_name,
@@ -624,7 +593,7 @@ where
                 if let Some(network_client_ref) = network_client.as_deref_mut() {
                     resolve_server_generator(&mut generator, network_client_ref).await
                 } else {
-                    panic!("network client is missing");
+                    generator.resolve_to_result()
                 }
             }; // drop generator