Fixed device sharing links when using in LAN mode.
Ylian Saint-Hilaire committed
Aug 24, 2022 at 14:10 UTC
6b1b034c61c8e4d137f5789c094d44da70c53bb7
3 files changed
+21
-20
meshagent.js
+1
-1
@@ -1765,7 +1765,7 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
1765
if (inviteCookie == null) return;
1766
1767
// Create the server url
1768
- var serverName = parent.getWebServerName(domain);
1768
+ var serverName = parent.getWebServerName(domain, req);
1769
var httpsPort = ((args.aliasport == null) ? args.port : args.aliasport); // Use HTTPS alias port is specified
1770
var xdomain = (domain.dns == null) ? domain.id : '';
1771
if (xdomain != '') xdomain += '/';
meshuser.js
+6
-6
@@ -568,7 +568,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
568
}
569
570
// Build the mobile agent URL, this is used to connect mobile devices
571
- var agentServerName = parent.getWebServerName(domain);
571
+ var agentServerName = parent.getWebServerName(domain, req);
572
if (typeof parent.args.agentaliasdns == 'string') { agentServerName = parent.args.agentaliasdns; }
573
var xdomain = (domain.dns == null) ? domain.id : '';
574
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
1938
var httpsPort = ((args.aliasport == null) ? args.port : args.aliasport); // Use HTTPS alias port is specified
1939
var xdomain = (domain.dns == null) ? domain.id : '';
1940
if (xdomain != '') xdomain += "/";
1941
- var url = "https://" + parent.getWebServerName(domain) + ":" + httpsPort + "/" + xdomain + "messenger?id=meshmessenger/" + encodeURIComponent(command.userid) + "/" + encodeURIComponent(user._id);
1941
+ var url = "https://" + parent.getWebServerName(domain, req) + ":" + httpsPort + "/" + xdomain + "messenger?id=meshmessenger/" + encodeURIComponent(command.userid) + "/" + encodeURIComponent(user._id);
1942
1943
// Perform web push notification
1944
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
1961
var httpsPort = ((args.aliasport == null) ? args.port : args.aliasport); // Use HTTPS alias port is specified
1962
var xdomain = (domain.dns == null) ? domain.id : '';
1963
if (xdomain != '') xdomain += "/";
1964
- var url = "https://" + parent.getWebServerName(domain) + ":" + httpsPort + "/" + xdomain + "messenger?id=meshmessenger/" + encodeURIComponent(command.nodeid) + "/" + encodeURIComponent(user._id);
1964
+ var url = "https://" + parent.getWebServerName(domain, req) + ":" + httpsPort + "/" + xdomain + "messenger?id=meshmessenger/" + encodeURIComponent(command.nodeid) + "/" + encodeURIComponent(user._id);
1965
1966
// Open a web page on the remote device
1967
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
3903
mesh = parent.meshes[command.meshid];
3904
if ((mesh == null) || (parent.IsMeshViewable(user, mesh) == false)) { err = 'Invalid group id'; }
3905
}
3906
- var serverName = parent.getWebServerName(domain);
3906
+ var serverName = parent.getWebServerName(domain, req);
3907
3908
// Handle any errors
3909
if (err != null) {
@@ -4226,7 +4226,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
4226
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; }
4227
4228
// Create the server url
4229
- var serverName = parent.getWebServerName(domain);
4229
+ var serverName = parent.getWebServerName(domain, req);
4230
var httpsPort = ((args.aliasport == null) ? args.port : args.aliasport); // Use HTTPS alias port is specified
4231
var xdomain = (domain.dns == null) ? domain.id : '';
4232
if (xdomain != '') xdomain += '/';
@@ -4329,7 +4329,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
4329
if (rights == MESHRIGHT_ADMIN) {
4330
var token = parent.parent.mqttbroker.generateLogin(node.meshid, node._id);
4331
var r = { action: 'getmqttlogin', responseid: command.responseid, nodeid: node._id, user: token.user, pass: token.pass };
4332
- const serverName = parent.getWebServerName(domain);
4332
+ const serverName = parent.getWebServerName(domain, req);
4333
4334
// Add MPS URL
4335
if (parent.parent.mpsserver != null) {
webserver.js
+14
-13
@@ -1141,7 +1141,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
1141
var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port if specified
1142
1143
// Get the agent connection server name
1144
- var serverName = obj.getWebServerName(domain);
1144
+ var serverName = obj.getWebServerName(domain, req);
1145
if (typeof obj.args.agentaliasdns == 'string') { serverName = obj.args.agentaliasdns; }
1146
1147
// 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
2163
parent.debug('web', 'handleAgentInviteRequest using cookie.');
2164
2165
// Build the mobile agent URL, this is used to connect mobile devices
2166
- var agentServerName = obj.getWebServerName(domain);
2166
+ var agentServerName = obj.getWebServerName(domain, req);
2167
if (typeof obj.args.agentaliasdns == 'string') { agentServerName = obj.args.agentaliasdns; }
2168
var xdomain = (domain.dns == null) ? domain.id : '';
2169
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
2186
parent.debug('web', 'handleAgentInviteRequest using meshid.');
2187
2188
// Build the mobile agent URL, this is used to connect mobile devices
2189
- var agentServerName = obj.getWebServerName(domain);
2189
+ var agentServerName = obj.getWebServerName(domain, req);
2190
if (typeof obj.args.agentaliasdns == 'string') { agentServerName = obj.args.agentaliasdns; }
2191
var xdomain = (domain.dns == null) ? domain.id : '';
2192
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
2911
logoutControls: encodeURIComponent(JSON.stringify(logoutcontrols)).replace(/'/g, '%27'),
2912
domain: domain.id,
2913
debuglevel: parent.debugLevel,
2914
- serverDnsName: obj.getWebServerName(domain),
2914
+ serverDnsName: obj.getWebServerName(domain, req),
2915
serverRedirPort: args.redirport,
2916
serverPublicPort: httpsPort,
2917
serverfeatures: serverFeatures,
@@ -3133,7 +3133,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
3133
newAccountPass: (((domain.newaccountspass == null) || (domain.newaccountspass == '')) ? 0 : 1), // 1 if new account creation requires password
3134
newAccountCaptcha: newAccountCaptcha, // If new account creation requires a CAPTCHA, this string will not be empty
3135
newAccountCaptchaImage: newAccountCaptchaImage, // Set to the URL of the CAPTCHA image
3136
- serverDnsName: obj.getWebServerName(domain),
3136
+ serverDnsName: obj.getWebServerName(domain, req),
3137
serverPublicPort: httpsPort,
3138
passlogin: (typeof domain.showpasswordlogin == 'boolean') ? domain.showpasswordlogin : true,
3139
emailcheck: emailcheck,
@@ -3258,7 +3258,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
3258
const authCookie = obj.parent.encodeCookie({ userid: user._id, domainid: domain.id, ip: req.clientIp }, obj.parent.loginCookieEncryptionKey);
3259
const authRelayCookie = obj.parent.encodeCookie({ ruserid: user._id, domainid: domain.id }, obj.parent.loginCookieEncryptionKey);
3260
var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified
3261
- 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));
3261
+ 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));
3262
});
3263
} else {
3264
res.redirect(domain.url + getQueryPortion(req));
@@ -3901,7 +3901,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
3901
var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified
3902
parent.debug('web', 'handleSharingRequest: Sending guest sharing page for \"' + c.uid + '\", guest \"' + c.gn + '\".');
3903
res.set({ 'Cache-Control': 'no-store' });
3904
- 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));
3904
+ 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));
3905
});
3906
});
3907
}
@@ -5133,7 +5133,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
5133
}
5134
5135
// Get the agent connection server name
5136
- var serverName = obj.getWebServerName(domain);
5136
+ var serverName = obj.getWebServerName(domain, req);
5137
if (typeof obj.args.agentaliasdns == 'string') { serverName = obj.args.agentaliasdns; }
5138
5139
// 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
5319
if (user != null) { meshaction.username = user.name; }
5320
if (req.query.key != null) { meshaction.loginKey = req.query.key; }
5321
var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified
5322
- if (obj.args.lanonly != true) { meshaction.serverUrl = 'wss://' + obj.getWebServerName(domain) + ':' + httpsPort + '/' + ((domain.id == '') ? '' : ('/' + domain.id)) + 'meshrelay.ashx'; }
5322
+ if (obj.args.lanonly != true) { meshaction.serverUrl = 'wss://' + obj.getWebServerName(domain, req) + ':' + httpsPort + '/' + ((domain.id == '') ? '' : ('/' + domain.id)) + 'meshrelay.ashx'; }
5323
5324
setContentDispositionHeader(res, 'application/octet-stream', 'meshaction.txt', null, 'meshaction.txt');
5325
res.send(JSON.stringify(meshaction, null, ' '));
@@ -5336,7 +5336,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
5336
if (user != null) { meshaction.username = user.name; }
5337
if (req.query.key != null) { meshaction.loginKey = req.query.key; }
5338
var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified
5339
- if (obj.args.lanonly != true) { meshaction.serverUrl = 'wss://' + obj.getWebServerName(domain) + ':' + httpsPort + '/' + ((domain.id == '') ? '' : ('/' + domain.id)) + 'meshrelay.ashx'; }
5339
+ if (obj.args.lanonly != true) { meshaction.serverUrl = 'wss://' + obj.getWebServerName(domain, req) + ':' + httpsPort + '/' + ((domain.id == '') ? '' : ('/' + domain.id)) + 'meshrelay.ashx'; }
5340
setContentDispositionHeader(res, 'application/octet-stream', 'meshaction.txt', null, 'meshaction.txt');
5341
res.send(JSON.stringify(meshaction, null, ' '));
5342
return;
@@ -5506,8 +5506,9 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
5506
};
5507
5508
// Get the web server hostname. This may change if using a domain with a DNS name.
5509
- obj.getWebServerName = function (domain) {
5509
+ obj.getWebServerName = function (domain, req) {
5510
if (domain.dns != null) return domain.dns;
5511
+ if ((obj.certificates.CommonName == 'un-configured') && (req != null) && (req.headers != null) && (typeof req.headers.host == 'string')) { return req.headers.host.split(':')[0]; }
5512
return obj.certificates.CommonName;
5513
}
5514
@@ -5543,7 +5544,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
5544
var serveridhex = Buffer.from(obj.agentCertificateHashBase64.replace(/\@/g, '+').replace(/\$/g, '/'), 'base64').toString('hex').toUpperCase();
5545
5546
// Get the agent connection server name
5546
- var serverName = obj.getWebServerName(domain);
5547
+ var serverName = obj.getWebServerName(domain, req);
5548
if (typeof obj.args.agentaliasdns == 'string') { serverName = obj.args.agentaliasdns; }
5549
5550
// 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
5647
var serveridhex = Buffer.from(obj.agentCertificateHashBase64.replace(/\@/g, '+').replace(/\$/g, '/'), 'base64').toString('hex').toUpperCase();
5648
5649
// Get the agent connection server name
5649
- var serverName = obj.getWebServerName(domain);
5650
+ var serverName = obj.getWebServerName(domain, req);
5651
if (typeof obj.args.agentaliasdns == 'string') { serverName = obj.args.agentaliasdns; }
5652
5653
// Build the agent connection URL. If we are using a sub-domain or one with a DNS, we need to craft the URL correctly.