Skip to content

Fixed dynamic group ldap access #23344

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

Closed
alexweirig wants to merge 5 commits into from
Closed

Fixed dynamic group ldap access #23344

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb1d5fa
Fixed dynamic group ldap access
Mar 17, 2016
25b643f
Fixing group handling
Mar 21, 2016
7e46dae
fixed possible indention problem
Mar 21, 2016
e97c67c
indention problem
Mar 21, 2016
c0a15a7
indention problem
Mar 21, 2016
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
20 changes: 11 additions & 9 deletions apps/user_ldap/group_ldap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,16 +468,17 @@ public function getUserGroups($uid) {
// apply filter via ldap search to see if this user is in this
// dynamic group
$userMatch = $this->access->readAttribute(
$uid,
$userDN,
$this->access->connection->ldapUserDisplayName,
$memberUrlFilter
);
if ($userMatch !== false) {
// match found so this user is in this group
$pos = strpos($dynamicGroup['dn'][0], ',');
if ($pos !== false) {
$membershipGroup = substr($dynamicGroup['dn'][0],3,$pos-3);
$groups[] = $membershipGroup;
$groupName = $this->access->dn2groupname($dynamicGroup['dn'][0]);
if(is_string($groupName)) {
// be sure to never return false if the dn could not be
// resolved to a name, for whatever reason.
$groups[] = $groupName;
}
}
} else {
Expand Down Expand Up @@ -529,11 +530,12 @@ public function getUserGroups($uid) {
}

if(isset($this->cachedGroupsByMember[$uid])) {
$groups = $this->cachedGroupsByMember[$uid];
$groups[] = $this->cachedGroupsByMember[$uid];
} else {
Copy link
Contributor

@blizzz blizzz Mar 18, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this and following line is still necessary, or did I oversee anything?

Copy link
Contributor

@blizzz blizzz Mar 18, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Of course it should not overwrite, but append to $groups

Copy link
Contributor Author

@alexweirig alexweirig Mar 18, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@blizzz
I don't know (yet) how your caching is working? Is that cache in the DB or in memory. I have the impression (can't prove it yet) that something goes wrong with the caching because of the cachekeys. At the top of the function the cachekey is generate with the uid and then the cache is read, but at the end of the method, the cachedGroupByMember is written with the userDN (in our case).
I'm trying to put back the cache code in place and just noticed that although the dynamic groups are now working in my code, the "static" groups (based on "uniquemember") are no longer being added to the groups list...

Copy link
Contributor

@blizzz blizzz Mar 18, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$this->cachedGroupsByMember[$uid]

only exists on run-time. It is a member array of the class instance.

What should not be kept is the caching part, but the fetching of the other groups.

Copy link
Contributor Author

@alexweirig alexweirig Mar 18, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@blizzz
I think I've got the groups working (both dynamic and static) ... but I need to do some more tests and get back on Monday.

Copy link
Contributor

@blizzz blizzz Mar 18, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alexweirig sounds great, thank you.

$groups = array_values($this->getGroupsByMember($uid));
$groups = $this->access->ownCloudGroupNames($groups);
$this->cachedGroupsByMember[$uid] = $groups;
$groupsByMember = array_values($this->getGroupsByMember($uid));
$groupsByMember = $this->access->ownCloudGroupNames($groupsByMember);
Copy link
Contributor

@blizzz blizzz Mar 18, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is also the only place where $this->cachedGroupsByMember is used. By removing this, all other tracks $this->cachedGroupsByMember should also go (e.g. its definiton)

$this->cachedGroupsByMember[$uid] = $groupsByMember;
$groups = array_merge($groups, $groupsByMember);
}

if($primaryGroup !== false) {
Expand Down