Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply ldapUserFilter on members of group #8221

Merged
merged 2 commits into from
Mar 8, 2018
Merged

Apply ldapUserFilter on members of group #8221

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf4ec7a
Apply ldapUserFilter on members of group
Feb 7, 2018
2472b93
dn2ocname: also apply group filter to readAttribute()
Mar 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions apps/user_ldap/lib/Access.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,9 +538,11 @@ public function dn2ocname($fdn, $ldapName = null, $isUser = true, &$newlyMapped
if($isUser) {
$mapper = $this->getUserMapper();
$nameAttribute = $this->connection->ldapUserDisplayName;
$filter = $this->connection->ldapUserFilter;
} else {
$mapper = $this->getGroupMapper();
$nameAttribute = $this->connection->ldapGroupDisplayName;
$filter = $this->connection->ldapGroupFilter;
}

//let's try to retrieve the Nextcloud name from the mappings table
Expand All @@ -564,9 +566,9 @@ public function dn2ocname($fdn, $ldapName = null, $isUser = true, &$newlyMapped
}

if(is_null($ldapName)) {
$ldapName = $this->readAttribute($fdn, $nameAttribute);
$ldapName = $this->readAttribute($fdn, $nameAttribute, $filter);
if(!isset($ldapName[0]) && empty($ldapName[0])) {
\OCP\Util::writeLog('user_ldap', 'No or empty name for '.$fdn.'.', \OCP\Util::INFO);
\OCP\Util::writeLog('user_ldap', 'No or empty name for '.$fdn.' with filter '.$filter.'.', \OCP\Util::INFO);
return false;
}
$ldapName = $ldapName[0];
Expand Down