Commit 26b1aca3 authored by Simon M. Haller-Seeber's avatar Simon M. Haller-Seeber
Browse files

Some minor update

parent a27db1cc
Loading
Loading
Loading
Loading
+0 −2
Changes for README.md: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ LDAP_BINDDN: ou=someunit,ou=people,dc=DOMAIN,dc=TLS
# By default tries to bind directly with the ldap user - this user has to be in the LDAP GROUP
# you have to set a group filter a minimal groupfilter would be: '(objectClass=person)'
LDAP_GROUP_FILTER: '(memberof=GROUPNAME,ou=groups,dc=DOMAIN,dc=TLD)'
# if user is in ADMIN_GROUP on user creation (2 first login) it sets isAdmin to true.
LDAP_ADMIN_GROUP_FILTER: '(memberof=cn=ADMINGROUPNAME,ou=groups,dc=DOMAIN,dc=TLD)'
LDAP_CONTACTS: 'true'
```

+0 −2
Changes for docker-compose.yml: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ services:
            LDAP_BINDDN: ou=someunit,ou=people,dc=DOMAIN,dc=TLS
            # By default tries to bind directly with the ldap user - this user has to be in the LDAP GROUP
            LDAP_GROUP_FILTER: '(memberof=cn=GROUPNAME,ou=groups,dc=DOMAIN,dc=TLD)'
            # if user is in ADMIN_GROUP on user creation (first login) isAdmin is set to true.
            LDAP_ADMIN_GROUP_FILTER: '(memberof=cn=ADMINGROUPNAME,ou=groups,dc=DOMAIN,dc=TLD)'
            LDAP_CONTACTS: 'false'

            # Same property, unfortunately with different names in
+1 −1
Changes for ldap-overleaf-sl/sharelatex/AuthenticationManager.js: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -305,9 +305,9 @@ const AuthenticationManager = {
	  await client.unbind();
          return callback(null, null)
	}

        try {
          // if admin filter is set - only set admin for user in ldap group
          // does not matter - admin is deactivated: managed through ldap
	  if (process.env.LDAP_ADMIN_GROUP_FILTER) { 
            const adminfilter = '(&' + process.env.LDAP_ADMIN_GROUP_FILTER + '(uid=' + uid + '))' 
            adminEntry = await client.search(ldap_base, {