GetReaderIcon (#33779)

gravitational · Oct 20, 2023 · 58bcb32 · 58bcb32
1 parent 7f99abc
commit 58bcb32
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/lib/srv/desktop/rdp/rdpclient/Cargo.toml b/lib/srv/desktop/rdp/rdpclient/Cargo.toml
@@ -35,7 +35,7 @@ x509-parser = "0.14"
 sspi = { version = "0.10.1", features = ["network_client", "dns_resolver"] }
 static_init = "1.0.3"
 
-# # TODO: update once https://github.com/Devolutions/IronRDP/pull/230 lands
+# TODO: change when https://github.com/Devolutions/IronRDP/pull/230 lands
 ironrdp-connector = { git = "https://github.com/Devolutions/IronRDP", rev = "dfca83db55140e839a9b41049b4a2170f93af287" }
 ironrdp-tls = { git = "https://github.com/Devolutions/IronRDP", rev = "dfca83db55140e839a9b41049b4a2170f93af287" }
 ironrdp-session = { git = "https://github.com/Devolutions/IronRDP", rev = "dfca83db55140e839a9b41049b4a2170f93af287" }

diff --git a/lib/srv/desktop/rdp/rdpclient/src/client.rs b/lib/srv/desktop/rdp/rdpclient/src/client.rs
@@ -7,6 +7,7 @@ use ironrdp_pdu::input::mouse::PointerFlags;
 use ironrdp_pdu::input::{InputEventError, MousePdu};
 use ironrdp_pdu::nego::SecurityProtocol;
 use ironrdp_pdu::rdp::capability_sets::MajorPlatformType;
+use ironrdp_pdu::rdp::client_info::ClientInfoFlags;
 use ironrdp_pdu::rdp::RdpError;
 use ironrdp_pdu::{PduError, PduParsing};
 use ironrdp_rdpdr::pdu::RdpdrPdu;

diff --git a/lib/srv/desktop/rdp/rdpclient/src/rdpdr.rs b/lib/srv/desktop/rdp/rdpclient/src/rdpdr.rs
@@ -39,10 +39,10 @@ use ironrdp_pdu::utils::CharacterSet;
 use ironrdp_pdu::{custom_err, other_err, PduResult};
 use ironrdp_rdpdr::pdu::esc::{
     rpce, CardProtocol, CardState, CardStateFlags, ConnectCall, ConnectReturn, ContextCall,
-    EstablishContextReturn, GetDeviceTypeIdCall, GetDeviceTypeIdReturn, GetStatusChangeCall,
-    GetStatusChangeReturn, HCardAndDispositionCall, ListReadersReturn, ReadCacheCall,
-    ReadCacheReturn, ReaderStateCommonCall, ScardCall, StatusReturn, TransmitCall, TransmitReturn,
-    WriteCacheCall,
+    EstablishContextReturn, GetDeviceTypeIdCall, GetDeviceTypeIdReturn, GetReaderIconReturn,
+    GetStatusChangeCall, GetStatusChangeReturn, HCardAndDispositionCall, ListReadersReturn,
+    ReadCacheCall, ReadCacheReturn, ReaderStateCommonCall, ScardCall, StatusReturn, TransmitCall,
+    TransmitReturn, WriteCacheCall,
 };
 use ironrdp_rdpdr::pdu::RdpdrPdu;
 use ironrdp_rdpdr::{
@@ -186,6 +186,10 @@ impl RdpdrBackend for TeleportRdpdrBackend {
                 ScardCall::WriteCacheCall(call) => self.handle_write_cache(req, call),
                 _ => Self::unsupported_combo_error(req.io_control_code, call),
             },
+            ScardIoCtlCode::GetReaderIcon => match call {
+                ScardCall::GetReaderIconCall(_) => self.handle_get_reader_icon(req),
+                _ => Self::unsupported_combo_error(req.io_control_code, call),
+            },
             _ => Err(custom_err!(
                 "TeleportRdpdrBackend::handle_scard_call",
                 TeleportRdpdrBackendError(format!(
@@ -518,6 +522,19 @@ impl TeleportRdpdrBackend {
         self.write_rdpdr_response(req, Box::new(LongReturn::new(ReturnCode::Success)))
     }
 
+    fn handle_get_reader_icon(
+        &mut self,
+        req: DeviceControlRequest<ScardIoCtlCode>,
+    ) -> PduResult<()> {
+        self.write_rdpdr_response(
+            req,
+            Box::new(GetReaderIconReturn::new(
+                ReturnCode::UnsupportedFeature,
+                vec![],
+            )),
+        )
+    }
+
     fn create_get_status_change_return(
         call: GetStatusChangeCall,
     ) -> rpce::Pdu<GetStatusChangeReturn> {

diff --git a/web/packages/teleport/src/ironrdp/Cargo.toml b/web/packages/teleport/src/ironrdp/Cargo.toml
@@ -24,7 +24,7 @@ tracing-web = "0.1.2"
 time = { version = "0.3", features = ["wasm-bindgen"] }
 console_error_panic_hook = "0.1.7"
 
-# TODO: update once https://github.com/Devolutions/IronRDP/pull/230 lands
+# TODO: change when https://github.com/Devolutions/IronRDP/pull/230 lands
 ironrdp-session = { git = "https://github.com/Devolutions/IronRDP", rev = "dfca83db55140e839a9b41049b4a2170f93af287" }
 ironrdp-pdu = { git = "https://github.com/Devolutions/IronRDP", rev = "dfca83db55140e839a9b41049b4a2170f93af287" }
 ironrdp-graphics = { git = "https://github.com/Devolutions/IronRDP", rev = "dfca83db55140e839a9b41049b4a2170f93af287" }