andrea/ldap-overleaf-slf-sl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Distinguish between ldap bind DN and ldap base dn - to match ldap functionality properly

Browse Source
This commit is contained in:
Simon M. Haller-Seeber
2020-05-14 12:09:53 +02:00
parent 3cfba2317a
commit 8eed93e3d3
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ldap-overleaf-sl/sharelatex/AuthenticationManager.js
View File

@@ -269,10 +269,11 @@ const AuthenticationManager = {
});
//const bindDn = process.env.LDAP_BIND_USER
//const bindPassword = process.env.LDAP_BIND_PW
const ldap_bb = process.env.LDAP_BIND_BASE
const ldap_bd = process.env.LDAP_BINDDN
const ldap_base = process.env.LDAP_BASE
const uid = query.email.split('@')[0]
const filterstr = '(&' + process.env.LDAP_GROUP_FILTER + '(uid=' + uid + '))'
const userDn = 'uid=' + uid + ',' + ldap_bb;
const userDn = 'uid=' + uid + ',' + ldap_bd;
var mail = ""
var firstname = ""
var lastname = ""
@@ -287,7 +288,7 @@ const AuthenticationManager = {
}
// get user data
try {
const {searchEntries, searchRef,} = await client.search(ldap_bb, {
const {searchEntries, searchRef,} = await client.search(ldap_base, {
scope: 'sub',
filter: filterstr ,
});
@@ -309,7 +310,7 @@ const AuthenticationManager = {
// if admin filter is set - only set admin for user in ldap group
if (process.env.LDAP_ADMIN_GROUP_FILTER) {
const adminfilter = '(&' + process.env.LDAP_ADMIN_GROUP_FILTER + '(uid=' + uid + '))'
adminEntry = await client.search(ldap_bb, {
adminEntry = await client.search(ldap_base, {
scope: 'sub',
filter: adminfilter,
});

4
ldap-overleaf-sl/sharelatex/ContactController.js
View File

@@ -86,10 +86,10 @@ module.exports = ContactsController = {
const client = new Client({
url: process.env.LDAP_SERVER,
});
const ldap_bb = process.env.LDAP_BIND_BASE
const ldap_base = process.env.LDAP_BASE
// get user data
try {
const {searchEntries,searchReferences,} = await client.search(ldap_bb, {scope: 'sub',filter: process.env.LDAP_GROUP_FILTER ,});
const {searchEntries,searchReferences,} = await client.search(ldap_base, {scope: 'sub',filter: process.env.LDAP_GROUP_FILTER ,});
await searchEntries;
for (var i = 0; i < searchEntries.length; i++) {
var entry = new Map()