From 1f61bc7c2b08b4dd7a7e175f39da50a3393041c4 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Fri, 12 Jun 2020 13:56:29 -0700 Subject: [PATCH] Internationalized RDP login page and added 3FA support. --- MeshCentralServer.njsproj | 1 + public/mstsc/keymap.html | 20 ------------------- translate/translate.js | 2 ++ translate/translate.json | 11 ++++++++-- views/default.handlebars | 4 ++-- .../index.html => views/mstsc.handlebars | 15 +++++++------- webserver.js | 9 +++++++++ 7 files changed, 30 insertions(+), 32 deletions(-) delete mode 100644 public/mstsc/keymap.html rename public/mstsc/index.html => views/mstsc.handlebars (93%) diff --git a/MeshCentralServer.njsproj b/MeshCentralServer.njsproj index 6dcf5178..3fca9f59 100644 --- a/MeshCentralServer.njsproj +++ b/MeshCentralServer.njsproj @@ -572,6 +572,7 @@ + diff --git a/public/mstsc/keymap.html b/public/mstsc/keymap.html deleted file mode 100644 index 02ccc8da..00000000 --- a/public/mstsc/keymap.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - -

- - diff --git a/translate/translate.js b/translate/translate.js index f1b0ec48..47d4d032 100644 --- a/translate/translate.js +++ b/translate/translate.js @@ -32,6 +32,7 @@ var meshCentralSourceFiles = [ "../views/message.handlebars", "../views/messenger.handlebars", "../views/player.handlebars", + "../views/mstsc.handlebars", "../emails/account-check.html", "../emails/account-invite.html", "../emails/account-login.html", @@ -61,6 +62,7 @@ var minifyMeshCentralSourceFiles = [ "../views/message.handlebars", "../views/messenger.handlebars", "../views/player.handlebars", + "../views/mstsc.handlebars", "../public/scripts/agent-desktop-0.0.2.js", "../public/scripts/agent-redir-rtc-0.1.0.js", "../public/scripts/agent-redir-ws-0.1.1.js", diff --git a/translate/translate.json b/translate/translate.json index 9fde434d..740493e8 100644 --- a/translate/translate.json +++ b/translate/translate.json @@ -6318,6 +6318,7 @@ "default.handlebars->container->column_l->p11->deskarea0->deskarea1->3->connectbutton1span", "default.handlebars->container->column_l->p12->termTable->1->1->0->1->3->connectbutton2span", "default.handlebars->container->column_l->p13->p13toolbar->1->0->1->3", + "mstsc.handlebars->main->1->3->1->8->1->0", "xterm.handlebars->p11->deskarea0->deskarea1->3" ] }, @@ -8852,7 +8853,9 @@ "default.handlebars->27->1487", "default.handlebars->27->1533", "default.handlebars->27->1542", - "default.handlebars->27->1597" + "default.handlebars->27->1597", + "mstsc.handlebars->main->1->3->1->2->1->0", + "mstsc.handlebars->main->1->3->1->2->3" ] }, { @@ -19679,7 +19682,9 @@ "default.handlebars->27->1661", "default.handlebars->27->251", "default.handlebars->27->280", - "default.handlebars->27->645" + "default.handlebars->27->645", + "mstsc.handlebars->main->1->3->1->6->1->0", + "mstsc.handlebars->main->1->3->1->6->3" ] }, { @@ -27999,6 +28004,8 @@ "default.handlebars->27->249", "default.handlebars->27->279", "default.handlebars->27->644", + "mstsc.handlebars->main->1->3->1->4->1->0", + "mstsc.handlebars->main->1->3->1->4->3", "player.handlebars->3->4" ] }, diff --git a/views/default.handlebars b/views/default.handlebars index 4c7fd270..67c2c5d4 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -2208,13 +2208,13 @@ newWindow.opener = null; } } else if (message.tag == 'novnc') { - var vncurl = window.location.origin + domainUrl + 'novnc/vnc.html?ws=wss%3A%2F%2F' + window.location.host + '%2Fmeshrelay.ashx%3Fauth%3D' + message.cookie + '&show_dot=1'; + var vncurl = window.location.origin + domainUrl + 'novnc/vnc.html?ws=wss%3A%2F%2F' + window.location.host + '%2Fmeshrelay.ashx%3Fauth%3D' + message.cookie + '&show_dot=1' + (urlargs.key?('&key=' + urlargs.key):''); var node = getNodeFromId(message.nodeid); if (node != null) { vncurl += '&name=' + encodeURIComponentEx(node.name); } var newWindow = window.open(vncurl, 'mcnovnc/' + message.nodeid); newWindow.opener = null; } else if (message.tag == 'mstsc') { - var rdpurl = window.location.origin + domainUrl + 'mstsc/index.html?ws=' + message.cookie; + var rdpurl = window.location.origin + domainUrl + 'mstsc.html?ws=' + message.cookie + (urlargs.key?('&key=' + urlargs.key):''); var node = getNodeFromId(message.nodeid); if (node != null) { rdpurl += '&name=' + encodeURIComponentEx(node.name); } var newWindow = window.open(rdpurl, 'mcmstsc/' + message.nodeid); diff --git a/public/mstsc/index.html b/views/mstsc.handlebars similarity index 93% rename from public/mstsc/index.html rename to views/mstsc.handlebars index 9c7225d1..3f2e5bb2 100644 --- a/public/mstsc/index.html +++ b/views/mstsc.handlebars @@ -6,16 +6,15 @@ RDP - - - - - + + + + +