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

More work on automatic inactive device removal.

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2021-08-01 10:54:14 -07:00
parent db9e824121
commit 896a613a65
5 changed files with 954 additions and 924 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
meshcentral-config-schema.json
View file

@ -295,6 +295,7 @@
"footer": { "type": "string", "default": null, "description": "This is a HTML string displayed at the bottom of the web page when a user is logged in." }, "footer": { "type": "string", "default": null, "description": "This is a HTML string displayed at the bottom of the web page when a user is logged in." },
"loginfooter": { "type": "string", "default": null, "description": "This is a HTML string displayed at the bottom of the web page when a user is not logged in." }, "loginfooter": { "type": "string", "default": null, "description": "This is a HTML string displayed at the bottom of the web page when a user is not logged in." },
"guestDeviceSharing": { "type": "boolean", "default": true, "description": "When set to false, the desktop/terminal sharing link feature is not available." }, "guestDeviceSharing": { "type": "boolean", "default": true, "description": "When set to false, the desktop/terminal sharing link feature is not available." },
"autoRemoveInactiveDevices": { "type": "integer", "default": 0, "description": "Number of days a device can be inactive before it's removed. 0 disables this feature. Device group setting will override this value." },
"altMessenging": { "altMessenging": {
"type": "object", "type": "object",
"properties": { "properties": {

1
meshuser.js
View file

@ -506,6 +506,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
serverinfo.redirport = args.redirport; serverinfo.redirport = args.redirport;
if (parent.parent.webpush != null) { serverinfo.vapidpublickey = parent.parent.webpush.vapidPublicKey; } // Web push public key if (parent.parent.webpush != null) { serverinfo.vapidpublickey = parent.parent.webpush.vapidPublicKey; } // Web push public key
if (parent.parent.amtProvisioningServer != null) { serverinfo.amtProvServerMeshId = parent.parent.amtProvisioningServer.meshid; } // Device group that allows for bare-metal Intel AMT activation if (parent.parent.amtProvisioningServer != null) { serverinfo.amtProvServerMeshId = parent.parent.amtProvisioningServer.meshid; } // Device group that allows for bare-metal Intel AMT activation
if ((typeof domain.autoremoveinactivedevices == 'number') && (domain.autoremoveinactivedevices > 0)) { serverinfo.autoremoveinactivedevices = domain.autoremoveinactivedevices; } // Default number of days before inactive devices are removed
// Build the mobile agent URL, this is used to connect mobile devices // Build the mobile agent URL, this is used to connect mobile devices
var agentServerName = parent.getWebServerName(domain); var agentServerName = parent.getWebServerName(domain);

1
sample-config-advanced.json
View file

@ -138,6 +138,7 @@
"_meshQuota": 248576, "_meshQuota": 248576,
"minify": true, "minify": true,
"_guestDeviceSharing" : false, "_guestDeviceSharing" : false,
"_AutoRemoveInactiveDevices": 37,
"_loginKey": [ "abc", "123" ], "_loginKey": [ "abc", "123" ],
"_newAccounts": true, "_newAccounts": true,
"_newAccountsUserGroups": [ "ugrp//xxxxxxxxxxxxxxxxx" ], "_newAccountsUserGroups": [ "ugrp//xxxxxxxxxxxxxxxxx" ],

1866
translate/translate.json
View file

File diff suppressed because it is too large Load diff

9
views/default.handlebars
View file

@ -11469,6 +11469,15 @@
} }
x += '<div><label><input type=checkbox id=d20expireDevice onchange=p20editmeshfeaturesValidate() ' + ((expire > 0) ? 'checked' : '') + '>' + "Automatically remove inactive devices" + '</label><br></div>'; x += '<div><label><input type=checkbox id=d20expireDevice onchange=p20editmeshfeaturesValidate() ' + ((expire > 0) ? 'checked' : '') + '>' + "Automatically remove inactive devices" + '</label><br></div>';
x += '<div style=margin-left:20px id=d20expireDeviceDev>' + "Inactivate days until removal" + ' <label><input type=number inputmode=numeric onchange=p20editmeshfeaturesValidate() onkeyup=p20editmeshfeaturesValidate() onpaste=p20editmeshfeaturesValidate() onkeydown=p20editmeshfeaturesValidate() maxlength=4 min=1 max=2000 style=width:80px value=\"' + ((expire == 0)?30:expire) + '\" id=d20expireDeviceDays></label><br></div>'; x += '<div style=margin-left:20px id=d20expireDeviceDev>' + "Inactivate days until removal" + ' <label><input type=number inputmode=numeric onchange=p20editmeshfeaturesValidate() onkeyup=p20editmeshfeaturesValidate() onpaste=p20editmeshfeaturesValidate() onkeydown=p20editmeshfeaturesValidate() maxlength=4 min=1 max=2000 style=width:80px value=\"' + ((expire == 0)?30:expire) + '\" id=d20expireDeviceDays></label><br></div>';
if (serverinfo.autoremoveinactivedevices) {
if (serverinfo.autoremoveinactivedevices == 1) {
x += format('<span style=font-size:x-small;margin-left:6px>' + "By default, inactive devices will be removed after 1 day." + '</span>', serverinfo.autoremoveinactivedevices);
} else {
x += format('<span style=font-size:x-small;margin-left:6px>' + "By default, inactive devices will be removed after {0} days." + '</span>', serverinfo.autoremoveinactivedevices);
}
}
setDialogMode(2, "Edit Device Group Features", 3, p20editmeshfeaturesEx, x); setDialogMode(2, "Edit Device Group Features", 3, p20editmeshfeaturesEx, x);
p20editmeshfeaturesValidate(); p20editmeshfeaturesValidate();
} }