Fixed remote desktop recording feature.
Ylian Saint-Hilaire committed
Jun 18, 2020 at 12:47 UTC
c4217361a722cc28df6734189a02976e0fd173cd
2 files changed
+21
-2
public/scripts/agent-desktop-0.0.2.js
+10
-1
@@ -198,6 +198,15 @@ var CreateAgentRemoteDesktop = function (canvasid, scrolldiv) {
198
if ((cmd == 3) || (cmd == 4) || (cmd == 7)) { X = (view[4] << 8) + view[5]; Y = (view[6] << 8) + view[7]; }
199
//console.log('CMD', cmd, cmdsize, X, Y);
200
201
+ // Record the command if needed
202
+ if (obj.recordedData != null) {
203
+ if (cmdsize > 65000) {
204
+ obj.recordedData.push(recordingEntry(2, 1, obj.shortToStr(27) + obj.shortToStr(8) + obj.intToStr(cmdsize) + obj.shortToStr(cmd) + obj.shortToStr(0) + obj.shortToStr(0) + obj.shortToStr(0) + String.fromCharCode.apply(null, view)));
205
+ } else {
206
+ obj.recordedData.push(recordingEntry(2, 1, String.fromCharCode.apply(null, view)));
207
+ }
208
+ }
209
+
210
switch (cmd) {
211
case 3: // Tile
212
if (obj.FirstDraw) obj.onResize();
@@ -756,7 +765,7 @@ var CreateAgentRemoteDesktop = function (canvasid, scrolldiv) {
765
obj.recordedData.push(recordingEntry(1, 0, JSON.stringify({ magic: 'MeshCentralRelaySession', ver: 1, time: new Date().toLocaleString(), protocol: 2 }))); // Metadata (nodeid: obj.nodeid)
766
obj.recordedData.push(recordingEntry(2, 1, obj.shortToStr(7) + obj.shortToStr(8) + obj.shortToStr(obj.ScreenWidth) + obj.shortToStr(obj.ScreenHeight))); // Screen width and height
767
// Save a screenshot
759
- var cmdlen = (4 + binary.length);
768
+ var cmdlen = (8 + binary.length);
769
if (cmdlen > 65000) {
770
// Jumbo Packet
771
obj.recordedData.push(recordingEntry(2, 1, obj.shortToStr(27) + obj.shortToStr(8) + obj.intToStr(cmdlen) + obj.shortToStr(3) + obj.shortToStr(0) + obj.shortToStr(0) + obj.shortToStr(0) + binary));
views/player.handlebars
+11
-1
@@ -310,7 +310,17 @@
310
agentTerminal.ProcessData(data);
311
} else if (recFileProtocol == 2) {
312
// MeshCentral Remote Desktop
313
- agentDesktop.ProcessData(data);
313
+ var view = new Uint8Array(data.length);
314
+ for (var i = 0; i < data.length; i++) { view[i] = data.charCodeAt(i); }
315
+
316
+ // Accumulator is not active
317
+ var cmd = (view[0] << 8) + view[1], cmdsize = (view[2] << 8) + view[3];
318
+ if ((cmd == 27) && (cmdsize == 8)) { cmd = (view[8] << 8) + view[9]; cmdsize = (view[5] << 16) + (view[6] << 8) + view[7]; view = view.slice(8); }
319
+ if (cmdsize != view.byteLength) {
320
+ console.log('Bad command size', cmd, cmdsize, view.byteLength);
321
+ } else {
322
+ agentDesktop.ProcessBinaryCommand(cmd, cmdsize, view.slice(0, cmdsize));
323
+ }
324
} else if (recFileProtocol == 101) {
325
// Intel AMT KVM
326
if ((readState == 0) && (rstr2hex(data) == '4100000000000000')) {