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

Add support for logoutOnIdleSessionTimeout (#6773)

Browse source
This commit is contained in:
Martin Mädler 2025-02-12 11:04:10 +01:00 committed by GitHub
parent 0b376fe5a0
commit 9d4f51e970
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
meshcentral-config-schema.json
View file

@ -2180,6 +2180,11 @@
"default": null,
"description": "When set, idle users will be disconnected after a set amounts of minutes."
},
"logoutOnIdleSessionTimeout": {
"type": "boolean",
"default": true,
"description": "Determines whether MeshCentral should logout after the session idle timeout elapsed or should just disconnect remote desktop, terminal and files."
},
"userConsentFlags": {
"type": "object",
"description": "Use this section to require user consent for this domain.",

8
meshuser.js
View file

@ -600,7 +600,13 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
}
}
if (typeof domain.userconsentflags == 'number') { serverinfo.consent = domain.userconsentflags; }
if ((typeof domain.usersessionidletimeout == 'number') && (domain.usersessionidletimeout > 0)) { serverinfo.timeout = (domain.usersessionidletimeout * 60 * 1000); }
if ((typeof domain.usersessionidletimeout == 'number') && (domain.usersessionidletimeout > 0)) {serverinfo.timeout = (domain.usersessionidletimeout * 60 * 1000); }
if (typeof domain.logoutOnIdleSessionTimeout == 'boolean') {
serverinfo.logoutOnIdleSessionTimeout = domain.logoutOnIdleSessionTimeout;
} else {
// Default
serverinfo.logoutOnIdleSessionTimeout = true;
}
if (user.siteadmin === SITERIGHT_ADMIN) {
if (parent.parent.config.settings.managealldevicegroups.indexOf(user._id) >= 0) { serverinfo.manageAllDeviceGroups = true; }
if (obj.crossDomain === true) { serverinfo.crossDomain = []; for (var i in parent.parent.config.domains) { serverinfo.crossDomain.push(i); } }

2
sample-config-advanced.json
View file

@ -386,6 +386,8 @@
"_agentBlockedIP": "127.0.0.1,::1",
"___userSessionIdleTimeout__": "Number of user idle minutes before auto-disconnect",
"_userSessionIdleTimeout": 30,
"___logoutOnIdleSessionTimeout": "Determines whether MeshCentral should logout after the session idle timeout elapsed or should just disconnect remote desktop, terminal and files.",
"_logoutOnIdleSessionTimeout": false,
"userConsentFlags": {
"desktopnotify": true,
"terminalnotify": true,

7
views/default-mobile.handlebars
View file

@ -1522,7 +1522,12 @@
}
function setSessionActivity() { sessionActivity = Date.now(); }
function checkIdleSessionTimeout() { var delta = (Date.now() - sessionActivity); if (delta > serverinfo.timeout) { window.location.href = 'logout'; } }
function checkIdleSessionTimeout() {
var delta = (Date.now() - sessionActivity);
if (delta > serverinfo.timeout && serverinfo.logoutOnIdleSessionTimeout) {
window.location.href = 'logout';
}
}
function onMessage(server, message) {
switch (message.action) {

4
views/default.handlebars
View file

@ -2447,7 +2447,9 @@
files.Stop();
files = null;
}
window.location.href = 'logout';
if (serverinfo.logoutOnIdleSessionTimeout) {
window.location.href = 'logout';
}
} else {
var ds = Math.round((serverinfo.timeout - delta) / 1000);
if (ds <= 60) {

4
views/default3.handlebars
View file

@ -2897,7 +2897,9 @@
files.Stop();
files = null;
}
window.location.href = 'logout';
if (serverinfo.logoutOnIdleSessionTimeout) {
window.location.href = 'logout';
}
} else {
var ds = Math.round((serverinfo.timeout - delta) / 1000);
if (ds <= 60) {

7
views/sharing-mobile.handlebars
View file

@ -820,7 +820,12 @@
}
function setSessionActivity() { sessionActivity = Date.now(); }
function checkIdleSessionTimeout() { var delta = (Date.now() - sessionActivity); if (delta > serverinfo.timeout) { window.location.href = 'logout'; } }
function checkIdleSessionTimeout() {
var delta = (Date.now() - sessionActivity);
if (delta > serverinfo.timeout && serverinfo.logoutOnIdleSessionTimeout) {
window.location.href = 'logout';
}
}
//
// Menu System