Put in the groundwork for web relay with multiple relay DNS names.
Ylian Saint-Hilaire committed
Jul 10, 2022 at 01:32 UTC
a0ea6ead09312136791795dadbccc5e5bb9651ac
4 files changed
+25
-19
apprelays.js
+3
-2
@@ -69,7 +69,7 @@ function SerialTunnel(options) {
69
}
70
71
// Construct a Web relay object
72
-module.exports.CreateWebRelaySession = function (parent, db, req, args, domain, userid, nodeid, addr, port, appid) {
72
+module.exports.CreateWebRelaySession = function (parent, db, req, args, domain, userid, nodeid, addr, port, appid, sessionid) {
73
const obj = {};
74
obj.parent = parent;
75
obj.lastOperation = Date.now();
@@ -79,6 +79,7 @@ module.exports.CreateWebRelaySession = function (parent, db, req, args, domain,
79
obj.addr = addr;
80
obj.port = port;
81
obj.appid = appid;
82
+ obj.sessionid = sessionid;
83
var pendingRequests = [];
84
var nextTunnelId = 1;
85
var tunnels = {};
@@ -199,7 +200,7 @@ module.exports.CreateWebRelaySession = function (parent, db, req, args, domain,
200
for (var i in pendingRequests) { if (pendingRequests[i][2] == true) { pendingRequests[i][1].close(); } else { pendingRequests[i][1].end(); } }
201
202
// Notify of session closure
202
- if (obj.onclose) { obj.onclose(obj.userid + '/' + obj.sessionId); }
203
+ if (obj.onclose) { obj.onclose(obj.sessionid); }
204
205
// Cleanup
206
delete obj.userid;
meshcentral.js
+5
-1
@@ -1649,8 +1649,12 @@ function CreateMeshCentralServer(config, args) {
1649
obj.webserver = require('./webserver.js').CreateWebServer(obj, obj.db, obj.args, obj.certificates, obj.StartEx5);
1650
if (obj.redirserver != null) { obj.redirserver.hookMainWebServer(obj.certificates); }
1651
1652
+ // Change RelayDNS to a array of strings
1653
+ if (typeof obj.args.relaydns == 'string') { obj.args.relaydns = [obj.args.relaydns]; }
1654
+ if (obj.common.validateStrArray(obj.args.relaydns, 1) == false) { delete obj.args.relaydns; }
1655
+
1656
// Start the HTTP relay web server if needed
1653
- if ((typeof obj.args.relaydns != 'string') && (typeof obj.args.relayport == 'number') && (obj.args.relayport != 0)) {
1657
+ if ((obj.args.relaydns != null) && (typeof obj.args.relayport == 'number') && (obj.args.relayport != 0)) {
1658
obj.webrelayserver = require('./webrelayserver.js').CreateWebRelayServer(obj, obj.db, obj.args, obj.certificates, function () { });
1659
}
1660
webrelayserver.js
+1
-1
@@ -207,7 +207,7 @@ module.exports.CreateWebRelayServer = function (parent, db, args, certificates,
207
if (xrelaySession != null) { xrelaySession.close(); delete relaySessions[req.session.userid + '/' + req.session.x]; }
208
209
// Create a web relay session
210
- const relaySession = require('./apprelays.js').CreateWebRelaySession(obj, db, req, args, domain, userid, nodeid, addr, port, appid);
210
+ const relaySession = require('./apprelays.js').CreateWebRelaySession(obj, db, req, args, domain, userid, nodeid, addr, port, appid, xrelaySession);
211
relaySession.onclose = function (sessionId) {
212
// Remove the relay session
213
delete relaySessions[sessionId];
webserver.js
+16
-15
@@ -88,7 +88,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
88
89
// Web relay sessions
90
var webRelayNextSessionId = 1;
91
- var webRelaySessions = {} // RelayID --> Web Mutli-Tunnel
91
+ var webRelaySessions = {} // UserId/SessionId/Host --> Web Relay Session
92
var webRelayCleanupTimer = null;
93
94
// Mesh Rights
@@ -2871,8 +2871,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
2871
webstate: encodeURIComponent(webstate).replace(/'/g, '%27'),
2872
amtscanoptions: amtscanoptions,
2873
pluginHandler: (parent.pluginHandler == null) ? 'null' : parent.pluginHandler.prepExports(),
2874
- webRelayPort: ((typeof args.relaydns == 'string') ? ((typeof args.aliasport == 'number') ? args.aliasport : args.port) : ((parent.webrelayserver != null) ? ((typeof args.relayaliasport == 'number') ? args.relayaliasport : parent.webrelayserver.port) : 0)),
2875
- webRelayDns: ((typeof args.relaydns == 'string') ? args.relaydns : '')
2874
+ webRelayPort: ((args.relaydns != null) ? ((typeof args.aliasport == 'number') ? args.aliasport : args.port) : ((parent.webrelayserver != null) ? ((typeof args.relayaliasport == 'number') ? args.relayaliasport : parent.webrelayserver.port) : 0)),
2875
+ webRelayDns: ((args.relaydns != null) ? args.relaydns[0] : '')
2876
}, dbGetFunc.req, domain), user);
2877
}
2878
xdbGetFunc.req = req;
@@ -5772,7 +5772,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
5772
5773
// Handle all incoming web sockets, see if some need to be handled as web relays
5774
obj.app.ws('/*', function (ws, req, next) {
5775
- if ((obj.webRelayRouter != null) && (req.hostname == obj.args.relaydns)) { handleWebRelayWebSocket(ws, req); return; }
5775
+ if ((obj.webRelayRouter != null) && (obj.args.relaydns.indexOf(req.hostname) >= 0)) { handleWebRelayWebSocket(ws, req); return; }
5776
return next();
5777
});
5778
@@ -5876,7 +5876,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
5876
}
5877
5878
// If this is a web relay connection, handle it here.
5879
- if ((obj.webRelayRouter != null) && (req.hostname == obj.args.relaydns)) {
5879
+ if ((obj.webRelayRouter != null) && (obj.args.relaydns.indexOf(req.hostname) >= 0)) {
5880
if (['GET', 'POST', 'PUT', 'HEAD'].indexOf(req.method) >= 0) { return obj.webRelayRouter(req, res); } else { res.sendStatus(404); return; }
5881
}
5882
@@ -6580,12 +6580,12 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
6580
6581
// Setup web relay on this web server if needed
6582
// We set this up when a DNS name is used as a web relay instead of a port
6583
- if (typeof obj.args.relaydns == 'string') {
6583
+ if (obj.args.relaydns != null) {
6584
obj.webRelayRouter = require('express').Router();
6585
6586
// This is the magic URL that will setup the relay session
6587
obj.webRelayRouter.get('/control-redirect.ashx', function (req, res, next) {
6588
- if (req.headers.host != obj.args.relaydns) { res.sendStatus(404); return; }
6588
+ if (obj.args.relaydns.indexOf(req.hostname) == -1) { res.sendStatus(404); return; }
6589
if ((req.session.userid == null) && obj.args.user && obj.users['user//' + obj.args.user.toLowerCase()]) { req.session.userid = 'user//' + obj.args.user.toLowerCase(); } // Use a default user if needed
6590
res.set({ 'Cache-Control': 'no-store' });
6591
parent.debug('web', 'webRelaySetup');
@@ -6613,7 +6613,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
6613
const appid = parseInt(req.query.appid);
6614
6615
// Check to see if we already have a multi-relay session that matches exactly this device and port for this user
6616
- const xrelaySession = webRelaySessions[req.session.userid + '/' + req.session.x];
6616
+ const xrelaySessionId = req.session.userid + '/' + req.session.x + '/' + req.hostname;
6617
+ const xrelaySession = webRelaySessions[xrelaySessionId];
6618
if ((xrelaySession != null) && (xrelaySession.domain.id == domain.id) && (xrelaySession.userid == userid) && (xrelaySession.nodeid == nodeid) && (xrelaySession.addr == addr) && (xrelaySession.port == port) && (xrelaySession.appid == appid)) {
6619
// We found an exact match, we are all setup already, redirect to root
6620
res.redirect('/');
@@ -6623,11 +6624,11 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
6624
// There is a relay session, but it's not correct, close it.
6625
if (xrelaySession != null) {
6626
xrelaySession.close();
6626
- delete webRelaySessions[req.session.userid + '/' + req.session.x];
6627
+ delete webRelaySessions[xrelaySessionId];
6628
}
6629
6630
// Create a web relay session
6630
- const relaySession = require('./apprelays.js').CreateWebRelaySession(obj, db, req, args, domain, userid, nodeid, addr, port, appid);
6631
+ const relaySession = require('./apprelays.js').CreateWebRelaySession(obj, db, req, args, domain, userid, nodeid, addr, port, appid, xrelaySessionId);
6632
relaySession.onclose = function (sessionId) {
6633
// Remove the relay session
6634
delete webRelaySessions[sessionId];
@@ -6636,7 +6637,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
6637
}
6638
6639
// Set the multi-tunnel session
6639
- webRelaySessions[userid + '/' + req.session.x] = relaySession;
6640
+ webRelaySessions[xrelaySessionId] = relaySession;
6641
6642
// Setup the cleanup timer if needed
6643
if (obj.cleanupTimer == null) { webRelayCleanupTimer = setInterval(checkWebRelaySessionsTimeout, 10000); }
@@ -6701,7 +6702,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
6702
// Handle an incoming request as a web relay
6703
function handleWebRelayRequest(req, res) {
6704
if ((req.session.userid != null) && (req.session.x != null) && (obj.destroyedSessions[req.session.userid + '/' + req.session.x] == null)) {
6704
- var relaySession = webRelaySessions[req.session.userid + '/' + req.session.x];
6705
+ var relaySession = webRelaySessions[req.session.userid + '/' + req.session.x + '/' + req.hostname];
6706
if (relaySession != null) {
6707
// The web relay session is valid, use it
6708
relaySession.handleRequest(req, res);
@@ -6718,7 +6719,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
6719
// Handle an incoming websocket connection as a web relay
6720
function handleWebRelayWebSocket(ws, req) {
6721
if ((req.session.userid != null) && (req.session.x != null) && (obj.destroyedSessions[req.session.userid + '/' + req.session.x] == null)) {
6721
- var relaySession = webRelaySessions[req.session.userid + '/' + req.session.x];
6722
+ var relaySession = webRelaySessions[req.session.userid + '/' + req.session.x + '/' + req.hostname];
6723
if (relaySession != null) {
6724
// The multi-tunnel session is valid, use it
6725
relaySession.handleWebSocket(ws, req);
@@ -7184,7 +7185,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
7185
} else {
7186
obj.tcpServer = obj.tlsServer.listen(port, addr, function () {
7187
console.log('MeshCentral HTTPS server running on ' + certificates.CommonName + ':' + port + ((typeof args.aliasport == 'number') ? (', alias port ' + args.aliasport) : '') + '.');
7187
- if (typeof args.relaydns == 'string') { console.log('MeshCentral HTTPS relay server running on ' + args.relaydns + ':' + port + ((typeof args.aliasport == 'number') ? (', alias port ' + args.aliasport) : '') + '.'); }
7188
+ if (args.relaydns != null) { console.log('MeshCentral HTTPS relay server running on ' + args.relaydns[0] + ':' + port + ((typeof args.aliasport == 'number') ? (', alias port ' + args.aliasport) : '') + '.'); }
7189
});
7190
obj.parent.updateServerState('servername', certificates.CommonName);
7191
}
@@ -7194,7 +7195,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
7195
} else {
7196
obj.tcpServer = obj.app.listen(port, addr, function () {
7197
console.log('MeshCentral HTTP server running on port ' + port + ((typeof args.aliasport == 'number') ? (', alias port ' + args.aliasport) : '') + '.');
7197
- if (typeof args.relaydns == 'string') { console.log('MeshCentral HTTP relay server running on ' + args.relaydns + ':' + port + ((typeof args.aliasport == 'number') ? (', alias port ' + args.aliasport) : '') + '.'); }
7198
+ if (args.relaydns != null) { console.log('MeshCentral HTTP relay server running on ' + args.relaydns[0] + ':' + port + ((typeof args.aliasport == 'number') ? (', alias port ' + args.aliasport) : '') + '.'); }
7199
});
7200
obj.parent.updateServerState('http-port', port);
7201
if (args.aliasport != null) { obj.parent.updateServerState('http-aliasport', args.aliasport); }