From dabb6b358e92c0fa974ff9a44ae78e5ec1195bb0 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Fri, 21 May 2021 09:52:47 -0700 Subject: [PATCH] MeshCentral Router desktop/files can be launched from site link. --- agents/MeshCentralRouter.exe | Bin 3184024 -> 3184024 bytes meshcentral-config-schema.json | 2 +- views/default.handlebars | 8 ++++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/agents/MeshCentralRouter.exe b/agents/MeshCentralRouter.exe index 89175e4d46f3fdb855b79c78cfdd2d9e55a36bba..31f7d49c37305d16ef67e5c4bdf8b15d035924d3 100644 GIT binary patch delta 16300 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 B*6RQO diff --git a/meshcentral-config-schema.json b/meshcentral-config-schema.json index 4948853e..a15830a7 100644 --- a/meshcentral-config-schema.json +++ b/meshcentral-config-schema.json @@ -317,7 +317,7 @@ "type": "string" }, "protocol": { - "description": "Protocol. Valid values are: custom,http,https,rdp,ssh,scp.", + "description": "Protocol. Valid values are: custom,http,https,rdp,ssh,scp,mcrdesktop,mcrfiles.", "type": "string" }, "port": { diff --git a/views/default.handlebars b/views/default.handlebars index 14fea2c4..51001118 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -2484,7 +2484,7 @@ if (message.localRelay) { url += '&local=1'; } if (message.localport) { url += '&localport=' + message.localport; } if (message.ip != null) { url += ('&remoteip=' + message.ip); } - url += ('&appid=' + message.protocol + '&autoexit=1'); // Protocol: 0 = Custom, 1 = HTTP, 2 = HTTPS, 3 = RDP, 4 = PuTTY, 5 = WinSCP + url += ('&appid=' + message.protocol + '&autoexit=1'); // Protocol: 0 = Custom, 1 = HTTP, 2 = HTTPS, 3 = RDP, 4 = PuTTY, 5 = WinSCP, 6 = MCRDesktop, 7 = MCRFiles downloadFile(url, ''); } else if (message.tag == 'novnc') { var vncurl = window.location.origin + domainUrl + 'novnc/vnc.html?ws=wss%3A%2F%2F' + window.location.host + encodeURIComponentEx(domainUrl) + (message.localRelay?'local':'mesh') + 'relay.ashx%3Fauth%3D' + message.cookie + '&show_dot=1' + (urlargs.key?('&key=' + urlargs.key):'') + '&l={{{lang}}}'; @@ -4222,7 +4222,7 @@ for (var i in serverinfo.devicemeshrouterlinks.extralinks) { var r = serverinfo.devicemeshrouterlinks.extralinks[i], p = 0; if (doesDeviceMatchFilterTags(node, r.filter)) { - if (typeof r.protocol == 'number') { p = r.protocol; } else if (r.protocol == 'http') { p = 1; } else if (r.protocol == 'https') { p = 2; } else if (r.protocol == 'rdp') { p = 3; } else if (r.protocol == 'ssh') { p = 4; } else if (r.protocol == 'scp') { p = 5; } + if (typeof r.protocol == 'number') { p = r.protocol; } else if (r.protocol == 'http') { p = 1; } else if (r.protocol == 'https') { p = 2; } else if (r.protocol == 'rdp') { p = 3; } else if (r.protocol == 'ssh') { p = 4; } else if (r.protocol == 'scp') { p = 5; } else if (r.protocol == 'mcrdesktop') { p = 6; } else if (r.protocol == 'mcrfiles') { p = 7; } x += '' + r.name + ' '; } } @@ -6502,7 +6502,7 @@ for (var i in serverinfo.devicemeshrouterlinks.extralinks) { var r = serverinfo.devicemeshrouterlinks.extralinks[i], p = 0; if (doesDeviceMatchFilterTags(node, r.filter)) { - if (typeof r.protocol == 'number') { p = r.protocol; } else if (r.protocol == 'http') { p = 1; } else if (r.protocol == 'https') { p = 2; } else if (r.protocol == 'rdp') { p = 3; } else if (r.protocol == 'ssh') { p = 4; } else if (r.protocol == 'scp') { p = 5; } + if (typeof r.protocol == 'number') { p = r.protocol; } else if (r.protocol == 'http') { p = 1; } else if (r.protocol == 'https') { p = 2; } else if (r.protocol == 'rdp') { p = 3; } else if (r.protocol == 'ssh') { p = 4; } else if (r.protocol == 'scp') { p = 5; } else if (r.protocol == 'mcrdesktop') { p = 6; } else if (r.protocol == 'mcrfiles') { p = 7; } x += '' + r.name + ' '; } } @@ -7287,7 +7287,7 @@ function p10MCRouter(nodeid, protocol, port, ip, localport) { var node = getNodeFromId(nodeid); if ((protocol == 3) && (port == null)) { if (node.rdpport != null) { port = node.rdpport; } else { port = 3389; } } - meshserver.send({ action: 'getcookie', nodeid: nodeid, tcpport: port, ip: ip, tag: 'MCRouter', protocol: protocol, localport: localport }); // Protocol: 0 = Custom, 1 = HTTP, 2 = HTTPS, 3 = RDP, 4 = PuTTY, 5 = WinSCP + meshserver.send({ action: 'getcookie', nodeid: nodeid, tcpport: port, ip: ip, tag: 'MCRouter', protocol: protocol, localport: localport }); // Protocol: 0 = Custom, 1 = HTTP, 2 = HTTPS, 3 = RDP, 4 = PuTTY, 5 = WinSCP, 6 = MCRDesktop, 7 = MCRFiles return false; }