github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added scope support to LDAP group and user search (#9529)

Browse Source 
* Added scope support LDAP group and user search

* Fixed linter screwing up my markdown

* Update docs/configuration/config-options.md

* Always return correct DN for user with sub scope
This commit is contained in:
Aiden Foxx
2021-11-22 21:05:01 +01:00
committed by GitHub
parent e6d72bc0ec
commit 8b9671baaa
2 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/src/auth/drivers/ldap.ts
View File

@@ -102,17 +102,13 @@ export class LDAPAuthDriver extends AuthDriver {
}
private async fetchUserDn(identifier: string): Promise<string | undefined> {
const { userDn, userAttribute } = this.config;
const { userDn, userAttribute, userScope } = this.config;
return new Promise((resolve, reject) => {
// Search for the user in LDAP by attribute
this.bindClient.search(
userDn,
{
attributes: ['cn'],
filter: `(${userAttribute ?? 'cn'}=${identifier})`,
scope: 'one',
},
{ filter: `(${userAttribute ?? 'cn'}=${identifier})`, scope: userScope ?? 'one' },
(err: Error | null, res: SearchCallbackResponse) => {
if (err) {
reject(handleError(err));
@@ -120,8 +116,7 @@ export class LDAPAuthDriver extends AuthDriver {
}
res.on('searchEntry', ({ object }: SearchEntry) => {
const userCn = typeof object.cn === 'object' ? object.cn[0] : object.cn;
resolve(`cn=${userCn},${userDn}`.toLowerCase());
resolve(object.dn.toLowerCase());
});
res.on('error', (err: Error) => {
@@ -177,7 +172,7 @@ export class LDAPAuthDriver extends AuthDriver {
}
private async fetchUserGroups(userDn: string): Promise<string[]> {
const { groupDn, groupAttribute } = this.config;
const { groupDn, groupAttribute, groupScope } = this.config;
if (!groupDn) {
return Promise.resolve([]);
@@ -192,7 +187,7 @@ export class LDAPAuthDriver extends AuthDriver {
{
attributes: ['cn'],
filter: `(${groupAttribute ?? 'member'}=${userDn})`,
scope: 'one',
scope: groupScope ?? 'one',
},
(err: Error | null, res: SearchCallbackResponse) => {
if (err) {