From 6b1b034c61c8e4d137f5789c094d44da70c53bb7 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Wed, 24 Aug 2022 14:10:40 -0700 Subject: [PATCH] Fixed device sharing links when using in LAN mode. --- meshagent.js | 2 +- meshuser.js | 12 ++++++------ webserver.js | 27 ++++++++++++++------------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/meshagent.js b/meshagent.js index 038c74d4..8fa562bf 100644 --- a/meshagent.js +++ b/meshagent.js @@ -1765,7 +1765,7 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) { if (inviteCookie == null) return; // Create the server url - var serverName = parent.getWebServerName(domain); + var serverName = parent.getWebServerName(domain, req); var httpsPort = ((args.aliasport == null) ? args.port : args.aliasport); // Use HTTPS alias port is specified var xdomain = (domain.dns == null) ? domain.id : ''; if (xdomain != '') xdomain += '/'; diff --git a/meshuser.js b/meshuser.js index 87d83dc2..463faf0c 100644 --- a/meshuser.js +++ b/meshuser.js @@ -568,7 +568,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use } // Build the mobile agent URL, this is used to connect mobile devices - var agentServerName = parent.getWebServerName(domain); + var agentServerName = parent.getWebServerName(domain, req); if (typeof parent.args.agentaliasdns == 'string') { agentServerName = parent.args.agentaliasdns; } var xdomain = (domain.dns == null) ? domain.id : ''; var agentHttpsPort = ((parent.args.aliasport == null) ? parent.args.port : parent.args.aliasport); // Use HTTPS alias port is specified @@ -1938,7 +1938,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use var httpsPort = ((args.aliasport == null) ? args.port : args.aliasport); // Use HTTPS alias port is specified var xdomain = (domain.dns == null) ? domain.id : ''; if (xdomain != '') xdomain += "/"; - var url = "https://" + parent.getWebServerName(domain) + ":" + httpsPort + "/" + xdomain + "messenger?id=meshmessenger/" + encodeURIComponent(command.userid) + "/" + encodeURIComponent(user._id); + var url = "https://" + parent.getWebServerName(domain, req) + ":" + httpsPort + "/" + xdomain + "messenger?id=meshmessenger/" + encodeURIComponent(command.userid) + "/" + encodeURIComponent(user._id); // Perform web push notification var payload = { body: "Chat Request, Click here to accept.", icon: 8, url: url }; // Icon 8 is the user icon. @@ -1961,7 +1961,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use var httpsPort = ((args.aliasport == null) ? args.port : args.aliasport); // Use HTTPS alias port is specified var xdomain = (domain.dns == null) ? domain.id : ''; if (xdomain != '') xdomain += "/"; - var url = "https://" + parent.getWebServerName(domain) + ":" + httpsPort + "/" + xdomain + "messenger?id=meshmessenger/" + encodeURIComponent(command.nodeid) + "/" + encodeURIComponent(user._id); + var url = "https://" + parent.getWebServerName(domain, req) + ":" + httpsPort + "/" + xdomain + "messenger?id=meshmessenger/" + encodeURIComponent(command.nodeid) + "/" + encodeURIComponent(user._id); // Open a web page on the remote device routeCommandToNode({ 'action': 'openUrl', 'nodeid': command.nodeid, 'userid': user._id, 'username': user.name, 'url': url }); @@ -3903,7 +3903,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use mesh = parent.meshes[command.meshid]; if ((mesh == null) || (parent.IsMeshViewable(user, mesh) == false)) { err = 'Invalid group id'; } } - var serverName = parent.getWebServerName(domain); + var serverName = parent.getWebServerName(domain, req); // Handle any errors if (err != null) { @@ -4226,7 +4226,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use if (inviteCookie == null) { if (command.responseid != null) { try { ws.send(JSON.stringify({ action: 'createDeviceShareLink', responseid: command.responseid, result: 'Unable to generate shareing cookie' })); } catch (ex) { } } return; } // Create the server url - var serverName = parent.getWebServerName(domain); + var serverName = parent.getWebServerName(domain, req); var httpsPort = ((args.aliasport == null) ? args.port : args.aliasport); // Use HTTPS alias port is specified var xdomain = (domain.dns == null) ? domain.id : ''; if (xdomain != '') xdomain += '/'; @@ -4329,7 +4329,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use if (rights == MESHRIGHT_ADMIN) { var token = parent.parent.mqttbroker.generateLogin(node.meshid, node._id); var r = { action: 'getmqttlogin', responseid: command.responseid, nodeid: node._id, user: token.user, pass: token.pass }; - const serverName = parent.getWebServerName(domain); + const serverName = parent.getWebServerName(domain, req); // Add MPS URL if (parent.parent.mpsserver != null) { diff --git a/webserver.js b/webserver.js index 00fa3aaa..05f65e27 100644 --- a/webserver.js +++ b/webserver.js @@ -1141,7 +1141,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port if specified // Get the agent connection server name - var serverName = obj.getWebServerName(domain); + var serverName = obj.getWebServerName(domain, req); if (typeof obj.args.agentaliasdns == 'string') { serverName = obj.args.agentaliasdns; } // Build the connection URL. If we are using a sub-domain or one with a DNS, we need to craft the URL correctly. @@ -2163,7 +2163,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF parent.debug('web', 'handleAgentInviteRequest using cookie.'); // Build the mobile agent URL, this is used to connect mobile devices - var agentServerName = obj.getWebServerName(domain); + var agentServerName = obj.getWebServerName(domain, req); if (typeof obj.args.agentaliasdns == 'string') { agentServerName = obj.args.agentaliasdns; } var xdomain = (domain.dns == null) ? domain.id : ''; var agentHttpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified @@ -2186,7 +2186,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF parent.debug('web', 'handleAgentInviteRequest using meshid.'); // Build the mobile agent URL, this is used to connect mobile devices - var agentServerName = obj.getWebServerName(domain); + var agentServerName = obj.getWebServerName(domain, req); if (typeof obj.args.agentaliasdns == 'string') { agentServerName = obj.args.agentaliasdns; } var xdomain = (domain.dns == null) ? domain.id : ''; var agentHttpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified @@ -2911,7 +2911,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF logoutControls: encodeURIComponent(JSON.stringify(logoutcontrols)).replace(/'/g, '%27'), domain: domain.id, debuglevel: parent.debugLevel, - serverDnsName: obj.getWebServerName(domain), + serverDnsName: obj.getWebServerName(domain, req), serverRedirPort: args.redirport, serverPublicPort: httpsPort, serverfeatures: serverFeatures, @@ -3133,7 +3133,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF newAccountPass: (((domain.newaccountspass == null) || (domain.newaccountspass == '')) ? 0 : 1), // 1 if new account creation requires password newAccountCaptcha: newAccountCaptcha, // If new account creation requires a CAPTCHA, this string will not be empty newAccountCaptchaImage: newAccountCaptchaImage, // Set to the URL of the CAPTCHA image - serverDnsName: obj.getWebServerName(domain), + serverDnsName: obj.getWebServerName(domain, req), serverPublicPort: httpsPort, passlogin: (typeof domain.showpasswordlogin == 'boolean') ? domain.showpasswordlogin : true, emailcheck: emailcheck, @@ -3258,7 +3258,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF const authCookie = obj.parent.encodeCookie({ userid: user._id, domainid: domain.id, ip: req.clientIp }, obj.parent.loginCookieEncryptionKey); const authRelayCookie = obj.parent.encodeCookie({ ruserid: user._id, domainid: domain.id }, obj.parent.loginCookieEncryptionKey); var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified - render(req, res, getRenderPage('xterm', req, domain), getRenderArgs({ serverDnsName: obj.getWebServerName(domain), serverRedirPort: args.redirport, serverPublicPort: httpsPort, authCookie: authCookie, authRelayCookie: authRelayCookie, logoutControls: encodeURIComponent(JSON.stringify(logoutcontrols)).replace(/'/g, '%27'), name: EscapeHtml(node.name) }, req, domain)); + render(req, res, getRenderPage('xterm', req, domain), getRenderArgs({ serverDnsName: obj.getWebServerName(domain, req), serverRedirPort: args.redirport, serverPublicPort: httpsPort, authCookie: authCookie, authRelayCookie: authRelayCookie, logoutControls: encodeURIComponent(JSON.stringify(logoutcontrols)).replace(/'/g, '%27'), name: EscapeHtml(node.name) }, req, domain)); }); } else { res.redirect(domain.url + getQueryPortion(req)); @@ -3901,7 +3901,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified parent.debug('web', 'handleSharingRequest: Sending guest sharing page for \"' + c.uid + '\", guest \"' + c.gn + '\".'); res.set({ 'Cache-Control': 'no-store' }); - render(req, res, getRenderPage('sharing', 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, viewOnly: (c.vo == 1) ? 1 : 0, nodeName: encodeURIComponent(node.name).replace(/'/g, '%27'), features: c.p, features2: features2 }, req, domain)); + render(req, res, getRenderPage('sharing', req, domain), getRenderArgs({ authCookie: authCookie, authRelayCookie: '', domainurl: encodeURIComponent(domain.url).replace(/'/g, '%27'), nodeid: c.nid, serverDnsName: obj.getWebServerName(domain, req), serverRedirPort: args.redirport, serverPublicPort: httpsPort, expire: c.expire, viewOnly: (c.vo == 1) ? 1 : 0, nodeName: encodeURIComponent(node.name).replace(/'/g, '%27'), features: c.p, features2: features2 }, req, domain)); }); }); } @@ -5133,7 +5133,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF } // Get the agent connection server name - var serverName = obj.getWebServerName(domain); + var serverName = obj.getWebServerName(domain, req); if (typeof obj.args.agentaliasdns == 'string') { serverName = obj.args.agentaliasdns; } // Build the agent connection URL. If we are using a sub-domain or one with a DNS, we need to craft the URL correctly. @@ -5319,7 +5319,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF if (user != null) { meshaction.username = user.name; } if (req.query.key != null) { meshaction.loginKey = req.query.key; } var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified - if (obj.args.lanonly != true) { meshaction.serverUrl = 'wss://' + obj.getWebServerName(domain) + ':' + httpsPort + '/' + ((domain.id == '') ? '' : ('/' + domain.id)) + 'meshrelay.ashx'; } + if (obj.args.lanonly != true) { meshaction.serverUrl = 'wss://' + obj.getWebServerName(domain, req) + ':' + httpsPort + '/' + ((domain.id == '') ? '' : ('/' + domain.id)) + 'meshrelay.ashx'; } setContentDispositionHeader(res, 'application/octet-stream', 'meshaction.txt', null, 'meshaction.txt'); res.send(JSON.stringify(meshaction, null, ' ')); @@ -5336,7 +5336,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF if (user != null) { meshaction.username = user.name; } if (req.query.key != null) { meshaction.loginKey = req.query.key; } var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified - if (obj.args.lanonly != true) { meshaction.serverUrl = 'wss://' + obj.getWebServerName(domain) + ':' + httpsPort + '/' + ((domain.id == '') ? '' : ('/' + domain.id)) + 'meshrelay.ashx'; } + if (obj.args.lanonly != true) { meshaction.serverUrl = 'wss://' + obj.getWebServerName(domain, req) + ':' + httpsPort + '/' + ((domain.id == '') ? '' : ('/' + domain.id)) + 'meshrelay.ashx'; } setContentDispositionHeader(res, 'application/octet-stream', 'meshaction.txt', null, 'meshaction.txt'); res.send(JSON.stringify(meshaction, null, ' ')); return; @@ -5506,8 +5506,9 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF }; // Get the web server hostname. This may change if using a domain with a DNS name. - obj.getWebServerName = function (domain) { + obj.getWebServerName = function (domain, req) { if (domain.dns != null) return domain.dns; + if ((obj.certificates.CommonName == 'un-configured') && (req != null) && (req.headers != null) && (typeof req.headers.host == 'string')) { return req.headers.host.split(':')[0]; } return obj.certificates.CommonName; } @@ -5543,7 +5544,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF var serveridhex = Buffer.from(obj.agentCertificateHashBase64.replace(/\@/g, '+').replace(/\$/g, '/'), 'base64').toString('hex').toUpperCase(); // Get the agent connection server name - var serverName = obj.getWebServerName(domain); + var serverName = obj.getWebServerName(domain, req); if (typeof obj.args.agentaliasdns == 'string') { serverName = obj.args.agentaliasdns; } // Build the agent connection URL. If we are using a sub-domain or one with a DNS, we need to craft the URL correctly. @@ -5646,7 +5647,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF var serveridhex = Buffer.from(obj.agentCertificateHashBase64.replace(/\@/g, '+').replace(/\$/g, '/'), 'base64').toString('hex').toUpperCase(); // Get the agent connection server name - var serverName = obj.getWebServerName(domain); + var serverName = obj.getWebServerName(domain, req); if (typeof obj.args.agentaliasdns == 'string') { serverName = obj.args.agentaliasdns; } // Build the agent connection URL. If we are using a sub-domain or one with a DNS, we need to craft the URL correctly.