Completed RDP settings.
Ylian Saint-Hilaire committed
May 4, 2022 at 13:11 UTC
491a6b918e8dfca6e6cd0dedb517468949483de0
4 files changed
+73
-32
apprelays.js
+3
-2
@@ -114,7 +114,7 @@ module.exports.CreateMstscRelay = function (parent, db, ws, req, args, domain) {
114
obj.relayActive = true; obj.relaySocket.resume();
115
} else {
116
obj.wsClient._socket.pause();
117
- obj.relaySocket.write(data, function () { obj.wsClient._socket.resume(); });
117
+ try { obj.relaySocket.write(data, function () { obj.wsClient._socket.resume(); }); } catch (ex) { obj.close(); }
118
}
119
});
120
obj.wsClient.on('close', function () { parent.parent.debug('relay', 'RDP: Relay websocket closed'); obj.close(); });
@@ -137,8 +137,9 @@ module.exports.CreateMstscRelay = function (parent, db, ws, req, args, domain) {
137
enablePerf: true,
138
autoLogin: true,
139
screen: obj.infos.screen,
140
- locale: obj.infos.locale
140
+ locale: obj.infos.locale,
141
};
142
+ if (obj.infos.options && (obj.infos.options.flags != null)) { args.perfFlags = obj.infos.options.flags; delete obj.infos.options.flags; }
143
rdpClient = require('./rdp').createClient(args).on('connect', function () {
144
send(['rdp-connect']);
145
if ((typeof obj.infos.options == 'object') && (obj.infos.options.savepass == true)) { saveRdpCredentials(); } // Save the credentials if needed
public/scripts/agent-rdp-0.0.1.js
+7
-1
@@ -27,7 +27,13 @@ var CreateRDPDesktop = function (canvasid) {
27
obj.nodeid = nodeid;
28
obj.port = port;
29
obj.credentials = credentials;
30
- var options = { savepass: credentials.savecred, useServerCreds: credentials.servercred };
30
+ var options = { savepass: credentials.savecred, useServerCreds: credentials.servercred, width: credentials.width, height: credentials.height, flags: credentials.flags };
31
+ if (credentials.width && credentials.height) {
32
+ options.width = obj.ScreenWidth = obj.width = credentials.width;
33
+ options.height = obj.ScreenHeight = obj.height = credentials.height;
34
+ delete credentials.width;
35
+ delete credentials.height;
36
+ }
37
obj.render = new Mstsc.Canvas.create(obj.canvas);
38
obj.socket = new WebSocket('wss://' + window.location.host + '/mstscrelay.ashx'); // TODO: Support domains
39
obj.socket.binaryType = 'arraybuffer';
rdp/protocol/rdp.js
+13
-9
@@ -108,15 +108,19 @@ function RdpClient(config) {
108
if(config.alternateShell) {
109
this.sec.infos.obj.alternateShell.value = Buffer.from(config.alternateShell + '\x00', 'ucs2');
110
}
111
-
112
- if (config.enablePerf) {
113
- this.sec.infos.obj.extendedInfo.obj.performanceFlags.value =
114
- pdu.sec.PerfFlag.PERF_DISABLE_WALLPAPER
115
- | pdu.sec.PerfFlag.PERF_DISABLE_MENUANIMATIONS
116
- | pdu.sec.PerfFlag.PERF_DISABLE_CURSOR_SHADOW
117
- | pdu.sec.PerfFlag.PERF_DISABLE_THEMING
118
- | pdu.sec.PerfFlag.PERF_DISABLE_FULLWINDOWDRAG;
119
- }
111
+
112
+ if (config.perfFlags != null) {
113
+ this.sec.infos.obj.extendedInfo.obj.performanceFlags.value = config.perfFlags;
114
+ } else {
115
+ if (config.enablePerf) {
116
+ this.sec.infos.obj.extendedInfo.obj.performanceFlags.value =
117
+ pdu.sec.PerfFlag.PERF_DISABLE_WALLPAPER
118
+ | pdu.sec.PerfFlag.PERF_DISABLE_MENUANIMATIONS
119
+ | pdu.sec.PerfFlag.PERF_DISABLE_CURSOR_SHADOW
120
+ | pdu.sec.PerfFlag.PERF_DISABLE_THEMING
121
+ | pdu.sec.PerfFlag.PERF_DISABLE_FULLWINDOWDRAG;
122
+ }
123
+ }
124
125
if (config.autoLogin) {
126
this.sec.infos.obj.flag.value |= pdu.sec.InfoFlag.INFO_AUTOLOGON;
views/default.handlebars
+50
-20
@@ -689,7 +689,7 @@
689
<div class="toright2">
690
<span id="DeskLatency" title="Desktop Session Latency"></span>
691
<span id="DeskTimer" title="Session time"></span>
692
- <input id=DeskToolsButton type=button value=Tools title="Toggle tools view" onkeypress="return false" onkeydown="return false" onclick="toggleDeskTools()" />
692
+ <input id=DeskToolsButton type=button value=Tools style="margin-right:4px" title="Toggle tools view" onkeypress="return false" onkeydown="return false" onclick="toggleDeskTools()" />
693
<span id=DeskChatButton class="deskarea" title="Open chat window to this computer"><img class="desktopButtons" src='images/icon-chat.png' onclick=deviceChat(event) height=16 width=16 style=padding-top:2px /></span>
694
<span id=DeskNotifyButton title="Display a notification on the remote computer"><img class="desktopButtons" src='images/icon-notify.png' onclick=deviceToastFunction() height=16 width=16 style=padding-top:2px /></span>
695
<span id=DeskLockButton title="Lock the remote computer"><img src='images/icon-lock.png' class="desktopButtons" onclick=deviceLockFunction() height=16 width=16 /></span>
@@ -1345,16 +1345,16 @@
1345
<div style="margin-top:8px">
1346
<div>Display Size</div>
1347
<select id="d7rdpsize">
1348
- <option value="1">Browser Size</option>
1349
- <option value="2">Screen Size</option>
1350
- <option value="3">Canvas Size</option>
1351
- <option value="4">640x480</option>
1352
- <option value="5">1024×768</option>
1353
- <option value="6">1280×800</option>
1354
- <option value="7">1440×900</option>
1355
- <option value="8">1600×900</option>
1356
- <option value="9">1680×1050</option>
1357
- <option value="10">1920×1080</option>
1348
+ <option value="canvas">Canvas Size</option>
1349
+ <option value="browser">Browser Size</option>
1350
+ <option value="screen">Screen Size</option>
1351
+ <option value="640x480">640×480</option>
1352
+ <option value="1024x768">1024×768</option>
1353
+ <option value="1280x800">1280×800</option>
1354
+ <option value="1440x900">1440×900</option>
1355
+ <option value="1600x900">1600×900</option>
1356
+ <option value="1680x1050">1680×1050</option>
1357
+ <option value="1920x1080">1920×1080</option>
1358
</select>
1359
</div>
1360
<div>
@@ -1364,10 +1364,11 @@
1364
<label style="display:block"><input type="checkbox" id="d7rdp2" />Disable Full Window Drag</label>
1365
<label style="display:block"><input type="checkbox" id="d7rdp3" />Disable Menu Animations</label>
1366
<label style="display:block"><input type="checkbox" id="d7rdp4" />Disable Theming</label>
1367
- <label style="display:block"><input type="checkbox" id="d7rdp6" />Disable Cursor Chadow</label>
1367
+ <label style="display:block"><input type="checkbox" id="d7rdp6" />Disable Cursor Shadow</label>
1368
<label style="display:block"><input type="checkbox" id="d7rdp7" />Disable Cursor Settings</label>
1369
<label style="display:block"><input type="checkbox" id="d7rdp8" />Enable Font Smooting</label>
1370
<label style="display:block"><input type="checkbox" id="d7rdp9" />Enable Desktop Composision</label>
1371
+ <label style="display:block"><input type="checkbox" id="d7rdpsmb" />Swap Mouse Buttons</label>
1372
</div>
1373
</div>
1374
</div>
@@ -8524,7 +8525,7 @@
8525
desktop = CreateRDPDesktop('Desk');
8526
desktop.onStateChanged = onDesktopStateChange;
8527
desktop.m.onScreenSizeChange = mdeskAdjust;
8527
- if (desktopsettings.swapmouse) { desktop.m.SwapMouse = desktopsettings.swapmouse; }
8528
+ if (desktopsettings.rdpsmb) { desktop.m.SwapMouse = desktopsettings.rdpsmb; }
8529
desktop.Start(desktopNode._id, currentNode.rdpport ? currentNode.rdpport : 3389, tsid);
8530
desktop.contype = 4;
8531
}
@@ -8561,12 +8562,34 @@
8562
}
8563
8564
function askRdpCredentialsEx() {
8565
+ var width = null, height = null;
8566
+ if (desktopsettings.rdpsize) {
8567
+ if (desktopsettings.rdpsize == 'browser') {
8568
+ width = window.innerWidth;
8569
+ height = window.innerHeight;
8570
+ } else if (desktopsettings.rdpsize == 'screen') {
8571
+ width = window.screen.width;
8572
+ height = window.screen.height;
8573
+ } else if (desktopsettings.rdpsize == 'canvas') {
8574
+ width = Q('DeskParent').offsetWidth;
8575
+ height = Q('DeskParent').offsetHeight;
8576
+ } else {
8577
+ var i = desktopsettings.rdpsize.indexOf('x');
8578
+ if (i >= 1) {
8579
+ width = parseInt(desktopsettings.rdpsize.substring(0, i));
8580
+ height = parseInt(desktopsettings.rdpsize.substring(i + 1));
8581
+ }
8582
+ }
8583
+ } else {
8584
+ width = Q('DeskParent').offsetWidth;
8585
+ height = Q('DeskParent').offsetHeight;
8586
+ }
8587
if ((currentNode.rdp == 1) && (Q('d2mode').value == 1)) {
8565
- connectDesktop(null, 4, { servercred: true });
8588
+ connectDesktop(null, 4, { servercred: true, width: width, height: height, flags: (desktopsettings.rdpflags != null) ? desktopsettings.rdpflags : 0x2F });
8589
} else {
8590
savecred = false;
8591
if ((features2 & 0x00400000) == 0) { savecred = Q('d2savecred').checked; }
8569
- connectDesktop(null, 4, { domain: Q('d2domain').value, username: Q('d2user').value, password: Q('d2pass').value, savecred: savecred });
8592
+ connectDesktop(null, 4, { domain: Q('d2domain').value, username: Q('d2user').value, password: Q('d2pass').value, savecred: savecred, width: width, height: height, flags: (desktopsettings.rdpflags != null) ? desktopsettings.rdpflags : 0x2F });
8593
}
8594
}
8595
@@ -8731,9 +8754,15 @@
8754
applyDesktopSettings();
8755
updateDesktopButtons();
8756
8734
- if (QS('td7meshkvm').display != 'none') { changeDesktopSettingsTab(null, 'd7meshkvm'); }
8735
- else if (QS('td7rdpkvm').display != 'none') { changeDesktopSettingsTab(null, 'd7rdpkvm'); }
8736
- else if (QS('td7amtkvm').display != 'none') { changeDesktopSettingsTab(null, 'd7amtkvm'); }
8757
+ var tabSelected = false; // See if a visible tab is currently selected
8758
+ if ((QS('td7meshkvm').display != 'none') && (Q('td7meshkvm').className.indexOf('active') > 0)) { tabSelected = true; }
8759
+ else if ((QS('td7rdpkvm').display != 'none') && (Q('td7rdpkvm').className.indexOf('active') > 0)) { tabSelected = true; }
8760
+ else if ((QS('td7amtkvm').display != 'none') && (Q('td7amtkvm').className.indexOf('active') > 0)) { tabSelected = true; }
8761
+ if (tabSelected == false) { // if not, select the first visible one
8762
+ if (QS('td7meshkvm').display != 'none') { changeDesktopSettingsTab(null, 'd7meshkvm'); }
8763
+ else if (QS('td7rdpkvm').display != 'none') { changeDesktopSettingsTab(null, 'd7rdpkvm'); }
8764
+ else if (QS('td7amtkvm').display != 'none') { changeDesktopSettingsTab(null, 'd7amtkvm'); }
8765
+ }
8766
8767
setDialogMode(7, "Remote Desktop Settings", 3, showDesktopSettingsChanged);
8768
}
@@ -8767,8 +8796,8 @@
8796
desktopsettings.autoclipboard = d7deskAutoClipboard.checked;
8797
desktopsettings.autolock = d7deskAutoLock.checked;
8798
desktopsettings.localkeymap = d7localKeyMap.checked;
8770
- desktopsettings.rdpsize = parseInt(d7rdpsize.value);
8771
- desktopsettings.rdpflags = d7rdpsize.value;
8799
+ desktopsettings.rdpsize = d7rdpsize.value;
8800
+ desktopsettings.rdpsmb = d7rdpsmb.checked;
8801
var rdpflags = 0;
8802
for (var i = 1; i < 10; i++) { if ((i != 5) && (Q('d7rdp' + i).checked)) { rdpflags |= (1 << (i - 1)); } }
8803
desktopsettings.rdpflags = rdpflags;
@@ -8810,6 +8839,7 @@
8839
QV('deskFocusBtn', (desktop != null) && (desktop.contype == 2) && (desktop.state != 0) && (desktopsettings.showfocus));
8840
if (desktopsettings.rdpsize != null) { d7rdpsize.value = desktopsettings.rdpsize; }
8841
if (desktopsettings.rdpflags == null) { desktopsettings.rdpflags = 0x2F; }
8842
+ if (desktopsettings.rdpsmb != null) { d7rdpsmb.checked = desktopsettings.rdpsmb; }
8843
for (var i = 1; i < 10; i++) { if (i != 5) { Q('d7rdp' + i).checked = ((desktopsettings.rdpflags & (1 << (i - 1))) != 0); } }
8844
}
8845