diff options
| author | Roland Tapken <roland@bitarbeiter.net> | 2018-02-07 12:02:58 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2018-06-12 18:21:11 +0200 |
| commit | 57a8fa1b2270c7916c19cb1cf748888aa9a9c7d6 (patch) | |
| tree | c92a10de04177419cf928df58274b7e43cbf971c | |
| parent | 59a27ceb13b1b6d0e2ba75f921e16141a7c28623 (diff) | |
| download | nextcloud-server-57a8fa1b2270c7916c19cb1cf748888aa9a9c7d6.tar.gz nextcloud-server-57a8fa1b2270c7916c19cb1cf748888aa9a9c7d6.zip | |
Apply ldapUserFilter on members of group
Refers to issue #8220
user_ldap configured with custom filters for active directory access
(group-member-association is "member"). Then it can happen that the
members of a group contain members that don't belong to the users
available in Nextcloud (the most trivial reason is that the user filter
contains "(!(UserAccountControl:1.2.840.113556.1.4.803:=2))" to exclude
disabled users from being imported).
This can be fixed by applying the ldapUserFilter when resolving the UID
for a DN fetched from the group's member list.
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
| -rw-r--r-- | apps/user_ldap/lib/Access.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index 02f69715f4c..fe286f88a83 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -565,7 +565,11 @@ class Access extends LDAPUtility implements IUserTools { } if(is_null($ldapName)) { - $ldapName = $this->readAttribute($fdn, $nameAttribute); + if ($isUser) { + $ldapName = $this->readAttribute($fdn, $nameAttribute, $this->connection->ldapUserFilter); + } else { + $ldapName = $this->readAttribute($fdn, $nameAttribute); + } if(!isset($ldapName[0]) && empty($ldapName[0])) { \OCP\Util::writeLog('user_ldap', 'No or empty name for '.$fdn.'.', \OCP\Util::INFO); return false; |