MyFavMirrors
/
MeshCentral
mirror of https://github.com/Ylianst/MeshCentral.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for #2687. Relay would not work for very long expire times.

This commit is contained in:
Ylian Saint-Hilaire 2021-05-25 12:35:41 -07:00
parent 28c4a0ed53
commit a1cb07670d
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meshrelay.js
View File

@ -144,7 +144,7 @@ function CreateMeshRelayEx(parent, ws, req, domain, user, cookie) {
delete obj.id; delete obj.id;
delete obj.ws; delete obj.ws;
delete obj.peer; delete obj.peer;
delete obj.expireTimer; if (obj.expireTimer != null) { clearTimeout(obj.expireTimer); delete obj.expireTimer; }
// Unsubscribe // Unsubscribe
if (obj.pid != null) { parent.parent.RemoveAllEventDispatch(obj); } if (obj.pid != null) { parent.parent.RemoveAllEventDispatch(obj); }
@ -295,6 +295,13 @@ function CreateMeshRelayEx(parent, ws, req, domain, user, cookie) {
} }
} }
// Check that both sides have websocket connections
if ((obj.ws == null) || (relayinfo.peer1.ws == null)) {
relayinfo.peer1.close();
obj.close();
return null;
}
// Connect to peer // Connect to peer
obj.peer = relayinfo.peer1; obj.peer = relayinfo.peer1;
obj.peer.peer = obj; obj.peer.peer = obj;
@ -767,7 +774,10 @@ function CreateMeshRelayEx(parent, ws, req, domain, user, cookie) {
} }
// If this session has a expire time, setup the expire timer now. // If this session has a expire time, setup the expire timer now.
if (cookie && (typeof cookie.expire == 'number')) { obj.expireTimer = setTimeout(closeBothSides, cookie.expire - currentTime); } if (cookie && (typeof cookie.expire == 'number')) {
const timeToExpire = (cookie.expire - currentTime);
if (timeToExpire < 0x7FFFFFFF) { obj.expireTimer = setTimeout(closeBothSides, timeToExpire); } // Only set the timeout if it fits in 32bit signed integer.
}
// Mark this relay session as authenticated if this is the user end. // Mark this relay session as authenticated if this is the user end.
obj.authenticated = (user != null); obj.authenticated = (user != null);
@ -1097,7 +1107,7 @@ function CreateLocalRelayEx(parent, ws, req, domain, user, cookie) {
delete obj.nodeid; delete obj.nodeid;
delete obj.meshid; delete obj.meshid;
delete obj.tcpport; delete obj.tcpport;
delete obj.expireTimer; if (obj.expireTimer != null) { clearTimeout(obj.expireTimer); delete obj.expireTimer; }
if (obj.client != null) { obj.client.destroy(); delete obj.client; } // Close the client socket if (obj.client != null) { obj.client.destroy(); delete obj.client; } // Close the client socket
if (obj.pingtimer != null) { clearInterval(obj.pingtimer); delete obj.pingtimer; } if (obj.pingtimer != null) { clearInterval(obj.pingtimer); delete obj.pingtimer; }
if (obj.pongtimer != null) { clearInterval(obj.pongtimer); delete obj.pongtimer; } if (obj.pongtimer != null) { clearInterval(obj.pongtimer); delete obj.pongtimer; }