';
- var details = printFlexDateTime(new Date(dshare.startTime)) + ' to ' + printFlexDateTime(new Date(dshare.expireTime));
- if (dshare.consent) { if ((dshare.consent & 8) != 0) { details += ', Prompt for consent'; } }
+ var details = format("{0}, {1} to {2}", ((dshare.p == 1)?"Terminal":"Desktop"), printFlexDateTime(new Date(dshare.startTime)), printFlexDateTime(new Date(dshare.expireTime)));
+ if (dshare.consent) { if (((dshare.consent & 8) != 0) || ((dshare.consent & 16) != 0)) { details += ", Prompt for consent"; } }
x += ' ' + dshare.guestName + '
' + trash + '
' + details + '
'; - x += addHtmlValue("Guest Name", ''); - var options = { 1 : "1 minute", 5 : "5 minutes", 10 : "10 minutes", 15 : "15 minutes", 30 : "30 minutes", 45 : "45 minutes", 60 : "60 minutes", 120 : "2 hours", 240 : "4 hours", 480 : "8 hours", 720 : "12 hours", 960 : "16 hours", 1440 : "24 hours", 2880 : "2 days", 5760 : "4 days" } - for (var i in options) { if (serverinfo.maxGuestSessionSharingTime >= i) { y += ''; } } - x += addHtmlValue("Expire Time", ''); - x += addHtmlValue("User Consent", ''); - setDialogMode(2, "Share Device", 3, showShareDeviceEx, x); - showShareDeviceValidate(); - } - */ - - function showShareDevice() { - if (xxdialogMode) return; - var y = '', x = "Creates a link that allows a guest without an account to remote desktop into this device for a limited time." + '
'; + var y = '', x = "Creates a link that allows a guest without an account to remote control this device for a limited time." + '
'; x += addHtmlValue("Guest Name", ''); + x += addHtmlValue("Type", ''); var options = { 1 : "1 minute", 5 : "5 minutes", 10 : "10 minutes", 15 : "15 minutes", 30 : "30 minutes", 45 : "45 minutes", 60 : "60 minutes", 120 : "2 hours", 240 : "4 hours", 480 : "8 hours", 720 : "12 hours", 960 : "16 hours", 1440 : "24 hours", 2880 : "2 days", 5760 : "4 days" } for (var i in options) { y += ''; } x += addHtmlValue("Validity", ''); @@ -6234,7 +6220,7 @@ x += ''; - x += addHtmlValue("User Consent", ''); + x += addHtmlValue("User Consent", ''); setDialogMode(2, "Share Device", 3, showShareDeviceEx, x); showShareDeviceValidate(); var tomorrow = new Date(); @@ -6253,10 +6239,13 @@ QE('idx_dlgOkButton', ok); } function showShareDeviceEx(b, tag) { + var consent = 0; + if (Q('d2shareType').value == 1) { if (Q('d2userConsent').value == 1) { consent = 18; } else { consent = 2; } } // Terminal Consent: 2 = Notify, 16 = Prompt + if (Q('d2shareType').value == 2) { if (Q('d2userConsent').value == 1) { consent = 73; } else { consent = 65; } } // Desktop Consent: 1 = Notify, 8 = Prompt, 64 = Privacy bar if (Q('d2timeRange').value == 0) { - meshserver.send({ action: 'createDeviceShareLink', nodeid: currentNode._id, guestname: Q('d2inviteName').value.trim(), expire: parseInt(Q('d2inviteExpire').value), consent: parseInt(Q('d2userConsent').value) }); + meshserver.send({ action: 'createDeviceShareLink', nodeid: currentNode._id, guestname: Q('d2inviteName').value.trim(), p: parseInt(Q('d2shareType').value), expire: parseInt(Q('d2inviteExpire').value), consent: consent }); } else { - meshserver.send({ action: 'createDeviceShareLink', nodeid: currentNode._id, guestname: Q('d2inviteName').value.trim(), start: Math.floor(tag.selectedDates[0].getTime() / 1000), end: Math.floor(tag.selectedDates[1].getTime() / 1000), consent: parseInt(Q('d2userConsent').value) }); + meshserver.send({ action: 'createDeviceShareLink', nodeid: currentNode._id, guestname: Q('d2inviteName').value.trim(), p: parseInt(Q('d2shareType').value), start: Math.floor(tag.selectedDates[0].getTime() / 1000), end: Math.floor(tag.selectedDates[1].getTime() / 1000), consent: consent }); } } diff --git a/views/desktop.handlebars b/views/desktop.handlebars index 7747e0f1..8a10a65e 100644 --- a/views/desktop.handlebars +++ b/views/desktop.handlebars @@ -397,8 +397,7 @@ desktop.contype = 2; } else if ((contype == null) || (contype == 1) || (contype == 3)) { // Setup the Mesh Agent remote desktop - var meshserver = null; - desktop = CreateAgentRedirect(meshserver, CreateAgentRemoteDesktop('Desk'), serverPublicNamePort, authCookie, null, domainUrl); + desktop = CreateAgentRedirect(null, CreateAgentRemoteDesktop('Desk'), serverPublicNamePort, authCookie, null, domainUrl); desktop.m.mouseCursorActive(true); desktop.debugmode = debugmode; desktop.m.debugmode = debugmode; diff --git a/views/message.handlebars b/views/message.handlebars index 0053f419..87a6156c 100644 --- a/views/message.handlebars +++ b/views/message.handlebars @@ -54,6 +54,7 @@ if (titleid == 1) { title = "Account Verification"; } if (titleid == 2) { title = "Desktop Sharing"; } if (titleid == 3) { title = "Server Under Maintenance"; } + if (titleid == 4) { title = "Terminal Sharing"; } QH('topTitle', Q('topTitle').innerText + ' - ' + title); QH('mainTitle', title); diff --git a/views/message2.handlebars b/views/message2.handlebars index 09ad8964..d68de28c 100644 --- a/views/message2.handlebars +++ b/views/message2.handlebars @@ -55,6 +55,7 @@ if (titleid == 1) { title = "Account Verification"; } if (titleid == 2) { title = "Desktop Sharing"; } if (titleid == 3) { title = "Server Under Maintenance"; } + if (titleid == 4) { title = "Terminal Sharing"; } QH('topTitle', Q('topTitle').innerText + ' - ' + title); QH('mainTitle', title); diff --git a/views/terminal.handlebars b/views/terminal.handlebars new file mode 100644 index 00000000..8fe9807d --- /dev/null +++ b/views/terminal.handlebars @@ -0,0 +1,454 @@ + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
\ No newline at end of file
diff --git a/webserver.js b/webserver.js
index a1a5d169..20083ecb 100644
--- a/webserver.js
+++ b/webserver.js
@@ -2971,7 +2971,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
// Check the inbound desktop sharing cookie
var c = obj.parent.decodeCookie(req.query.c, obj.parent.invitationLinkEncryptionKey, 60); // 60 minute timeout
- if ((c == null) || (c.a !== 5) || (typeof c.uid != 'string') || (typeof c.nid != 'string') || (typeof c.gn != 'string') || (typeof c.cf != 'number') || (typeof c.start != 'number') || (typeof c.expire != 'number') || (typeof c.pid != 'string')) { res.sendStatus(404); return; }
+ if ((c == null) || (c.a !== 5) || ((c.p !== 2) && (c.p != null)) || (typeof c.uid != 'string') || (typeof c.nid != 'string') || (typeof c.gn != 'string') || (typeof c.cf != 'number') || (typeof c.start != 'number') || (typeof c.expire != 'number') || (typeof c.pid != 'string')) { res.sendStatus(404); return; }
// Check the expired time, expire message.
if (c.expire <= Date.now()) { render(req, res, getRenderPage((domain.sitestyle == 2) ? 'message2' : 'message', req, domain), getRenderArgs({ titleid: 2, msgid: 12, domainurl: encodeURIComponent(domain.url).replace(/'/g, '%27') }, req, domain)); return; }
@@ -2991,7 +2991,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
// Looks good, let's create the outbound session cookies.
// Consent flags are 1 = Notify, 8 = Prompt, 64 = Privacy Bar.
- const authCookie = obj.parent.encodeCookie({ userid: c.uid, domainid: domain.id, nid: c.nid, ip: req.clientIp, gn: c.gn, cf: 65 | c.cf, r: 8, expire: c.expire, pid: c.pid }, obj.parent.loginCookieEncryptionKey);
+ const authCookie = obj.parent.encodeCookie({ userid: c.uid, domainid: domain.id, nid: c.nid, ip: req.clientIp, p: 2, gn: c.gn, cf: 65 | c.cf, r: 8, expire: c.expire, pid: c.pid }, obj.parent.loginCookieEncryptionKey);
// Lets respond by sending out the desktop viewer.
var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified
@@ -3001,6 +3001,44 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
});
}
+ // Serve the guest terminal page
+ function handleTerminalRequest(req, res) {
+ const domain = getDomain(req, res);
+ if (domain == null) { return; }
+ if (req.query.c == null) { res.sendStatus(404); return; }
+
+ // Check the inbound desktop sharing cookie
+ var c = obj.parent.decodeCookie(req.query.c, obj.parent.invitationLinkEncryptionKey, 60); // 60 minute timeout
+ if ((c == null) || (c.a !== 5) || (c.p !== 1) || (typeof c.uid != 'string') || (typeof c.nid != 'string') || (typeof c.gn != 'string') || (typeof c.cf != 'number') || (typeof c.start != 'number') || (typeof c.expire != 'number') || (typeof c.pid != 'string')) { res.sendStatus(404); return; }
+
+ // Check the expired time, expire message.
+ if (c.expire <= Date.now()) { render(req, res, getRenderPage((domain.sitestyle == 2) ? 'message2' : 'message', req, domain), getRenderArgs({ titleid: 4, msgid: 12, domainurl: encodeURIComponent(domain.url).replace(/'/g, '%27') }, req, domain)); return; }
+
+ // Check the public id
+ obj.db.GetAllTypeNodeFiltered([c.nid], domain.id, 'deviceshare', null, function (err, docs) {
+ // Check if any desktop sharing links are present, expire message.
+ if ((err != null) || (docs.length == 0)) { render(req, res, getRenderPage((domain.sitestyle == 2) ? 'message2' : 'message', req, domain), getRenderArgs({ titleid: 4, msgid: 12, domainurl: encodeURIComponent(domain.url).replace(/'/g, '%27') }, req, domain)); return; }
+
+ // Search for the device share public identifier, expire message.
+ var found = false;
+ for (var i = 0; i < docs.length; i++) { if (docs[i].publicid == c.pid) { found = true; } }
+ if (found == false) { render(req, res, getRenderPage((domain.sitestyle == 2) ? 'message2' : 'message', req, domain), getRenderArgs({ titleid: 4, msgid: 12, domainurl: encodeURIComponent(domain.url).replace(/'/g, '%27') }, req, domain)); return; }
+
+ // Check the start time, not yet valid message.
+ if ((c.start > Date.now()) || (c.start > c.expire)) { render(req, res, getRenderPage((domain.sitestyle == 2) ? 'message2' : 'message', req, domain), getRenderArgs({ titleid: 4, msgid: 11, domainurl: encodeURIComponent(domain.url).replace(/'/g, '%27') }, req, domain)); return; }
+
+ // Looks good, let's create the outbound session cookies.
+ // Consent flags are 2 = Notify, 16 = Prompt
+ const authCookie = obj.parent.encodeCookie({ userid: c.uid, domainid: domain.id, nid: c.nid, ip: req.clientIp, p: 1, gn: c.gn, cf: 2 | c.cf, r: 8, expire: c.expire, pid: c.pid }, obj.parent.loginCookieEncryptionKey);
+
+ // Lets respond by sending out the desktop viewer.
+ var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified
+ parent.debug('web', 'handleTerminalRequest: Sending guest terminal page for \"' + c.uid + '\", guest \"' + c.gn + '\".');
+ res.set({ 'Cache-Control': 'no-store' });
+ render(req, res, getRenderPage('terminal', req, domain), getRenderArgs({ authCookie: authCookie, authRelayCookie: '', domainurl: encodeURIComponent(domain.url).replace(/'/g, '%27'), nodeid: c.nid, serverDnsName: obj.getWebServerName(domain), serverRedirPort: args.redirport, serverPublicPort: httpsPort, expire: c.expire }, req, domain));
+ });
+ }
+
// Handle domain redirection
obj.handleDomainRedirect = function (req, res) {
const domain = checkUserIpAddress(req, res);
@@ -4975,6 +5013,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
obj.app.get(url + 'player.htm', handlePlayerRequest);
obj.app.get(url + 'player', handlePlayerRequest);
obj.app.get(url + 'desktop', handleDesktopRequest);
+ obj.app.get(url + 'terminal', handleTerminalRequest);
obj.app.ws(url + 'amtactivate', handleAmtActivateWebSocket);
obj.app.ws(url + 'agenttransfer.ashx', handleAgentFileTransfer); // Setup agent to/from server file transfer handler
obj.app.ws(url + 'meshrelay.ashx', function (ws, req) {
+
+
+ Intel® AMT Redirection port or KVM feature is disabled, click here to enable it.
+
+
+
+ Remote computer is not powered on, click here to issue a power command.
+
+
+
+
+
+
+
+
+
+
+ ✖
+
+
+ Disconnected
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+