Ylianst/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-26 07:23:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improved fix for #2687

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2021-05-25 15:36:29 -07:00
parent ba7ab1cda4
commit 574bff2518
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meshrelay.js
View File

@ -615,6 +615,19 @@ function CreateMeshRelayEx(parent, ws, req, domain, user, cookie) {
closeBothSides();
});
// Set the session expire timer
function setExpireTimer() {
if (obj.expireTimer != null) { clearTimeout(obj.expireTimer); delete obj.expireTimer; }
if (cookie && (typeof cookie.expire == 'number')) {
const timeToExpire = (cookie.expire - currentTime);
if (timeToExpire >= 0x7FFFFFFF) {
obj.expireTimer = setTimeout(setExpireTimer, 0x7FFFFFFF);
} else {
obj.expireTimer = setTimeout(closeBothSides, timeToExpire);
}
}
}
// Close both our side and the peer side.
function closeBothSides() {
if (obj.id != null) {
@ -770,10 +783,7 @@ function CreateMeshRelayEx(parent, ws, req, domain, user, cookie) {
}
// If this session has a expire time, setup the expire timer now.
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.
}
setExpireTimer();
// Mark this relay session as authenticated if this is the user end.
obj.authenticated = (user != null);