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

Added extra server permission to see all server events.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2020-08-18 12:46:20 -07:00
parent 870600bce4
commit dca7e2c088
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meshuser.js
View File

@ -63,6 +63,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
const SITERIGHT_USERGROUPS = 0x00000100; const SITERIGHT_USERGROUPS = 0x00000100;
const SITERIGHT_RECORDINGS = 0x00000200; const SITERIGHT_RECORDINGS = 0x00000200;
const SITERIGHT_LOCKSETTINGS = 0x00000400; const SITERIGHT_LOCKSETTINGS = 0x00000400;
const SITERIGHT_ALLEVENTS = 0x00000800;
const SITERIGHT_ADMIN = 0xFFFFFFFF; const SITERIGHT_ADMIN = 0xFFFFFFFF;
var obj = {}; var obj = {};

7
views/default.handlebars
View File

@ -11052,6 +11052,7 @@
x += '<div id=d2MngUsr><label><input type=checkbox onchange=showUserAdminDialogValidate() id=ua_manageusers>' + "Manage Users" + '</label><br></div>'; x += '<div id=d2MngUsr><label><input type=checkbox onchange=showUserAdminDialogValidate() id=ua_manageusers>' + "Manage Users" + '</label><br></div>';
x += '<div id=d2MngGrp><label><input type=checkbox onchange=showUserAdminDialogValidate() id=ua_manageusergroups>' + "Manage User Groups" + '</label><br></div>'; x += '<div id=d2MngGrp><label><input type=checkbox onchange=showUserAdminDialogValidate() id=ua_manageusergroups>' + "Manage User Groups" + '</label><br></div>';
x += '<div id=d2MngRec><label><input type=checkbox onchange=showUserAdminDialogValidate() id=ua_managerecordings>' + "Manage Recordings" + '</label><br></div>'; x += '<div id=d2MngRec><label><input type=checkbox onchange=showUserAdminDialogValidate() id=ua_managerecordings>' + "Manage Recordings" + '</label><br></div>';
x += '<div id=d2AllEvnt><label><input type=checkbox onchange=showUserAdminDialogValidate() id=ua_allevents>' + "View All Events" + '</label><br></div>';
if (x != '') { x += '<hr/>'; } if (x != '') { x += '<hr/>'; }
x = '<div><div id=d2AdminPermissions>' + x; x = '<div><div id=d2AdminPermissions>' + x;
x += '<label><input type=checkbox onchange=showUserAdminDialogValidate() id=ua_lockedaccount>' + "Lock Account" + '</label><br>'; x += '<label><input type=checkbox onchange=showUserAdminDialogValidate() id=ua_lockedaccount>' + "Lock Account" + '</label><br>';
@ -11083,6 +11084,10 @@
Q('ua_managerecordings').checked = ((user.siteadmin != 0xFFFFFFFF) && ((user.siteadmin & 512) != 0)); // Manage Recordings Q('ua_managerecordings').checked = ((user.siteadmin != 0xFFFFFFFF) && ((user.siteadmin & 512) != 0)); // Manage Recordings
QE('ua_managerecordings', !uself && (userinfo.siteadmin & 512)); QE('ua_managerecordings', !uself && (userinfo.siteadmin & 512));
} }
if ((userinfo.siteadmin & 2048) != 0) {
Q('ua_allevents').checked = ((user.siteadmin != 0xFFFFFFFF) && ((user.siteadmin & 2048) != 0)); // View all events
QE('ua_allevents', !uself && (userinfo.siteadmin & 2048));
}
QE('ua_fulladmin', !uself && (userinfo.siteadmin == 0xFFFFFFFF)); QE('ua_fulladmin', !uself && (userinfo.siteadmin == 0xFFFFFFFF));
QE('ua_serverbackup', !uself && (userinfo.siteadmin == 0xFFFFFFFF)); QE('ua_serverbackup', !uself && (userinfo.siteadmin == 0xFFFFFFFF));
@ -11117,6 +11122,7 @@
QE('ua_nomeshcmd', !Q('ua_fulladmin').checked); QE('ua_nomeshcmd', !Q('ua_fulladmin').checked);
QE('ua_manageusergroups', !Q('ua_fulladmin').checked); QE('ua_manageusergroups', !Q('ua_fulladmin').checked);
QE('ua_managerecordings', !Q('ua_fulladmin').checked); QE('ua_managerecordings', !Q('ua_fulladmin').checked);
QE('ua_allevents', !Q('ua_fulladmin').checked);
QE('ua_locksettings', !Q('ua_fulladmin').checked); QE('ua_locksettings', !Q('ua_fulladmin').checked);
QE('ua_fileaccessquota', Q('ua_fileaccess').checked && !Q('ua_fulladmin').checked); QE('ua_fileaccessquota', Q('ua_fileaccess').checked && !Q('ua_fulladmin').checked);
} }
@ -11136,6 +11142,7 @@
if (Q('ua_manageusergroups').checked == true) siteadmin += 256; if (Q('ua_manageusergroups').checked == true) siteadmin += 256;
if (Q('ua_managerecordings').checked == true) siteadmin += 512; if (Q('ua_managerecordings').checked == true) siteadmin += 512;
if (Q('ua_locksettings').checked == true) siteadmin += 1024; if (Q('ua_locksettings').checked == true) siteadmin += 1024;
if (Q('ua_allevents').checked == true) siteadmin += 2048;
} }
var x = { action: 'edituser', id: user._id, siteadmin: siteadmin }; var x = { action: 'edituser', id: user._id, siteadmin: siteadmin };
if (isNaN(quota) == false) { x.quota = (quota * 1024); } if (isNaN(quota) == false) { x.quota = (quota * 1024); }

6
webserver.js
View File

@ -3193,9 +3193,9 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
const user = obj.users[userid]; const user = obj.users[userid];
const subscriptions = [userid, 'server-global']; const subscriptions = [userid, 'server-global'];
if (user.siteadmin != null) { if (user.siteadmin != null) {
// Allow full site administrators and user managers to get all events. // Allow full site administrators of users with all events rights to see all events.
if ((user.siteadmin == 0xFFFFFFFF) || ((user.siteadmin & 2) != 0)) subscriptions.push('*'); if ((user.siteadmin == 0xFFFFFFFF) || ((user.siteadmin & 2048) != 0)) { subscriptions.push('*'); }
if ((user.siteadmin & 2) != 0) { else if ((user.siteadmin & 2) != 0) {
if ((user.groups == null) || (user.groups.length == 0)) { if ((user.groups == null) || (user.groups.length == 0)) {
// Subscribe to all user changes // Subscribe to all user changes
subscriptions.push('server-users'); subscriptions.push('server-users');