Add an additional check for commands that have no input/parameters.

bitbound · bitbound · commit dbf5d16b3181 · 2024-07-07T11:16:27.000-07:00
diff --git a/ControlR.Agent/Services/AgentHubConnection.cs b/ControlR.Agent/Services/AgentHubConnection.cs
@@ -121,6 +121,9 @@ public Task<Result<AgentAppSettings>> GetAgentAppSettings(SignedPayloadDto signe
                 return Result.Fail<AgentAppSettings>("Signature verification failed.").AsTaskResult();
             }
 
+            var payload = signedDto.GetPayload<GetAgentAppSettingsDto>();
+            payload.VerifyType(DtoType.GetAgentAppSettings);
+
             var agentOptions = _appOptions.CurrentValue;
             var settings = new AgentAppSettings()
             {
@@ -142,6 +145,9 @@ public Task<WindowsSession[]> GetWindowsSessions(SignedPayloadDto signedDto)
             return Array.Empty<WindowsSession>().AsTaskResult();
         }
 
+        var payload = signedDto.GetPayload<GetWindowsSessionsDto>();
+        payload.VerifyType(DtoType.GetWindowsSessions);
+
         if (_environmentHelper.Platform != SystemPlatform.Windows)
         {
             return Array.Empty<WindowsSession>().AsTaskResult();
diff --git a/ControlR.Agent/Services/DtoHandler.cs b/ControlR.Agent/Services/DtoHandler.cs
@@ -89,14 +89,20 @@ private async Task HandleSignedDtoReceivedMessage(object subscriber, SignedDtoRe
 
                 case DtoType.InvokeCtrlAltDel:
                     {
+                        var payload = wrapper.GetPayload<InvokeCtrlAltDelRequestDto>();
+                        payload.VerifyType(DtoType.InvokeCtrlAltDel);
+
                         if (OperatingSystem.IsWindowsVersionAtLeast(6, 1))
                         {
                             _win32Interop.InvokeCtrlAltDel();
                         }
                         break;
                     }
-                case DtoType.AgentUpdateTrigger:
+                case DtoType.TriggerAgentUpdate:
                     {
+                        var payload = wrapper.GetPayload<TriggerAgentUpdateDto>();
+                        payload.VerifyType(DtoType.TriggerAgentUpdate);
+
                         await _agentUpdater.CheckForUpdate();
                         break;
                     }
diff --git a/ControlR.Server/Hubs/ViewerHub.cs b/ControlR.Server/Hubs/ViewerHub.cs
@@ -28,7 +28,7 @@ public Task<bool> CheckIfServerAdministrator()
         return IsServerAdmin().AsTaskResult();
     }
 
-    public async Task<Result> ClearAlert(SignedPayloadDto signedDto)
+    public async Task<Result> ClearAlert()
     {
         using var scope = _logger.BeginMemberScope();
 
diff --git a/ControlR.Streamer/Services/DtoHandler.cs b/ControlR.Streamer/Services/DtoHandler.cs
@@ -54,6 +54,8 @@ private async Task HandleSignedDtoReceivedMessage(object subscriber, SignedDtoRe
             {
                 case DtoType.CloseStreamingSession:
                     {
+                        var payload = wrapper.GetPayload<CloseStreamingSessionRequestDto>();
+                        payload.VerifyType(DtoType.CloseStreamingSession);
                         _logger.LogInformation("Received request to close streaming session.");
                         _appLifetime.StopApplication();
                         break;
@@ -79,6 +81,8 @@ private async Task HandleSignedDtoReceivedMessage(object subscriber, SignedDtoRe
                     }
                 case DtoType.ResetKeyboardState:
                     {
+                        var payload = wrapper.GetPayload<ResetKeyboardStateDto>();
+                        payload.VerifyType(DtoType.ResetKeyboardState);
                         _inputSimulator.ResetKeyboardState();
                         break;
                     }
diff --git a/ControlR.Viewer/Components/RemoteDisplays/RemoteDisplay.razor.cs b/ControlR.Viewer/Components/RemoteDisplays/RemoteDisplay.razor.cs
@@ -1,6 +1,5 @@
 ﻿using ControlR.Libraries.Shared.Dtos.StreamerDtos;
 using ControlR.Libraries.Shared.Services.Buffers;
-using ControlR.Viewer.Enums;
 using ControlR.Viewer.Services;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
@@ -505,7 +504,7 @@ private async Task RequestStreamingSessionFromAgent()
 
             var websocketUri = bridgeOrigin is not null ?
                 new Uri(bridgeOrigin, $"/bridge/{Session.SessionId}") :
-                new Uri($"{Settings.ServerUri}/bridge/{Session.SessionId}").ToWebsocketUri();
+                new Uri(Settings.ServerUri, $"/bridge/{Session.SessionId}").ToWebsocketUri();
 
             Logger.LogInformation("Resolved WS bridge origin: {BridgeOrigin}", websocketUri.Authority);
 
diff --git a/ControlR.Viewer/Services/ViewerHubConnection.cs b/ControlR.Viewer/Services/ViewerHubConnection.cs
@@ -76,8 +76,7 @@ await TryInvoke(
             async () =>
             {
                 await WaitForConnection();
-                var signedDto = _keyProvider.CreateRandomSignedDto(DtoType.ClearAlerts, _appState.PrivateKey);
-                await Connection.InvokeAsync<Result>(nameof(IViewerHub.ClearAlert), signedDto);
+                await Connection.InvokeAsync<Result>(nameof(IViewerHub.ClearAlert));
             });
     }
 
@@ -86,7 +85,10 @@ public async Task CloseStreamingSession(string streamerConnectionId)
         await TryInvoke(
             async () =>
             {
-                var signedDto = _keyProvider.CreateRandomSignedDto(DtoType.CloseStreamingSession, _appState.PrivateKey);
+                await WaitForConnection();
+                var dto = new CloseStreamingSessionRequestDto();
+                var signedDto = _keyProvider.CreateSignedDto(dto, DtoType.CloseStreamingSession, _appState.PrivateKey);
+
                 await Connection.InvokeAsync(nameof(IViewerHub.SendSignedDtoToStreamer), streamerConnectionId, signedDto);
             });
     }
@@ -120,8 +122,8 @@ public async Task<Result<AgentAppSettings>> GetAgentAppSettings(string agentConn
         return await TryInvoke(
             async () =>
             {
-                var request = _keyProvider.CreateRandomSignedDto(DtoType.GetAgentAppSettings, _appState.PrivateKey);
-                var signedDto = _keyProvider.CreateSignedDto(request, DtoType.TerminalSessionRequest, _appState.PrivateKey);
+                var dto = new GetAgentAppSettingsDto();
+                var signedDto = _keyProvider.CreateSignedDto(dto, DtoType.GetAgentAppSettings, _appState.PrivateKey);
                 return await Connection.InvokeAsync<Result<AgentAppSettings>>(nameof(IViewerHub.GetAgentAppSettings), agentConnectionId, signedDto);
             },
             () => Result.Fail<AgentAppSettings>("Failed to get agent settings"));
@@ -177,7 +179,8 @@ public async Task<Result<WindowsSession[]>> GetWindowsSessions(DeviceDto device)
     {
         try
         {
-            var signedDto = _keyProvider.CreateRandomSignedDto(DtoType.WindowsSessions, _appState.PrivateKey);
+            var dto = new GetWindowsSessionsDto();
+            var signedDto = _keyProvider.CreateSignedDto(dto, DtoType.GetWindowsSessions, _appState.PrivateKey);
             var sessions = await Connection.InvokeAsync<WindowsSession[]>(nameof(IViewerHub.GetWindowsSessions), device.ConnectionId, signedDto);
             return Result.Ok(sessions);
         }
@@ -192,7 +195,8 @@ public async Task InvokeCtrlAltDel(string deviceId)
     {
         await TryInvoke(async () =>
         {
-            var signedDto = _keyProvider.CreateRandomSignedDto(DtoType.InvokeCtrlAltDel, _appState.PrivateKey);
+            var dto = new InvokeCtrlAltDelRequestDto();
+            var signedDto = _keyProvider.CreateSignedDto(dto, DtoType.InvokeCtrlAltDel, _appState.PrivateKey);
             await Connection.InvokeAsync(nameof(IViewerHub.SendSignedDtoToAgent), deviceId, signedDto);
         });
     }
@@ -328,7 +332,8 @@ public async Task SendAgentUpdateTrigger(DeviceDto device)
     {
         await TryInvoke(async () =>
         {
-            var signedDto = _keyProvider.CreateRandomSignedDto(DtoType.AgentUpdateTrigger, _appState.PrivateKey);
+            var dto = new TriggerAgentUpdateDto();
+            var signedDto = _keyProvider.CreateSignedDto(dto, DtoType.TriggerAgentUpdate, _appState.PrivateKey);
             await Connection.InvokeAsync(nameof(IViewerHub.SendSignedDtoToAgent), device.Id, signedDto);
         });
     }
@@ -375,7 +380,8 @@ await TryInvoke(
               async () =>
               {
                   await WaitForConnection();
-                  var signedDto = _keyProvider.CreateRandomSignedDto(DtoType.ResetKeyboardState, _appState.PrivateKey);
+                  var dto = new ResetKeyboardStateDto();
+                  var signedDto = _keyProvider.CreateSignedDto(dto, DtoType.ResetKeyboardState, _appState.PrivateKey);
                   await Connection.InvokeAsync(nameof(IViewerHub.SendSignedDtoToStreamer), streamerConnectionId, signedDto);
               });
     }
diff --git a/Libraries/ControlR.Libraries.Shared/Dtos/CloseStreamingSessionRequestDto.cs b/Libraries/ControlR.Libraries.Shared/Dtos/CloseStreamingSessionRequestDto.cs
@@ -0,0 +1,4 @@
+﻿namespace ControlR.Libraries.Shared.Dtos;
+
+[MessagePackObject]
+public record CloseStreamingSessionRequestDto() : ParameterlessDtoBase(DtoType.CloseStreamingSession);
diff --git a/Libraries/ControlR.Libraries.Shared/Dtos/CloseTerminalRequestDto.cs b/Libraries/ControlR.Libraries.Shared/Dtos/CloseTerminalRequestDto.cs
@@ -1,4 +1,4 @@
 ﻿namespace ControlR.Libraries.Shared.Dtos;
 
 [MessagePackObject]
-public record CloseTerminalRequestDto([property: MsgPackKey] Guid TerminalId);
+public record CloseTerminalRequestDto([property: MsgPackKey] Guid TerminalId) : ParameterlessDtoBase(DtoType.CloseTerminalRequest);
diff --git a/Libraries/ControlR.Libraries.Shared/Dtos/DtoType.cs b/Libraries/ControlR.Libraries.Shared/Dtos/DtoType.cs
@@ -5,7 +5,7 @@ public enum DtoType
     None = 0,
     IdentityAttestation = 1,
     StreamingSessionRequest = 2,
-    WindowsSessions = 3,
+    GetWindowsSessions = 3,
     DeviceUpdateRequest = 4,
     TerminalSessionRequest = 5,
     CloseTerminalRequest = 7,
@@ -22,7 +22,7 @@ public enum DtoType
     CloseStreamingSession = 19,
     InvokeCtrlAltDel = 20,
     ClipboardChanged = 21,
-    AgentUpdateTrigger = 22,
+    TriggerAgentUpdate = 22,
     StreamerInitData = 23,
     DesktopChanged = 24,
     DesktopRequest = 25,
diff --git a/Libraries/ControlR.Libraries.Shared/Dtos/GetAgentAppSettingsDto.cs b/Libraries/ControlR.Libraries.Shared/Dtos/GetAgentAppSettingsDto.cs
@@ -0,0 +1,4 @@
+﻿namespace ControlR.Libraries.Shared.Dtos;
+
+[MessagePackObject]
+public record GetAgentAppSettingsDto() : ParameterlessDtoBase(DtoType.GetAgentAppSettings);
diff --git a/Libraries/ControlR.Libraries.Shared/Dtos/GetWindowsSessionsDto.cs b/Libraries/ControlR.Libraries.Shared/Dtos/GetWindowsSessionsDto.cs
@@ -0,0 +1,4 @@
+﻿namespace ControlR.Libraries.Shared.Dtos;
+
+[MessagePackObject]
+public record GetWindowsSessionsDto() : ParameterlessDtoBase(DtoType.GetWindowsSessions);
diff --git a/Libraries/ControlR.Libraries.Shared/Dtos/InvokeCtrlAltDelRequestDto.cs b/Libraries/ControlR.Libraries.Shared/Dtos/InvokeCtrlAltDelRequestDto.cs
@@ -0,0 +1,4 @@
+﻿namespace ControlR.Libraries.Shared.Dtos;
+
+[MessagePackObject]
+public record InvokeCtrlAltDelRequestDto() : ParameterlessDtoBase(DtoType.InvokeCtrlAltDel);
diff --git a/Libraries/ControlR.Libraries.Shared/Dtos/ParameterlessDtoBase.cs b/Libraries/ControlR.Libraries.Shared/Dtos/ParameterlessDtoBase.cs
@@ -0,0 +1,15 @@
+﻿using ControlR.Libraries.Shared.Exceptions;
+
+namespace ControlR.Libraries.Shared.Dtos;
+
+[MessagePackObject]
+public record ParameterlessDtoBase([property: MsgPackKey] DtoType DtoType)
+{
+    public void VerifyType(DtoType expectedType)
+    {
+        if (DtoType != expectedType)
+        {
+            throw new DtoTypeMismatchException(expectedType, DtoType);
+        }
+    }
+};
diff --git a/Libraries/ControlR.Libraries.Shared/Dtos/ResetKeyboardStateDto.cs b/Libraries/ControlR.Libraries.Shared/Dtos/ResetKeyboardStateDto.cs
@@ -0,0 +1,4 @@
+﻿namespace ControlR.Libraries.Shared.Dtos;
+
+[MessagePackObject]
+public record ResetKeyboardStateDto() : ParameterlessDtoBase(DtoType.ResetKeyboardState);
diff --git a/Libraries/ControlR.Libraries.Shared/Dtos/TriggerAgentUpdateDto.cs b/Libraries/ControlR.Libraries.Shared/Dtos/TriggerAgentUpdateDto.cs
@@ -0,0 +1,4 @@
+﻿namespace ControlR.Libraries.Shared.Dtos;
+
+[MessagePackObject]
+public record TriggerAgentUpdateDto() : ParameterlessDtoBase(DtoType.TriggerAgentUpdate);
diff --git a/Libraries/ControlR.Libraries.Shared/Exceptions/DtoTypeMismatchException.cs b/Libraries/ControlR.Libraries.Shared/Exceptions/DtoTypeMismatchException.cs
@@ -0,0 +1,15 @@
+﻿using ControlR.Libraries.Shared.Dtos;
+
+namespace ControlR.Libraries.Shared.Exceptions;
+public class DtoTypeMismatchException : Exception
+{
+    public DtoTypeMismatchException(DtoType expectedType, DtoType actualType)
+        : base($"DtoType mismatch.  Expected: {expectedType}.  Actual: {actualType}.")
+    {
+        ExpectedType = expectedType;
+        ActualType = actualType;
+    }
+
+    public DtoType ExpectedType { get; }
+    public DtoType ActualType { get; }
+}
diff --git a/Libraries/ControlR.Libraries.Shared/Hubs/IViewerHub.cs b/Libraries/ControlR.Libraries.Shared/Hubs/IViewerHub.cs
@@ -7,7 +7,7 @@ public interface IViewerHub
 {
     Task<bool> CheckIfServerAdministrator();
 
-    Task<Result> ClearAlert(SignedPayloadDto signedDto);
+    Task<Result> ClearAlert();
 
     Task<Result<TerminalSessionRequestResult>> CreateTerminalSession(string agentConnectionId, SignedPayloadDto requestDto);
 
diff --git a/Libraries/ControlR.Libraries.Shared/Services/KeyProvider.cs b/Libraries/ControlR.Libraries.Shared/Services/KeyProvider.cs
@@ -7,7 +7,6 @@ namespace ControlR.Libraries.Shared.Services;
 
 public interface IKeyProvider
 {
-    SignedPayloadDto CreateRandomSignedDto(DtoType dtoType, byte[] privateKey);
     SignedPayloadDto CreateSignedDto<T>(T payload, DtoType dtoType, byte[] privateKey);
     byte[] EncryptPrivateKey(string password, byte[] privateKey);
     UserKeyPair GenerateKeys();
@@ -24,14 +23,6 @@ public class KeyProvider(ISystemTime systemTime, ILogger<KeyProvider> logger) :
     private readonly RSASignaturePadding _signaturePadding = RSASignaturePadding.Pkcs1;
     private readonly ISystemTime _systemTime = systemTime;
 
-    public SignedPayloadDto CreateRandomSignedDto(DtoType dtoType, byte[] privateKey)
-    {
-        using var rsa = RSA.Create();
-        rsa.ImportRSAPrivateKey(privateKey, out _);
-        var payload = RandomNumberGenerator.GetBytes(256);
-        return CreateSignedDtoImpl(rsa, payload, dtoType);
-    }
-
     public SignedPayloadDto CreateSignedDto<T>(T payload, DtoType dtoType, byte[] privateKey)
     {
         using var rsa = RSA.Create();

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,9 @@ public Task<Result<AgentAppSettings>> GetAgentAppSettings(SignedPayloadDto signe`
`121`	`121`	`return Result.Fail<AgentAppSettings>("Signature verification failed.").AsTaskResult();`
`122`	`122`	`}`
`123`	`123`
	`124`	`+ var payload = signedDto.GetPayload<GetAgentAppSettingsDto>();`
	`125`	`+ payload.VerifyType(DtoType.GetAgentAppSettings);`
	`126`	`+`
`124`	`127`	`var agentOptions = _appOptions.CurrentValue;`
`125`	`128`	`var settings = new AgentAppSettings()`
`126`	`129`	`{`
`@@ -142,6 +145,9 @@ public Task<WindowsSession[]> GetWindowsSessions(SignedPayloadDto signedDto)`
`142`	`145`	`return Array.Empty<WindowsSession>().AsTaskResult();`
`143`	`146`	`}`
`144`	`147`
	`148`	`+ var payload = signedDto.GetPayload<GetWindowsSessionsDto>();`
	`149`	`+ payload.VerifyType(DtoType.GetWindowsSessions);`
	`150`	`+`
`145`	`151`	`if (_environmentHelper.Platform != SystemPlatform.Windows)`
`146`	`152`	`{`
`147`	`153`	`return Array.Empty<WindowsSession>().AsTaskResult();`
Original file line number	Diff line number	Diff line change
`@@ -89,14 +89,20 @@ private async Task HandleSignedDtoReceivedMessage(object subscriber, SignedDtoRe`
`89`	`89`
`90`	`90`	`case DtoType.InvokeCtrlAltDel:`
`91`	`91`	`{`
	`92`	`+ var payload = wrapper.GetPayload<InvokeCtrlAltDelRequestDto>();`
	`93`	`+ payload.VerifyType(DtoType.InvokeCtrlAltDel);`
	`94`	`+`
`92`	`95`	`if (OperatingSystem.IsWindowsVersionAtLeast(6, 1))`
`93`	`96`	`{`
`94`	`97`	`_win32Interop.InvokeCtrlAltDel();`
`95`	`98`	`}`
`96`	`99`	`break;`
`97`	`100`	`}`
`98`		`- case DtoType.AgentUpdateTrigger:`
	`101`	`+ case DtoType.TriggerAgentUpdate:`
`99`	`102`	`{`
	`103`	`+ var payload = wrapper.GetPayload<TriggerAgentUpdateDto>();`
	`104`	`+ payload.VerifyType(DtoType.TriggerAgentUpdate);`
	`105`	`+`
`100`	`106`	`await _agentUpdater.CheckForUpdate();`
`101`	`107`	`break;`
`102`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public Task<bool> CheckIfServerAdministrator()`
`28`	`28`	`return IsServerAdmin().AsTaskResult();`
`29`	`29`	`}`
`30`	`30`
`31`		`- public async Task<Result> ClearAlert(SignedPayloadDto signedDto)`
	`31`	`+ public async Task<Result> ClearAlert()`
`32`	`32`	`{`
`33`	`33`	`using var scope = _logger.BeginMemberScope();`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,8 @@ private async Task HandleSignedDtoReceivedMessage(object subscriber, SignedDtoRe`
`54`	`54`	`{`
`55`	`55`	`case DtoType.CloseStreamingSession:`
`56`	`56`	`{`
	`57`	`+ var payload = wrapper.GetPayload<CloseStreamingSessionRequestDto>();`
	`58`	`+ payload.VerifyType(DtoType.CloseStreamingSession);`
`57`	`59`	`_logger.LogInformation("Received request to close streaming session.");`
`58`	`60`	`_appLifetime.StopApplication();`
`59`	`61`	`break;`
`@@ -79,6 +81,8 @@ private async Task HandleSignedDtoReceivedMessage(object subscriber, SignedDtoRe`
`79`	`81`	`}`
`80`	`82`	`case DtoType.ResetKeyboardState:`
`81`	`83`	`{`
	`84`	`+ var payload = wrapper.GetPayload<ResetKeyboardStateDto>();`
	`85`	`+ payload.VerifyType(DtoType.ResetKeyboardState);`
`82`	`86`	`_inputSimulator.ResetKeyboardState();`
`83`	`87`	`break;`
`84`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,7 @@ await TryInvoke(`
`76`	`76`	`async () =>`
`77`	`77`	`{`
`78`	`78`	`await WaitForConnection();`
`79`		`- var signedDto = _keyProvider.CreateRandomSignedDto(DtoType.ClearAlerts, _appState.PrivateKey);`
`80`		`- await Connection.InvokeAsync<Result>(nameof(IViewerHub.ClearAlert), signedDto);`
	`79`	`+ await Connection.InvokeAsync<Result>(nameof(IViewerHub.ClearAlert));`
`81`	`80`	`});`
`82`	`81`	`}`
`83`	`82`
`@@ -86,7 +85,10 @@ public async Task CloseStreamingSession(string streamerConnectionId)`
`86`	`85`	`await TryInvoke(`
`87`	`86`	`async () =>`
`88`	`87`	`{`
`89`		`- var signedDto = _keyProvider.CreateRandomSignedDto(DtoType.CloseStreamingSession, _appState.PrivateKey);`
	`88`	`+ await WaitForConnection();`
	`89`	`+ var dto = new CloseStreamingSessionRequestDto();`
	`90`	`+ var signedDto = _keyProvider.CreateSignedDto(dto, DtoType.CloseStreamingSession, _appState.PrivateKey);`
	`91`	`+`
`90`	`92`	`await Connection.InvokeAsync(nameof(IViewerHub.SendSignedDtoToStreamer), streamerConnectionId, signedDto);`
`91`	`93`	`});`
`92`	`94`	`}`
`@@ -120,8 +122,8 @@ public async Task<Result<AgentAppSettings>> GetAgentAppSettings(string agentConn`
`120`	`122`	`return await TryInvoke(`
`121`	`123`	`async () =>`
`122`	`124`	`{`
`123`		`- var request = _keyProvider.CreateRandomSignedDto(DtoType.GetAgentAppSettings, _appState.PrivateKey);`
`124`		`- var signedDto = _keyProvider.CreateSignedDto(request, DtoType.TerminalSessionRequest, _appState.PrivateKey);`
	`125`	`+ var dto = new GetAgentAppSettingsDto();`
	`126`	`+ var signedDto = _keyProvider.CreateSignedDto(dto, DtoType.GetAgentAppSettings, _appState.PrivateKey);`
`125`	`127`	`return await Connection.InvokeAsync<Result<AgentAppSettings>>(nameof(IViewerHub.GetAgentAppSettings), agentConnectionId, signedDto);`
`126`	`128`	`},`
`127`	`129`	`() => Result.Fail<AgentAppSettings>("Failed to get agent settings"));`
`@@ -177,7 +179,8 @@ public async Task<Result<WindowsSession[]>> GetWindowsSessions(DeviceDto device)`
`177`	`179`	`{`
`178`	`180`	`try`
`179`	`181`	`{`
`180`		`- var signedDto = _keyProvider.CreateRandomSignedDto(DtoType.WindowsSessions, _appState.PrivateKey);`
	`182`	`+ var dto = new GetWindowsSessionsDto();`
	`183`	`+ var signedDto = _keyProvider.CreateSignedDto(dto, DtoType.GetWindowsSessions, _appState.PrivateKey);`
`181`	`184`	`var sessions = await Connection.InvokeAsync<WindowsSession[]>(nameof(IViewerHub.GetWindowsSessions), device.ConnectionId, signedDto);`
`182`	`185`	`return Result.Ok(sessions);`
`183`	`186`	`}`
`@@ -192,7 +195,8 @@ public async Task InvokeCtrlAltDel(string deviceId)`
`192`	`195`	`{`
`193`	`196`	`await TryInvoke(async () =>`
`194`	`197`	`{`
`195`		`- var signedDto = _keyProvider.CreateRandomSignedDto(DtoType.InvokeCtrlAltDel, _appState.PrivateKey);`
	`198`	`+ var dto = new InvokeCtrlAltDelRequestDto();`
	`199`	`+ var signedDto = _keyProvider.CreateSignedDto(dto, DtoType.InvokeCtrlAltDel, _appState.PrivateKey);`
`196`	`200`	`await Connection.InvokeAsync(nameof(IViewerHub.SendSignedDtoToAgent), deviceId, signedDto);`
`197`	`201`	`});`
`198`	`202`	`}`
`@@ -328,7 +332,8 @@ public async Task SendAgentUpdateTrigger(DeviceDto device)`
`328`	`332`	`{`
`329`	`333`	`await TryInvoke(async () =>`
`330`	`334`	`{`
`331`		`- var signedDto = _keyProvider.CreateRandomSignedDto(DtoType.AgentUpdateTrigger, _appState.PrivateKey);`
	`335`	`+ var dto = new TriggerAgentUpdateDto();`
	`336`	`+ var signedDto = _keyProvider.CreateSignedDto(dto, DtoType.TriggerAgentUpdate, _appState.PrivateKey);`
`332`	`337`	`await Connection.InvokeAsync(nameof(IViewerHub.SendSignedDtoToAgent), device.Id, signedDto);`
`333`	`338`	`});`
`334`	`339`	`}`
`@@ -375,7 +380,8 @@ await TryInvoke(`
`375`	`380`	`async () =>`
`376`	`381`	`{`
`377`	`382`	`await WaitForConnection();`
`378`		`- var signedDto = _keyProvider.CreateRandomSignedDto(DtoType.ResetKeyboardState, _appState.PrivateKey);`
	`383`	`+ var dto = new ResetKeyboardStateDto();`
	`384`	`+ var signedDto = _keyProvider.CreateSignedDto(dto, DtoType.ResetKeyboardState, _appState.PrivateKey);`
`379`	`385`	`await Connection.InvokeAsync(nameof(IViewerHub.SendSignedDtoToStreamer), streamerConnectionId, signedDto);`
`380`	`386`	`});`
`381`	`387`	`}`