';
@@ -2117,7 +2117,7 @@
var mesh = meshes[currentNode.meshid];
var deskState = 0;
if (desktop != null) { deskState = desktop.State; }
- var meshrights = mesh.links['user/' + domain + '/' + userinfo.name.toLowerCase()].rights;
+ var meshrights = mesh.links[userinfo._id].rights;
// Show the right buttons
QV('disconnectbutton1', (deskState != 0));
@@ -2859,7 +2859,7 @@
if (currentMesh == null) return;
QH('p20meshName', EscapeHtml(currentMesh.name));
var meshtype = 'Unknown #' + currentMesh.mtype;
- var meshrights = currentMesh.links['user/' + domain + '/' + userinfo.name.toLowerCase()].rights;
+ var meshrights = currentMesh.links[userinfo._id].rights;
if (currentMesh.mtype == 1) meshtype = 'Intel® AMT group';
if (currentMesh.mtype == 2) meshtype = 'Software agent group';
@@ -2872,7 +2872,7 @@
//x += '';
if ((meshrights & 64) != 0) { y += 'Wake-up '; } // Wake-up permission
@@ -3998,7 +3998,7 @@
// List all available alternative groups
var y = "", count = 0;
for (var i in meshes) {
- var meshrights = meshes[i].links['user/' + domain + '/' + userinfo.name.toLowerCase()].rights;
+ var meshrights = meshes[i].links[userinfo._id].rights;
if ((meshes[i]._id != targetMeshId) && (meshrights & 4)) { count++; y += "" + meshes[i].name + " "; }
}
y += " ";
@@ -4130,7 +4130,7 @@
function p10showiconselector() {
if (xxdialogMode) return;
var mesh = meshes[currentNode.meshid];
- var meshrights = mesh.links['user/' + domain + '/' + userinfo.name.toLowerCase()].rights;
+ var meshrights = mesh.links[userinfo._id].rights;
if ((meshrights & 4) == 0) return;
var x = '
';
@@ -4227,7 +4227,7 @@
var mesh = meshes[currentNode.meshid];
var deskState = 0;
if (desktop != null) { deskState = desktop.State; }
- var meshrights = mesh.links['user/' + domain + '/' + userinfo.name.toLowerCase()].rights;
+ var meshrights = mesh.links[userinfo._id].rights;
// Show the right buttons
QV('disconnectbutton1span', (deskState != 0));
@@ -5508,7 +5508,7 @@
consoleNode = currentNode;
var mesh = meshes[consoleNode.meshid];
- var meshrights = mesh.links['user/' + domain + '/' + userinfo.name.toLowerCase()].rights;
+ var meshrights = mesh.links[userinfo._id].rights;
if ((meshrights & 16) != 0) {
if (consoleNode.consoleText == null) { consoleNode.consoleText = ''; }
if (samenode == false) {
@@ -5880,7 +5880,7 @@
// Mesh rights
var meshrights = 0;
- if (meshes[i].links['user/' + domain + '/' + userinfo.name.toLowerCase()]) { meshrights = meshes[i].links['user/' + domain + '/' + userinfo.name.toLowerCase()].rights; }
+ if (meshes[i].links[userinfo._id]) { meshrights = meshes[i].links[userinfo._id].rights; }
var rights = 'Partial Rights';
if (meshrights == 0xFFFFFFFF) rights = 'Full Administrator'; else if (meshrights == 0) rights = 'No Rights';
@@ -5942,7 +5942,7 @@
QH('p20meshName', EscapeHtml(currentMesh.name));
var meshtype = 'Unknown #' + currentMesh.mtype;
var meshrights = 0;
- try { meshrights = currentMesh.links['user/' + domain + '/' + userinfo.name.toLowerCase()].rights; } catch (ex) { }
+ try { meshrights = currentMesh.links[userinfo._id].rights; } catch (ex) { }
if (currentMesh.mtype == 1) meshtype = 'Intel® AMT only, no agent';
if (currentMesh.mtype == 2) meshtype = 'Managed using a software agent';
@@ -5996,7 +5996,7 @@
if (meshrights & 1) { x += '';
var email = user.email?EscapeHtml(user.email):'Not set ', everify = '';
if (serverinfo.emailcheck) { everify = ((user.emailVerified == true)?'🗸 ':'🗴 '); }
+ if (user.name.toLowerCase() != user._id.split('/')[2]) { x += addDeviceAttribute('User Identifier', user._id.split('/')[2]); }
x += addDeviceAttribute('Email', everify + "" + email + ' " + msg.join(', ') + " ");
if (user.quota) x += addDeviceAttribute('Server Quota', EscapeHtml(parseInt(user.quota) / 1024) + ' k');
@@ -6923,8 +6934,9 @@
x += addDeviceAttribute('Device Groups', linkCountStr);
// User Groups
- if (user.groups) { linkCountStr = EscapeHtml(user.groups.join(', ')); } else { linkCountStr = 'None'; }
- x += addDeviceAttribute('User Groups', addLinkConditional(linkCountStr, 'showUserGroupDialog(event,\"' + userid + '\")', ((userinfo.groups == null) && (userinfo.siteadmin & 2) && (userinfo._id != user._id))));
+ var userGroups = 'None ';
+ if (user.groups) { userGroups = ''; for (var i in user.groups) { userGroups += '' + user.groups[i] + ' '; } }
+ x += addDeviceAttribute('User Groups', addLinkConditional(userGroups, 'showUserGroupDialog(event,\"' + userid + '\")', ((userinfo.groups == null) && (userinfo.siteadmin & 2) && (userinfo._id != user._id))));
var multiFactor = 0;
if ((user.otpsecret > 0) || (user.otphkeys > 0)) {
@@ -6995,7 +7007,7 @@
// Send to the server the new user's email address and validation status
function p30showUserEmailChangeDialogEx() {
- var x = { action: 'edituser', name: currentUser.name, email: Q('dp30email').value };
+ var x = { action: 'edituser', id: currentUser._id, email: Q('dp30email').value };
if (serverinfo.emailcheck) { x.emailVerified = (Q('dp30verified').value == 1); }
meshserver.send(x);
}
diff --git a/webserver.js b/webserver.js
index 923e858e..480c66dc 100644
--- a/webserver.js
+++ b/webserver.js
@@ -226,23 +226,46 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
fn(new Error('invalid password'));
return;
} else {
+ var username = xxuser['displayName'];
+ if (domain.ldapusername) { username = xxuser[domain.ldapusername]; }
var shortname = null;
- if (xxuser.name) { shortname = xxuser.name; }
- else if (xxuser.cn) { shortname = xxuser.cn; }
- if (shortname == null) { fn(new Error('no short name')); return; }
+ if (domain.ldapuserbinarykey) {
+ // Use a binary key as the userid
+ if (xxuser[domain.ldapuserbinarykey]) { shortname = Buffer.from(xxuser[domain.ldapuserbinarykey], 'binary').toString('hex'); }
+ } else if (domain.ldapuserkey) {
+ // Use a string key as the userid
+ if (xxuser[domain.ldapuserkey]) { shortname = xxuser[domain.ldapuserkey]; }
+ } else {
+ // Use the default key as the userid
+ if (xxuser.objectSid) { shortname = Buffer.from(xxuser.objectSid, 'binary').toString('hex').toLowerCase(); }
+ else if (xxuser.objectGUID) { shortname = Buffer.from(xxuser.objectGUID, 'binary').toString('hex').toLowerCase(); }
+ else if (xxuser.name) { shortname = xxuser.name; }
+ else if (xxuser.cn) { shortname = xxuser.cn; }
+ }
+ if (username == null) { fn(new Error('no user name')); return; }
+ if (shortname == null) { fn(new Error('no user identifier')); return; }
var userid = 'user/' + domain.id + '/' + shortname;
var user = obj.users[userid];
+
if (user == null) {
- var user = { type: 'user', _id: userid, name: shortname, creation: Math.floor(Date.now() / 1000), login: Math.floor(Date.now() / 1000), domain: domain.id };
+ // Create a new user
+ var user = { type: 'user', _id: userid, name: username, creation: Math.floor(Date.now() / 1000), login: Math.floor(Date.now() / 1000), domain: domain.id };
var usercount = 0;
for (var i in obj.users) { if (obj.users[i].domain == domain.id) { usercount++; } }
if (usercount == 0) { user.siteadmin = 0xFFFFFFFF; if (domain.newaccounts === 2) { domain.newaccounts = 0; } } // If this is the first user, give the account site admin.
obj.users[user._id] = user;
obj.db.SetUser(user);
- obj.parent.DispatchEvent(['*', 'server-users'], obj, { etype: 'user', username: user.name, account: obj.CloneSafeUser(user), action: 'accountcreate', msg: 'Account created, name is ' + name, domain: domain.id });
+ obj.parent.DispatchEvent(['*', 'server-users'], obj, { etype: 'user', userid: userid, username: username, account: obj.CloneSafeUser(user), action: 'accountcreate', msg: 'Account created, name is ' + name, domain: domain.id });
return fn(null, user._id);
} else {
// This is an existing user
+ // If the display username has changes, update it.
+ if (user.name != username) {
+ user.name = username;
+ db.SetUser(user);
+ parent.DispatchEvent(['*', 'server-users', user._id], obj, { etype: 'user', username: user.name, account: obj.CloneSafeUser(user), action: 'accountchange', msg: 'Changed account display name to ' + username, domain: domain.id });
+ }
+ // If user is locker out, block here.
if ((user.siteadmin) && (user.siteadmin != 0xFFFFFFFF) && (user.siteadmin & 32) != 0) { fn('locked'); return; }
return fn(null, user._id);
}
@@ -255,11 +278,26 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
try { ldap.close(); } catch (ex) { console.log(ex); } // Close the LDAP object
if (err) { fn(new Error('invalid password')); return; }
var shortname = null;
- if (xxuser.name) { shortname = xxuser.name; }
- else if (xxuser.cn) { shortname = xxuser.cn; }
- if (shortname == null) { fn(new Error('no short name')); return; }
+ var username = xxuser['displayName'];
+ if (domain.ldapusername) { username = xxuser[domain.ldapusername]; }
+ if (domain.ldapuserbinarykey) {
+ // Use a binary key as the userid
+ if (xxuser[domain.ldapuserbinarykey]) { shortname = Buffer.from(xxuser[domain.ldapuserbinarykey], 'binary').toString('hex').toLowerCase(); }
+ } else if (domain.ldapuserkey) {
+ // Use a string key as the userid
+ if (xxuser[domain.ldapuserkey]) { shortname = xxuser[domain.ldapuserkey]; }
+ } else {
+ // Use the default key as the userid
+ if (xxuser.objectSid) { shortname = Buffer.from(xxuser.objectSid, 'binary').toString('hex').toLowerCase(); }
+ else if (xxuser.objectGUID) { shortname = Buffer.from(xxuser.objectGUID, 'binary').toString('hex').toLowerCase(); }
+ else if (xxuser.name) { shortname = xxuser.name; }
+ else if (xxuser.cn) { shortname = xxuser.cn; }
+ }
+ if (username == null) { fn(new Error('no user name')); return; }
+ if (shortname == null) { fn(new Error('no user identifier')); return; }
var userid = 'user/' + domain.id + '/' + shortname;
var user = obj.users[userid];
+
if (user == null) {
// This user does not exist, create a new account.
var user = { type: 'user', _id: userid, name: shortname, creation: Math.floor(Date.now() / 1000), login: Math.floor(Date.now() / 1000), domain: domain.id };
@@ -272,6 +310,13 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
return fn(null, user._id);
} else {
// This is an existing user
+ // If the display username has changes, update it.
+ if (user.name != username) {
+ user.name = username;
+ db.SetUser(user);
+ parent.DispatchEvent(['*', 'server-users', user._id], obj, { etype: 'user', username: user.name, account: obj.CloneSafeUser(user), action: 'accountchange', msg: 'Changed account display name to ' + username, domain: domain.id });
+ }
+ // If user is locker out, block here.
if ((user.siteadmin) && (user.siteadmin != 0xFFFFFFFF) && (user.siteadmin & 32) != 0) { fn('locked'); return; }
return fn(null, user._id);
}
