Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions devolutions-session/src/dvc/task.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use std::collections::HashMap;
use std::time::{SystemTime, UNIX_EPOCH};

use anyhow::{Context, bail};
use async_trait::async_trait;
Expand Down Expand Up @@ -26,9 +27,9 @@ use now_proto_pdu::{
ComApartmentStateKind, NowChannelCapsetMsg, NowChannelCloseMsg, NowChannelHeartbeatMsg, NowChannelMessage,
NowExecBatchMsg, NowExecCancelRspMsg, NowExecCapsetFlags, NowExecDataMsg, NowExecDataStreamKind, NowExecMessage,
NowExecProcessMsg, NowExecPwshMsg, NowExecResultMsg, NowExecRunMsg, NowExecStartedMsg, NowExecWinPsMsg, NowMessage,
NowMsgBoxResponse, NowProtoError, NowProtoVersion, NowSessionCapsetFlags, NowSessionMessage,
NowSessionMsgBoxReqMsg, NowSessionMsgBoxRspMsg, NowStatusError, NowSystemCapsetFlags, NowSystemMessage,
SetKbdLayoutOption,
NowMsgBoxResponse, NowProtoError, NowProtoVersion, NowRdmCapabilitiesMsg, NowRdmMessage, NowSessionCapsetFlags,
NowSessionMessage, NowSessionMsgBoxReqMsg, NowSessionMsgBoxRspMsg, NowStatusError, NowSystemCapsetFlags,
NowSystemMessage, SetKbdLayoutOption,
};
use win_api_wrappers::event::Event;
use win_api_wrappers::security::privilege::ScopedPrivileges;
Expand Down Expand Up @@ -331,6 +332,20 @@ impl MessageProcessor {
message: NowMessage<'static>,
) -> anyhow::Result<ProcessMessageAction> {
match message {
NowMessage::Rdm(NowRdmMessage::Capabilities(_)) => {
// Send empty capabilities (as RDM app is not available on the server side).

let server_timestamp = SystemTime::now()
.duration_since(UNIX_EPOCH)
.context("Failed to get current timestamp")?
.as_secs();

let rdm_caps = NowRdmCapabilitiesMsg::new(server_timestamp, String::new())?;

self.dvc_tx
.send(NowMessage::Rdm(NowRdmMessage::Capabilities(rdm_caps)))
.await?;
}
NowMessage::Channel(NowChannelMessage::Capset(client_caps)) => {
return Ok(ProcessMessageAction::Restart(client_caps));
}
Expand Down