';
++count;
}
@@ -7878,12 +7886,26 @@
var y = '';
for (var i in meshes) { if ((currentUser.links == null) || (currentUser.links[i] == null)) { y += ''; } }
x += addHtmlValue("Device Group", '');
+ } else if (userid === 2) {
+ if ((userinfo.siteadmin & 256) == 0) return;
+ var y = '';
+ for (var i in usergroups) { if ((currentMesh.links == null) || (currentMesh.links[i] == null)) { y += ''; } }
+ x += addHtmlValue("User Group", '');
+ } else if (userid === 3) {
+ var y = '';
+ for (var i in meshes) { if ((currentUserGroup.links == null) || (currentUserGroup.links[i] == null)) { y += ''; } }
+ x += addHtmlValue("Device Group", '');
} else {
userid = decodeURIComponent(userid);
var uname = userid.split('/')[2];
if (users && users[userid]) { uname = users[userid].name; }
+ if (usergroups && usergroups[userid]) { uname = usergroups[userid].name; }
if (userinfo._id == userid) { uname = userinfo.name; }
- x += format("Group permissions for user {0}.", uname) + '
';
+ if (userid.startsWith('ugrp/')) {
+ x += format("Group permissions for {0}.", uname) + '
';
+ } else {
+ x += format("Group permissions for user {0}.", uname) + '
';
+ }
}
x += '
';
x += ' ';
@@ -7909,8 +7931,16 @@
Q('dp20username').focus();
} else if (userid === 1) {
setDialogMode(2, "Add Device Group", 3, p20showAddMeshUserDialogEx, x, userid);
+ } else if (userid === 2) {
+ setDialogMode(2, "Add User Group", 3, p20showAddMeshUserDialogEx, x, userid);
+ } else if (userid === 3) {
+ setDialogMode(2, "Add Device Group", 3, p20showAddMeshUserDialogEx, x, userid);
} else {
- setDialogMode(2, "Edit User Device Group Permissions", 7, p20showAddMeshUserDialogEx, x, userid);
+ if (userid.startsWith('ugrp/')) {
+ setDialogMode(2, "Edit Device Group Permissions", 7, p20showAddMeshUserDialogEx, x, userid);
+ } else {
+ setDialogMode(2, "Edit User Device Group Permissions", 7, p20showAddMeshUserDialogEx, x, userid);
+ }
var cmeshrights = GetMeshRights(currentMesh), meshrights = GetMeshRights(currentMesh, userid);
if (meshrights == 0xFFFFFFFF) {
Q('p20fulladmin').checked = true;
@@ -8031,14 +8061,20 @@
if (t === 1) {
var meshid = decodeURIComponent(Q('dp2groupid').value), mesh = meshes[meshid];
- if (mesh != null) { meshserver.send({ action: 'addmeshuser', meshid: meshid, meshname: mesh.name, usernames: [ currentUser._id.split('/')[2] ], meshadmin: meshadmin }); }
+ if (mesh != null) { meshserver.send({ action: 'addmeshuser', meshid: meshid, meshname: mesh.name, userids: [ currentUser._id ], meshadmin: meshadmin }); }
+ } else if (t === 2) {
+ var ugrpid = decodeURIComponent(Q('dp2groupid').value), mesh = meshes[currentMesh._id];
+ if (mesh != null) { meshserver.send({ action: 'addmeshuser', meshid: currentMesh._id, meshname: currentMesh.name, userid: ugrpid, meshadmin: meshadmin }); }
+ } else if (t === 3) {
+ var meshid = decodeURIComponent(Q('dp2groupid').value), mesh = meshes[meshid];
+ if (mesh != null) { meshserver.send({ action: 'addmeshuser', meshid: meshid, meshname: mesh.name, userids: [ currentUserGroup._id ], meshadmin: meshadmin }); }
} else {
if (t == null) {
var users = Q('dp20username').value.split(','), users2 = [];
for (var i in users) { users2.push(users[i].trim()); }
meshserver.send({ action: 'addmeshuser', meshid: currentMesh._id, meshname: currentMesh.name, usernames: users2, meshadmin: meshadmin });
} else {
- meshserver.send({ action: 'addmeshuser', meshid: currentMesh._id, meshname: currentMesh.name, usernames: [ t.split('/')[2] ], meshadmin: meshadmin });
+ meshserver.send({ action: 'addmeshuser', meshid: currentMesh._id, meshname: currentMesh.name, userids: [ t ], meshadmin: meshadmin });
}
}
}
@@ -8087,6 +8123,7 @@
if (button != 2) return;
var uname = userid.split('/')[2];
if (users && users[userid]) { uname = users[userid].name; }
+ if (usergroups && usergroups[userid]) { uname = usergroups[userid].name; }
if (userinfo._id == userid) { uname = userinfo.name; }
setDialogMode(2, "Remote Mesh User", 3, p20viewuserEx2, format("Confirm removal of user {0}?", EscapeHtml(decodeURIComponent(uname))), userid);
}
@@ -9056,7 +9093,7 @@
// Display the groups using the sorted list
var x = '
', addHeader = true;
- x += '
' + "Name" + '
' + "Users";
+ x += '
' + "Name" + '
' + "Device Groups" + '
' + "Users";
for (var i in sortedGroups) { x += addUserGroupHtml(sortedGroups[i]); }
x += '
';
@@ -9068,13 +9105,13 @@
}
function addUserGroupHtml(group) {
- var usercount = 0;
- if (group.links) { for (var i in group.links) { usercount++; } }
+ var usercount = 0, meshcount = 0;
+ if (group.links) { for (var i in group.links) { if (i.startsWith('user/')) { usercount++; } if (i.startsWith('mesh/')) { meshcount++; } } }
var x = '
';
x += '
';
x += '
';
x += '';
- x += '
' + group.name + '
' + usercount;
+ x += '
' + group.name + '
' + meshcount + '
' + usercount;
return x;
}
@@ -9106,7 +9143,8 @@
var group = currentUserGroup = usergroups[decodeURIComponent(groupid)];
if (group == null) { if (xxcurrentView == 51) { setDialogMode(0); go(50); } return; }
QH('p51groupName', group.name);
-
+ var usercount = 0, meshcount = 0;
+ if (group.links) { for (var i in group.links) { if (i.startsWith('user/')) { usercount++; } if (i.startsWith('mesh/')) { meshcount++; } } }
var desc = group.desc;
if ((desc == null) || (desc == '')) { desc = '' + "None" + ''; } else { desc = EscapeHtml(desc); }
@@ -9118,6 +9156,9 @@
x += addDeviceAttribute("Name", EscapeHtml(group.name));
x += addDeviceAttribute("Description", desc);
}
+ x += addDeviceAttribute("Users", usercount);
+ x += addDeviceAttribute("Device Groups", meshcount);
+
x += ' ';
if ((userinfo.siteadmin & 256) != 0) {
@@ -9127,14 +9168,16 @@
// Setup the panel
QH('p51group', x);
+ x = ' ';
if ((userinfo.siteadmin & 256) != 0) {
- x = ' ' + "Add Users" + '';
+ x += ' ' + "Add Users" + '';
}
x += '
' + "Group Members" + '
';
// Sort the users for this mesh
var count = 1, sortedusers = [];
for (var i in currentUserGroup.links) {
+ if (i.startsWith('user/') == false) continue;
var uname = i.split('/')[2];
if (currentUserGroup.links[i].name) { uname = currentUserGroup.links[i].name; }
if (i == userinfo._id) { uname = userinfo.name; }
@@ -9151,7 +9194,29 @@
if (count == 1) { x += '
' + "No Members" + '
'; }
+ x += '
';
+
+ count = 1;
+ var deviceGroupCount = 0, newDeviceGroup = false;
+ for (var i in meshes) { deviceGroupCount++; if ((currentUserGroup.links == null) || (currentUserGroup.links[i] == null)) { newDeviceGroup = true; } }
+ if ((deviceGroupCount > 0) && (newDeviceGroup)) { x += ' ' + "Add Device Group" + ''; }
+ x += '
' + "Common Device Groups" + '
';
+ if (currentUserGroup.links) {
+ for (var i in currentUserGroup.links) {
+ if (i.startsWith('mesh/')) {
+ var cr = 0, r = currentUserGroup.links[i].rights, mesh = meshes[i], trash = '', rights = "Partial Device Group Rights";
+ if (mesh == null) { continue; }
+ if ((userinfo.links) && (userinfo.links[i] != null) && (userinfo.links[i].rights != null)) { cr = userinfo.links[i].rights; }
+ var meshname = mesh?EscapeHtml(mesh.name):('' + "Unknown Device Group" + '');
+ if (r == 0xFFFFFFFF) rights = "Full Device Group Administrator"; else if (r == 0) rights = "No Rights";
+ if ((cr & 2) != 0) { trash = ''; }
+ x += '
' + meshname + '
' + trash + '
' + rights + '
';
+ }
+ }
+ }
+ if (count == 1) { x += '
' + "No device groups in common" + '
'; }
x += '
';
+
if ((userinfo.siteadmin & 256) != 0) {
x += '
';
}
@@ -9160,6 +9225,17 @@
go(51);
}
+ function p51removeMeshFromUserGroup(e, meshid) {
+ if (xxdialogMode) return;
+ var mesh = meshes[decodeURIComponent(meshid)];
+ if (mesh == null) return;
+ setDialogMode(2, "Remove Device Group", 3, p51removeMeshFromUserGroupEx, format("Confirm removal of device group {0}?", mesh.name), mesh._id);
+ }
+
+ function p51removeMeshFromUserGroupEx(b, meshid) {
+ meshserver.send({ action: 'removemeshuser', meshid: meshid, userid: currentUserGroup._id });
+ }
+
function p51editgroup(focus) {
if (xxdialogMode) return;
var x = addHtmlValue("Name", '');
diff --git a/webserver.js b/webserver.js
index 4642a330..51db62bd 100644
--- a/webserver.js
+++ b/webserver.js
@@ -77,6 +77,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
obj.args = args;
obj.users = {}; // UserID --> User
obj.meshes = {}; // MeshID --> Mesh (also called device group)
+ obj.userGroups = {}; // UGrpID --> User Group
obj.userAllowedIp = args.userallowedip; // List of allowed IP addresses for users
obj.agentAllowedIp = args.agentallowedip; // List of allowed IP addresses for agents
obj.agentBlockedIp = args.agentblockedip; // List of blocked IP addresses for agents
@@ -211,13 +212,19 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
}
}
- // Fetch all meshes from the database, keep this in memory
+ // Fetch all device groups (meshes) from the database, keep this in memory
obj.db.GetAllType('mesh', function (err, docs) {
obj.common.unEscapeAllLinksFieldName(docs);
for (var i in docs) { obj.meshes[docs[i]._id] = docs[i]; } // Get all meshes, including deleted ones.
- // We loaded the users and mesh state, start the server
- serverStart();
+ // Fetch all user groups from the database, keep this in memory
+ obj.db.GetAllType('ugrp', function (err, docs) {
+ obj.common.unEscapeAllLinksFieldName(docs);
+ for (var i in docs) { obj.userGroups[docs[i]._id] = docs[i]; } // Get all user groups
+
+ // We loaded the users, device groups and suer group state, start the server
+ serverStart();
+ });
});
});
' + "Add Users" + '
'; }
- x += '