external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-02-12 11:01:52 +00:00
Code Issues Releases Wiki Activity

Fix for #2777

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2021-06-15 14:05:51 -07:00
parent db60c35a72
commit ce21e9a8cc
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
meshdesktopmultiplex.js
View file

@ -1118,7 +1118,7 @@ function CreateMeshRelayEx2(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(obj.close, cookie.expire - currentTime); } setExpireTimer();
// 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);
@ -1205,6 +1205,21 @@ function CreateMeshRelayEx2(parent, ws, req, domain, user, cookie) {
} }
} }
// 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 - Date.now());
if (timeToExpire < 1) {
obj.close();
} else if (timeToExpire >= 0x7FFFFFFF) {
obj.expireTimer = setTimeout(setExpireTimer, 0x7FFFFFFF); // Since expire timer can't be larger than 0x7FFFFFFF, reset timer after that time.
} else {
obj.expireTimer = setTimeout(obj.close, timeToExpire);
}
}
}
// If this is not an authenticated session, or the session does not have routing instructions, just go ahead an connect to existing session. // If this is not an authenticated session, or the session does not have routing instructions, just go ahead an connect to existing session.
performRelay(0); performRelay(0);
return obj; return obj;

8
meshrelay.js
View file

@ -619,9 +619,11 @@ function CreateMeshRelayEx(parent, ws, req, domain, user, cookie) {
function setExpireTimer() { function setExpireTimer() {
if (obj.expireTimer != null) { clearTimeout(obj.expireTimer); delete obj.expireTimer; } if (obj.expireTimer != null) { clearTimeout(obj.expireTimer); delete obj.expireTimer; }
if (cookie && (typeof cookie.expire == 'number')) { if (cookie && (typeof cookie.expire == 'number')) {
const timeToExpire = (cookie.expire - currentTime); const timeToExpire = (cookie.expire - Date.now());
if (timeToExpire >= 0x7FFFFFFF) { if (timeToExpire < 1) {
obj.expireTimer = setTimeout(setExpireTimer, 0x7FFFFFFF); closeBothSides();
} else if (timeToExpire >= 0x7FFFFFFF) {
obj.expireTimer = setTimeout(setExpireTimer, 0x7FFFFFFF); // Since expire timer can't be larger than 0x7FFFFFFF, reset timer after that time.
} else { } else {
obj.expireTimer = setTimeout(closeBothSides, timeToExpire); obj.expireTimer = setTimeout(closeBothSides, timeToExpire);
} }