external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-02-12 11:01:52 +00:00
Code Issues Releases Wiki Activity

LDAP debug improvements.

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2022-07-20 13:35:59 -07:00
parent 61e486ba38
commit 034ebc986c
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
webserver.js
View file

@ -442,7 +442,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
} else if (domain.auth == 'ldap') { } else if (domain.auth == 'ldap') {
// This method will handle LDAP login // This method will handle LDAP login
const ldapHandler = function ldapHandlerFunc(err, xxuser) { const ldapHandler = function ldapHandlerFunc(err, xxuser) {
if (err) { if (ldapHandlerFunc.ldapobj) { try { ldapHandlerFunc.ldapobj.close(); } catch (ex) { console.log(ex); } } fn(new Error('invalid password')); return; } if (err) { parent.debug('ldap', 'LDAP Error: ' + err); if (ldapHandlerFunc.ldapobj) { try { ldapHandlerFunc.ldapobj.close(); } catch (ex) { console.log(ex); } } fn(new Error('invalid password')); return; }
// Save this LDAP user to file if needed // Save this LDAP user to file if needed
if (typeof domain.ldapsaveusertofile == 'string') { if (typeof domain.ldapsaveusertofile == 'string') {
@ -454,7 +454,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
var username = xxuser['displayName']; var username = xxuser['displayName'];
if (typeof domain.ldapusername == 'string') { if (typeof domain.ldapusername == 'string') {
if (domain.ldapusername.indexOf('{{{') >= 0) { username = assembleStringFromObject(domain.ldapusername, xxuser); } else { username = xxuser[domain.ldapusername]; } if (domain.ldapusername.indexOf('{{{') >= 0) { username = assembleStringFromObject(domain.ldapusername, xxuser); } else { username = xxuser[domain.ldapusername]; }
} } else { username = xxuser['displayName'] ? xxuser['displayName'] : xxuser['name']; }
if (domain.ldapuserbinarykey) { if (domain.ldapuserbinarykey) {
// Use a binary key as the userid // Use a binary key as the userid
if (xxuser[domain.ldapuserbinarykey]) { shortname = Buffer.from(xxuser[domain.ldapuserbinarykey], 'binary').toString('hex').toLowerCase(); } if (xxuser[domain.ldapuserbinarykey]) { shortname = Buffer.from(xxuser[domain.ldapuserbinarykey], 'binary').toString('hex').toLowerCase(); }
@ -503,14 +503,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
} }
// Display user information extracted from LDAP data // Display user information extracted from LDAP data
/* parent.debug('ldap', 'User login, id: ' + shortname + ', username: ' + username + ', email: ' + email + ', realname: ' + realname + ', phone: ' + phonenumber + ', image: ' + (userimage != null));
console.log('shortname', shortname);
console.log('username', username);
console.log('email', email);
console.log('realname', realname);
console.log('phonenumber', phonenumber);
console.log('userimage', userimage != null);
*/
// If there is a testing userid, use that // If there is a testing userid, use that
if (ldapHandlerFunc.ldapShortName) { if (ldapHandlerFunc.ldapShortName) {
@ -636,7 +629,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
domain.ldapoptions.includeRaw = true; // This allows us to get data as buffers which is useful for images. domain.ldapoptions.includeRaw = true; // This allows us to get data as buffers which is useful for images.
var ldap = new LdapAuth(domain.ldapoptions); var ldap = new LdapAuth(domain.ldapoptions);
ldapHandler.ldapobj = ldap; ldapHandler.ldapobj = ldap;
ldap.on('error', function (err) { try { ldap.close(); } catch (ex) { console.log(ex); } console.log('ldap error: ', err); }); // Close the LDAP object ldap.on('error', function (err) { parent.debug('ldap', 'LDAP OnError: ' + err); try { ldap.close(); } catch (ex) { console.log(ex); } }); // Close the LDAP object
ldap.authenticate(name, pass, ldapHandler); ldap.authenticate(name, pass, ldapHandler);
} }
} else { } else {