Add handling for ServerDriveLockControlRequest

lib/srv/desktop/rdp/rdpclient/Cargo.toml

@@ -31,16 +31,16 @@ x509-parser = "0.14"
 sspi = { git = "https://github.com/Devolutions/sspi-rs", rev="d54bdfcafa0e10d9d78224ebacc4f2a0992a6b79", features = ["network_client"] }
 static_init = "1.0.3"
 
-# Change this once https://github.com/Devolutions/IronRDP/pull/312 lands
-ironrdp-connector = { git = "https://github.com/Devolutions/IronRDP", rev = "5b0a29ea45f38236bf6d1ebfd5990a0dbb1cc814" }
-ironrdp-tls = { git = "https://github.com/Devolutions/IronRDP", rev = "5b0a29ea45f38236bf6d1ebfd5990a0dbb1cc814" }
-ironrdp-session = { git = "https://github.com/Devolutions/IronRDP", rev = "5b0a29ea45f38236bf6d1ebfd5990a0dbb1cc814" }
-ironrdp-pdu = { git = "https://github.com/Devolutions/IronRDP", rev = "5b0a29ea45f38236bf6d1ebfd5990a0dbb1cc814" }
-ironrdp-tokio = { git = "https://github.com/Devolutions/IronRDP", rev = "5b0a29ea45f38236bf6d1ebfd5990a0dbb1cc814" }
-ironrdp-rdpsnd = { git = "https://github.com/Devolutions/IronRDP", rev = "5b0a29ea45f38236bf6d1ebfd5990a0dbb1cc814" }
-ironrdp-rdpdr = { git = "https://github.com/Devolutions/IronRDP", rev = "5b0a29ea45f38236bf6d1ebfd5990a0dbb1cc814" }
-ironrdp-svc = { git = "https://github.com/Devolutions/IronRDP", rev = "5b0a29ea45f38236bf6d1ebfd5990a0dbb1cc814" }
-ironrdp-cliprdr = { git = "https://github.com/Devolutions/IronRDP", rev = "5b0a29ea45f38236bf6d1ebfd5990a0dbb1cc814" }
+# Change this once https://github.com/Devolutions/IronRDP/pull/313 lands
+ironrdp-connector = { git = "https://github.com/Devolutions/IronRDP", rev = "67c2d7099adb6da503d1fce7b66031a8c936053b" }
+ironrdp-tls = { git = "https://github.com/Devolutions/IronRDP", rev = "67c2d7099adb6da503d1fce7b66031a8c936053b" }
+ironrdp-session = { git = "https://github.com/Devolutions/IronRDP", rev = "67c2d7099adb6da503d1fce7b66031a8c936053b" }
+ironrdp-pdu = { git = "https://github.com/Devolutions/IronRDP", rev = "67c2d7099adb6da503d1fce7b66031a8c936053b" }
+ironrdp-tokio = { git = "https://github.com/Devolutions/IronRDP", rev = "67c2d7099adb6da503d1fce7b66031a8c936053b" }
+ironrdp-rdpsnd = { git = "https://github.com/Devolutions/IronRDP", rev = "67c2d7099adb6da503d1fce7b66031a8c936053b" }
+ironrdp-rdpdr = { git = "https://github.com/Devolutions/IronRDP", rev = "67c2d7099adb6da503d1fce7b66031a8c936053b" }
+ironrdp-svc = { git = "https://github.com/Devolutions/IronRDP", rev = "67c2d7099adb6da503d1fce7b66031a8c936053b" }
+ironrdp-cliprdr = { git = "https://github.com/Devolutions/IronRDP", rev = "67c2d7099adb6da503d1fce7b66031a8c936053b" }
 
 # Uncomment the following lines to use local crates instead of the ones from github
 # ironrdp-connector = { path = "/Users/ibeckermayer/Devolutions/IronRDP/crates/ironrdp-connector" }

lib/srv/desktop/rdp/rdpclient/src/rdpdr/filesystem.rs

@@ -23,6 +23,7 @@ use crate::{
 };
 use ironrdp_pdu::{cast_length, custom_err, other_err, PduResult};
 use ironrdp_rdpdr::pdu::{
+    self,
     efs::{self, NtStatus},
     esc,
 };
@@ -93,6 +94,9 @@ impl FilesystemBackend {
             efs::ServerDriveIoRequest::ServerDriveSetInformationRequest(req) => {
                 self.handle_set_information_req(req)
             }
+            efs::ServerDriveIoRequest::ServerDriveLockControlRequest(req) => {
+                self.handle_lock_req(req)
+            }
         }
     }
 
@@ -509,6 +513,7 @@ impl FilesystemBackend {
         self.tdp_sd_write(req)
     }
 
+    /// Handles an RDP [`efs::ServerDriveSetInformationRequest`] received from the RDP server.
     fn handle_set_information_req(
         &mut self,
         rdp_req: efs::ServerDriveSetInformationRequest,
@@ -568,6 +573,14 @@ impl FilesystemBackend {
         }
     }
 
+    /// Handles an RDP [`efs::ServerDriveLockControlRequest`] received from the RDP server.
+    fn handle_lock_req(&self, _req: efs::ServerDriveLockControlRequest) -> PduResult<()> {
+        // https://github.com/FreeRDP/FreeRDP/blob/dfa231c0a55b005af775b833f92f6bcd30363d77/channels/drive/client/drive_main.c#L601
+        self.client_handle
+            .write_rdpdr(pdu::RdpdrPdu::EmptyResponse)?;
+        Ok(())
+    }
+
     /// Helper function for writing a [`tdp::SharedDirectoryCreateRequest`] to the browser
     /// and handling the [`tdp::SharedDirectoryCreateResponse`] that is received in response.
     fn tdp_sd_create(

web/packages/teleport/src/ironrdp/Cargo.toml

@@ -24,10 +24,10 @@ tracing-web = "0.1.2"
 time = { version = "0.3", features = ["wasm-bindgen"] }
 console_error_panic_hook = "0.1.7"
 
-# Change this once https://github.com/Devolutions/IronRDP/pull/312 lands
-ironrdp-session = { git = "https://github.com/Devolutions/IronRDP", rev = "5b0a29ea45f38236bf6d1ebfd5990a0dbb1cc814" }
-ironrdp-pdu = { git = "https://github.com/Devolutions/IronRDP", rev = "5b0a29ea45f38236bf6d1ebfd5990a0dbb1cc814" }
-ironrdp-graphics = { git = "https://github.com/Devolutions/IronRDP", rev = "5b0a29ea45f38236bf6d1ebfd5990a0dbb1cc814" }
+# Change this once https://github.com/Devolutions/IronRDP/pull/313 lands
+ironrdp-session = { git = "https://github.com/Devolutions/IronRDP", rev = "67c2d7099adb6da503d1fce7b66031a8c936053b" }
+ironrdp-pdu = { git = "https://github.com/Devolutions/IronRDP", rev = "67c2d7099adb6da503d1fce7b66031a8c936053b" }
+ironrdp-graphics = { git = "https://github.com/Devolutions/IronRDP", rev = "67c2d7099adb6da503d1fce7b66031a8c936053b" }
 
 # Uncomment the following lines and comment out the ones above to use local crates instead of the ones from github
 # ironrdp-session = { path = "/path/to/your/local/IronRDP/crates/ironrdp-session" }