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

More user groups improvements.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2020-01-02 01:26:12 -08:00
parent 2a2034bddc
commit 58d9903619
3 changed files with 96 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
meshuser.js
View File

@ -1574,10 +1574,9 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
var ugroupidsplit = command.ugrpid.split('/'); var ugroupidsplit = command.ugrpid.split('/');
if ((ugroupidsplit.length != 3) || (ugroupidsplit[0] != 'ugrp') || (ugroupidsplit[1] != domain.id)) break; if ((ugroupidsplit.length != 3) || (ugroupidsplit[0] != 'ugrp') || (ugroupidsplit[1] != domain.id)) break;
db.Get(command.ugrpid, function (err, groups) { // Get the user group
if ((err != null) || (groups.length != 1)) return; var group = parent.userGroups[command.ugrpid];
var group = common.unEscapeLinksFieldName(groups[0]), change = ''; if (group != null) {
if ((common.validateString(command.name, 1, 64) == true) && (command.name != group.name) && (command.name.indexOf(' ') == -1)) { change = 'User group name changed from "' + group.name + '" to "' + command.name + '"'; group.name = command.name; } if ((common.validateString(command.name, 1, 64) == true) && (command.name != group.name) && (command.name.indexOf(' ') == -1)) { change = 'User group name changed from "' + group.name + '" to "' + command.name + '"'; group.name = command.name; }
if ((common.validateString(command.desc, 0, 1024) == true) && (command.desc != group.desc)) { if (change != '') change += ' and description changed'; else change += 'User group "' + group.name + '" description changed'; group.desc = command.desc; } if ((common.validateString(command.desc, 0, 1024) == true) && (command.desc != group.desc)) { if (change != '') change += ' and description changed'; else change += 'User group "' + group.name + '" description changed'; group.desc = command.desc; }
if (change != '') { if (change != '') {
@ -1586,7 +1585,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
if (db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the mesh. Another event will come. if (db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the mesh. Another event will come.
parent.parent.DispatchEvent(['*', group._id, user._id], obj, event); parent.parent.DispatchEvent(['*', group._id, user._id], obj, event);
} }
}); }
break; break;
} }
case 'addusertousergroup': case 'addusertousergroup':
@ -1608,9 +1607,9 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
break; break;
} }
db.Get(command.ugrpid, function (err, groups) { // Get the user group
if ((err != null) || (groups.length != 1)) { try { ws.send(JSON.stringify({ action: 'addusertousergroup', responseid: command.responseid, result: 'Invalid groupid' })); } catch (ex) { } return; } var group = parent.userGroups[command.ugrpid];
var group = common.unEscapeLinksFieldName(groups[0]); if (group != null) {
if (group.links == null) { group.links = {}; } if (group.links == null) { group.links = {}; }
var unknownUsers = [], addedCount = 0, failCount = 0; var unknownUsers = [], addedCount = 0, failCount = 0;
@ -1630,14 +1629,8 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
if (db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the user. Another event will come. if (db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the user. Another event will come.
parent.parent.DispatchEvent(targets, obj, event); parent.parent.DispatchEvent(targets, obj, event);
// Add a user to the mesh // Add a user to the user group
group.links[chguserid] = { userid: chguser.id, name: chguser.name, rights: 1 }; group.links[chguserid] = { userid: chguser.id, name: chguser.name, rights: 1 };
db.Set(common.escapeLinksFieldName(group));
// Notify user group change
var event = { etype: 'ugrp', userid: user._id, username: user.name, ugrpid: group._id, name: group.name, desc: group.desc, action: 'usergroupchange', links: group.links, msg: 'Added user ' + chguser.name + ' to user group ' + group.name, domain: domain.id };
if (db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the user group. Another event will come.
parent.parent.DispatchEvent(['*', group._id, user._id, chguserid], obj, event);
addedCount++; addedCount++;
} else { } else {
unknownUsers.push(command.usernames[i]); unknownUsers.push(command.usernames[i]);
@ -1645,13 +1638,24 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
} }
} }
if (addedCount > 0) {
// Save the new group to the database
db.Set(common.escapeLinksFieldName(group));
// Notify user group change
var event = { etype: 'ugrp', userid: user._id, username: user.name, ugrpid: group._id, name: group.name, desc: group.desc, action: 'usergroupchange', links: group.links, msg: 'Added user ' + chguser.name + ' to user group ' + group.name, domain: domain.id };
if (db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the user group. Another event will come.
parent.parent.DispatchEvent(['*', group._id, user._id, chguserid], obj, event);
}
if (unknownUsers.length > 0) { if (unknownUsers.length > 0) {
// Send error back, user not found. // Send error back, user not found.
displayNotificationMessage('User' + ((unknownUsers.length > 1) ? 's' : '') + ' ' + EscapeHtml(unknownUsers.join(', ')) + ' not found.', 'Device Group', 'ServerNotify'); displayNotificationMessage('User' + ((unknownUsers.length > 1) ? 's' : '') + ' ' + EscapeHtml(unknownUsers.join(', ')) + ' not found.', 'Device Group', 'ServerNotify');
} }
}
if (command.responseid != null) { try { ws.send(JSON.stringify({ action: 'addusertousergroup', responseid: command.responseid, result: 'ok', added: addedCount, failed: failCount })); } catch (ex) { } } if (command.responseid != null) { try { ws.send(JSON.stringify({ action: 'addusertousergroup', responseid: command.responseid, result: 'ok', added: addedCount, failed: failCount })); } catch (ex) { } }
});
break; break;
} }
case 'removeuserfromusergroup': case 'removeuserfromusergroup':
@ -1673,11 +1677,6 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
break; break;
} }
db.Get(command.ugrpid, function (err, groups) {
//if ((err != null) || (groups.length != 1)) { try { ws.send(JSON.stringify({ action: 'addusertousergroup', responseid: command.responseid, result: 'Invalid groupid' })); } catch (ex) { } return; }
var group = null;
if ((err == null) && (groups.length == 1)) { group = common.unEscapeLinksFieldName(groups[0]); }
// Check if the user exists // Check if the user exists
var chguser = parent.users[command.userid]; var chguser = parent.users[command.userid];
if (chguser != null) { if (chguser != null) {
@ -1696,6 +1695,8 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
parent.parent.DispatchEvent([chguser._id], obj, 'resubscribe'); parent.parent.DispatchEvent([chguser._id], obj, 'resubscribe');
} }
// Get the user group
var group = parent.userGroups[command.ugrpid];
if (group != null) { if (group != null) {
// Remove the user from the group // Remove the user from the group
if ((group.links != null) && (group.links[command.userid] != null)) { if ((group.links != null) && (group.links[command.userid] != null)) {
@ -1712,7 +1713,6 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
} }
} }
} }
});
break; break;
} }
@ -2027,6 +2027,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
// Remove all user links to this mesh // Remove all user links to this mesh
for (var j in mesh.links) { for (var j in mesh.links) {
if (j.startsWith('user/')) {
var xuser = parent.users[j]; var xuser = parent.users[j];
if (xuser && xuser.links) { if (xuser && xuser.links) {
delete xuser.links[mesh._id]; delete xuser.links[mesh._id];
@ -2039,6 +2040,19 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
if (db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the user. Another event will come. if (db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the user. Another event will come.
parent.parent.DispatchEvent(targets, obj, event); parent.parent.DispatchEvent(targets, obj, event);
} }
} else if (j.startsWith('ugrp/')) {
var xgroup = parent.userGroups[j];
if (xgroup && xgroup.links) {
delete xgroup.links[mesh._id];
db.Set(xgroup);
// Notify user group change
var targets = ['*', 'server-ugroups', user._id, xgroup._id];
var event = { etype: 'ugrp', username: user.name, ugrpid: xgroup._id, name: xgroup.name, desc: xgroup.desc, action: 'usergroupchange', links: xgroup.links, msg: 'User group changed: ' + xgroup.name, domain: domain.id };
if (db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the user. Another event will come.
parent.parent.DispatchEvent(targets, obj, event);
}
}
} }
// Delete all files on the server for this mesh // Delete all files on the server for this mesh
@ -2125,7 +2139,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
if (newuserid == obj.user._id) { continue; } if (newuserid == obj.user._id) { continue; }
// Add mesh to user or user group // Add mesh to user or user group
if (newuser.links == null) newuser.links = {}; if (newuser.links == null) { newuser.links = {}; }
if (newuser.links[command.meshid]) { newuser.links[command.meshid].rights = command.meshadmin; } else { newuser.links[command.meshid] = { rights: command.meshadmin }; } if (newuser.links[command.meshid]) { newuser.links[command.meshid].rights = command.meshadmin; } else { newuser.links[command.meshid] = { rights: command.meshadmin }; }
if (newuserid.startsWith('user/')) { db.SetUser(newuser); } if (newuserid.startsWith('user/')) { db.SetUser(newuser); }
else if (newuserid.startsWith('ugrp/')) { db.Set(newuser); } else if (newuserid.startsWith('ugrp/')) { db.Set(newuser); }

22
translate/translate.json
View File

@ -4168,7 +4168,7 @@
"nl": "Apparaatgroepen", "nl": "Apparaatgroepen",
"xloc": [ "xloc": [
"default.handlebars->container->column_l->p2->9", "default.handlebars->container->column_l->p2->9",
"default.handlebars->23->1246", "default.handlebars->23->1247",
"default.handlebars->23->1258", "default.handlebars->23->1258",
"default.handlebars->23->1313", "default.handlebars->23->1313",
"default.handlebars->23->1386", "default.handlebars->23->1386",
@ -8987,7 +8987,7 @@
"default.handlebars->23->1041", "default.handlebars->23->1041",
"default.handlebars->23->1178", "default.handlebars->23->1178",
"default.handlebars->23->1219", "default.handlebars->23->1219",
"default.handlebars->23->1245", "default.handlebars->23->1246",
"default.handlebars->23->1249", "default.handlebars->23->1249",
"default.handlebars->23->1253", "default.handlebars->23->1253",
"default.handlebars->23->1255", "default.handlebars->23->1255",
@ -14311,7 +14311,7 @@
"nl": "Gebruikers", "nl": "Gebruikers",
"xloc": [ "xloc": [
"default.handlebars->container->topbar->1->1->UsersSubMenuSpan->UsersSubMenu->1->0->UsersGeneral", "default.handlebars->container->topbar->1->1->UsersSubMenuSpan->UsersSubMenu->1->0->UsersGeneral",
"default.handlebars->23->1247", "default.handlebars->23->1248",
"default.handlebars->23->1257", "default.handlebars->23->1257",
"default.handlebars->23->1401" "default.handlebars->23->1401"
] ]
@ -15532,8 +15532,10 @@
}, },
{ {
"en": "Summary -", "en": "Summary -",
"cs": "Souhrn –", "nl": "Samenvatting -",
"nl": "Samenvatting -" "xloc": [
"default.handlebars->container->column_l->p21->p21title->3"
]
}, },
{ {
"en": "Power States", "en": "Power States",
@ -15963,7 +15965,6 @@
] ]
}, },
{ {
"en": "Relay Count",
"en": "Relay Count", "en": "Relay Count",
"cs": "Počet předávání (relay)", "cs": "Počet předávání (relay)",
"xloc": [ "xloc": [
@ -15977,13 +15978,6 @@
"default.handlebars->container->topbar->1->1->MainSubMenuSpan->MainSubMenu->1->0->MainDevAmt" "default.handlebars->container->topbar->1->1->MainSubMenuSpan->MainSubMenu->1->0->MainDevAmt"
] ]
}, },
{
"en": "Summary -",
"nl": "Samenvatting -",
"xloc": [
"default.handlebars->container->column_l->p21->p21title->3"
]
},
{ {
"en": "My User Groups", "en": "My User Groups",
"nl": "Mijn gebruikersgroepen", "nl": "Mijn gebruikersgroepen",
@ -16023,7 +16017,7 @@
"en": "No groups found.", "en": "No groups found.",
"nl": "Geen groepen gevonden.", "nl": "Geen groepen gevonden.",
"xloc": [ "xloc": [
"default.handlebars->23->1248" "default.handlebars->23->1245"
] ]
}, },
{ {

12
views/default.handlebars
View File

@ -7981,7 +7981,7 @@
function p20validateAddMeshUserDialog() { function p20validateAddMeshUserDialog() {
var meshrights = null; var meshrights = null;
if (xxdialogTag === 1) { if ((xxdialogTag === 1) || (xxdialogTag === 3)) {
meshrights = GetMeshRights(decodeURIComponent(Q('dp2groupid').value)); meshrights = GetMeshRights(decodeURIComponent(Q('dp2groupid').value));
} else { } else {
meshrights = GetMeshRights(currentMesh); meshrights = GetMeshRights(currentMesh);
@ -9087,17 +9087,19 @@
function updateUserGroups() { function updateUserGroups() {
// Sort the list of group names // Sort the list of group names
var sortedGroups = []; var sortedGroups = [], x = '';
for (var i in usergroups) { sortedGroups.push(usergroups[i]); } for (var i in usergroups) { sortedGroups.push(usergroups[i]); }
sortedGroups.sort(nameSort); sortedGroups.sort(nameSort);
if (sortedGroups.length == 0) {
x += '<br />' + "No groups found." + '<br />';
} else {
// Display the groups using the sorted list // Display the groups using the sorted list
var x = '<table class=p3usersTable cellpadding=0 cellspacing=0>', addHeader = true; x += '<table class=p3usersTable cellpadding=0 cellspacing=0>';
x += '<th>' + "Name" + '<th style=width:80px>' + "Device Groups" + '<th style=width:80px>' + "Users"; x += '<th>' + "Name" + '<th style=width:80px>' + "Device Groups" + '<th style=width:80px>' + "Users";
for (var i in sortedGroups) { x += addUserGroupHtml(sortedGroups[i]); } for (var i in sortedGroups) { x += addUserGroupHtml(sortedGroups[i]); }
x += '</table>'; x += '</table>';
}
if (sortedGroups.length == 0) { x += '<br />' + "No groups found." + '<br />'; }
QH('p50groups', x); QH('p50groups', x);
// Update current user panel if needed // Update current user panel if needed