fix(connector): surface actual PDU type when an unexpected Share Control PDU arrives (#1236)

Author: GlassOnTin

crates/ironrdp-connector/src/connection_activation.rs

@@ -5,7 +5,8 @@ use ironrdp_pdu::rdp::capability_sets::CapabilitySet;
 use tracing::{debug, warn};
 
 use crate::{
-    Config, ConnectionFinalizationSequence, ConnectorResult, DesktopSize, Sequence, State, Written, general_err, legacy,
+    Config, ConnectionFinalizationSequence, ConnectorResult, DesktopSize, Sequence, State, Written, general_err,
+    legacy, reason_err,
 };
 
 /// Represents the Capability Exchange and Connection Finalization phases
@@ -122,8 +123,10 @@ impl Sequence for ConnectionActivationSequence {
                 {
                     server_demand_active.pdu.capability_sets
                 } else {
-                    return Err(general_err!(
-                        "unexpected Share Control Pdu (expected ServerDemandActive)",
+                    return Err(reason_err!(
+                        "ConnectionActivation::CapabilitiesExchange",
+                        "unexpected Share Control PDU during capabilities exchange: got {} (expected Server Demand Active PDU)",
+                        share_control_ctx.pdu.as_short_name(),
                     ));
                 };
 

crates/ironrdp-connector/src/legacy.rs

@@ -6,7 +6,7 @@ use ironrdp_pdu::rdp::headers::{BASIC_SECURITY_HEADER_SIZE, BasicSecurityHeaderF
 use ironrdp_pdu::rdp::multitransport::MultitransportRequestPdu;
 use ironrdp_pdu::x224::X224;
 
-use crate::{ConnectorError, ConnectorErrorExt as _, ConnectorResult, general_err, reason_err};
+use crate::{ConnectorError, ConnectorErrorExt as _, ConnectorResult, reason_err};
 
 pub fn encode_send_data_request<T>(
     initiator_id: u16,
@@ -149,8 +149,10 @@ pub fn decode_share_data(ctx: SendDataIndicationCtx<'_>) -> ConnectorResult<Shar
     let ctx = decode_share_control(ctx)?;
 
     let rdp::headers::ShareControlPdu::Data(share_data_header) = ctx.pdu else {
-        return Err(general_err!(
-            "received unexpected Share Control Pdu (expected Share Data Header)"
+        return Err(reason_err!(
+            "decode_share_data",
+            "received unexpected Share Control PDU: got {} (expected Data PDU)",
+            ctx.pdu.as_short_name(),
         ));
     };
 
@@ -210,8 +212,10 @@ pub fn decode_io_channel(ctx: SendDataIndicationCtx<'_>) -> ConnectorResult<IoCh
 
             Ok(IoChannelPdu::Data(share_data_ctx))
         }
-        _ => Err(general_err!(
-            "received unexpected Share Control Pdu (expected Share Data Header or Server Deactivate All)"
+        other => Err(reason_err!(
+            "decode_io_channel",
+            "received unexpected Share Control PDU: got {} (expected Data PDU or Server Deactivate All PDU)",
+            other.as_short_name(),
         )),
     }
 }