Skip to content

Revert "adjust to nested group fix #19821

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

Merged
3 commits merged into from
Oct 16, 2015
Merged

Revert "adjust to nested group fix #19821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f178f61
Revert "adjust to nested group fix
GreenArchon Oct 16, 2015
733542a
Fix style
LukasReschke Oct 16, 2015
d486949
Adjust unit tests
LukasReschke Oct 16, 2015
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
9 changes: 2 additions & 7 deletions apps/user_ldap/group_ldap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

use OCA\user_ldap\lib\Access;
use OCA\user_ldap\lib\BackendUtility;
use OCA\user_ldap\lib\user\User;

class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
protected $enabled = false;
Expand Down Expand Up @@ -198,11 +197,7 @@ private function _getGroupDNsFromMemberOf($DN, &$seen = null) {
return array();
}
$seen[$DN] = 1;
$user = $this->access->userManager->get($DN);
if(!$user instanceof User) {
return array();
}
$groups = $user->getMemberOfGroups();
$groups = $this->access->readAttribute($DN, 'memberOf');
if (!is_array($groups)) {
return array();
}
Expand All @@ -214,7 +209,7 @@ private function _getGroupDNsFromMemberOf($DN, &$seen = null) {
$subGroups = $this->_getGroupDNsFromMemberOf($group, $seen);
$allGroups = array_merge($allGroups, $subGroups);
}
}
}
return $allGroups;
}

Expand Down
11 changes: 3 additions & 8 deletions apps/user_ldap/tests/group_ldap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,9 @@ private function getAccessMock() {
$connector = $this->getMock('\OCA\user_ldap\lib\Connection',
$conMethods,
array($lw, null, null));
$um = new \OCA\user_ldap\lib\user\Manager(
$this->getMock('\OCP\IConfig'),
$this->getMock('\OCA\user_ldap\lib\FilesystemHelper'),
$this->getMock('\OCA\user_ldap\lib\LogWrapper'),
$this->getMock('\OCP\IAvatarManager'),
$this->getMock('\OCP\Image'),
$this->getMock('\OCP\IDBConnection')
);
$um = $this->getMockBuilder('\OCA\user_ldap\lib\user\Manager')
->disableOriginalConstructor()
->getMock();
$access = $this->getMock('\OCA\user_ldap\lib\Access',
$accMethods,
array($connector, $lw, $um));
Expand Down