Added LDAP debug improvements.
Ylian Saint-Hilaire committed
Aug 21, 2022 at 22:19 UTC
6b4179c20cec3fb9047230e71de27207d480a870
1 file changed
+4
-1
webserver.js
+4
-1
@@ -483,7 +483,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
483
// Look for a matching LDAP user group
484
var userMembershipMatch = false;
485
for (var i in domain.ldapuserrequiredgroupmembership) { if (userMemberships.indexOf(domain.ldapuserrequiredgroupmembership[i]) >= 0) { userMembershipMatch = true; } }
486
- if (userMembershipMatch === false) { fn('denied'); return; } // If there is no match, deny the login
486
+ if (userMembershipMatch === false) { parent.debug('ldap', 'Denying login to a user that is not a member of a LDAP required group.'); fn('denied'); return; } // If there is no match, deny the login
487
}
488
489
// Get the email address for this LDAP user
@@ -8716,6 +8716,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
8716
var ugrp = obj.userGroups[ugrpid];
8717
if (ugrp == null) {
8718
// This user group does not exist, create it
8719
+ parent.debug('ldap', 'Creating new LDAP user group ' + userMemberships[i] + '.');
8720
ugrp = { type: 'ugrp', _id: ugrpid, name: membership, domain: domain.id, membershipType: userMembershipType, links: {} };
8721
8722
// Save the new group
@@ -8732,6 +8733,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
8733
8734
if (existingUserMemberships[ugrpid] == null) {
8735
// This user is not part of the user group, add it.
8736
+ parent.debug('ldap', 'Adding ' + user.name + ' to LDAP user group ' + userMemberships[i] + '.');
8737
if (user.links == null) { user.links = {}; }
8738
user.links[ugrp._id] = { rights: 1 };
8739
userChanged = true;
@@ -8761,6 +8763,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
8763
// Remove the user from any memberships they don't belong to anymore
8764
for (var ugrpid in existingUserMemberships) {
8765
var ugrp = obj.userGroups[ugrpid];
8766
+ parent.debug('ldap', 'Removing ' + user.name + ' from LDAP user group ' + ugrp.name + '.');
8767
if ((user.links != null) && (user.links[ugrpid] != null)) {
8768
delete user.links[ugrpid];
8769