Devolutions · irvingoujAtDevolution · Jun 2, 2025 · Jun 2, 2025 · Jun 4, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -149,3 +149,4 @@ opt-level = 3
 # FIXME: We need to catch up with Diplomat upstream again, but this is a significant amount of work.
 # In the meantime, we use this forked version which fixes an undefined behavior in the code expanded by the bridge macro.
 diplomat = { git = "https://github.com/CBenoit/diplomat", rev = "6dc806e80162b6b39509a04a2835744236cd2396" }
+sspi = { git = "https://github.com/Devolutions/sspi-rs", branch = "for-temporary-vmconnect-demo" }
diff --git a/crates/ironrdp-async/src/connector.rs b/crates/ironrdp-async/src/connector.rs
@@ -68,6 +68,7 @@ where
             server_public_key,
             network_client,
             kerberos_config,
+            false, // use_vmconnect
         )
         .await?;
     }
@@ -106,14 +107,15 @@ async fn resolve_generator(
 }
 
 #[instrument(level = "trace", skip_all)]
-async fn perform_credssp_step<S>(
+pub async fn perform_credssp_step<S>(
     framed: &mut Framed<S>,
     connector: &mut ClientConnector,
     buf: &mut WriteBuf,
     server_name: ServerName,
     server_public_key: Vec<u8>,
     mut network_client: Option<&mut dyn AsyncNetworkClient>,
     kerberos_config: Option<KerberosConfig>,
+    use_vmconnect: bool,
 ) -> ConnectorResult<()>
 where
     S: FramedRead + FramedWrite,
@@ -132,6 +134,7 @@ where
         server_name,
         server_public_key,
         kerberos_config,
+        use_vmconnect,
     )?;
 
     loop {

diff --git a/crates/ironrdp-blocking/src/connector.rs b/crates/ironrdp-blocking/src/connector.rs
@@ -137,6 +137,8 @@ where
         server_name,
         server_public_key,
         kerberos_config,
+        // TODO: implement vmconnect support for ironrdp-blocking
+        false,
     )?;
 
     loop {

diff --git a/crates/ironrdp-client/Cargo.toml b/crates/ironrdp-client/Cargo.toml
@@ -48,6 +48,7 @@ ironrdp-rdpsnd-native = { path = "../ironrdp-rdpsnd-native", version = "0.3" }
 ironrdp-tls = { path = "../ironrdp-tls", version = "0.1" }
 ironrdp-tokio = { path = "../ironrdp-tokio", version = "0.4", features = ["reqwest"] }
 ironrdp-rdcleanpath.path = "../ironrdp-rdcleanpath"
+ironrdp-vmconnect.path = "../ironrdp-vmconnect"
 
 # Windowing and rendering
 winit = { version = "0.30", features = ["rwh_06"] }

diff --git a/crates/ironrdp-client/src/config.rs b/crates/ironrdp-client/src/config.rs
@@ -21,6 +21,7 @@ pub struct Config {
     pub connector: connector::Config,
     pub clipboard_type: ClipboardType,
     pub rdcleanpath: Option<RDCleanPathConfig>,
+    pub pcb: Option<PreconnectionBlobPayload>,
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum)]
@@ -238,6 +239,36 @@ struct Args {
     /// The bitmap codecs to use (remotefx:on, ...)
     #[clap(long, value_parser, num_args = 1.., value_delimiter = ',')]
     codecs: Vec<String>,
+
+    /// The ID for the HyperV VM server to connect to
+    #[clap(long, value_parser)]
+    vmconnect: Option<String>,
+
+    /// Preconnection Blob payload to use, cannot be used with `--vmconnect`
+    #[clap(long, value_parser)]
+    pcb: Option<String>,
+}
+
+#[de
6D40
rive(Debug, Clone, PartialEq, Eq)]
+pub enum PreconnectionBlobPayload {
+    General(String),
+    VmConnect(String),
+}
+
+impl PreconnectionBlobPayload {
+    pub fn general(&self) -> Option<&str> {
+        match self {
+            PreconnectionBlobPayload::General(pcb) => Some(pcb),
+            PreconnectionBlobPayload::VmConnect(_) => None,
+        }
+    }
+
+    pub fn vmconnect(&self) -> Option<&str> {
+        match self {
+            PreconnectionBlobPayload::VmConnect(vm_id) => Some(vm_id),
+            PreconnectionBlobPayload::General(_) => None,
+        }
+    }
 }
 
 impl Config {
@@ -351,12 +382,22 @@ impl Config {
             .zip(args.rdcleanpath_token)
             .map(|(url, auth_token)| RDCleanPathConfig { url, auth_token });
 
+        let pcb = match (args.vmconnect, args.pcb) {
+            (Some(_), Some(_)) => {
+                anyhow::bail!("Cannot use both --vmconnect and --pcb options. Choose one of them.");
+            }
+            (Some(vm_id), None) => Some(PreconnectionBlobPayload::VmConnect(vm_id)),
+            (None, Some(pcb)) => Some(PreconnectionBlobPayload::General(pcb)),
+            (None, None) => None,
+        };
+
         Ok(Self {
             log_file: args.log_file,
             destination,
             connector,
             clipboard_type,
             rdcleanpath,
+            pcb,
         })
     }
 }