mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix counting of users in primary group

This commit is contained in:
Arthur Schiwon 2015-01-28 15:52:59 +01:00
parent 323af55b50
commit 31de757514
2 changed files with 69 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
apps/user_ldap/group_ldap.php
View File

@ -248,33 +248,72 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
return $this->getEntryGroupID($dn, 'primaryGroupID'); return $this->getEntryGroupID($dn, 'primaryGroupID');
} }
/**
* returns a filter for a "users in primary group" search or count operation
*
* @param $groupDN
* @param string $search
* @return string
* @throws \Exception
*/
private function prepareFilterForUsersInPrimaryGroup($groupDN, $search = '') {
$groupID = $this->getGroupPrimaryGroupID($groupDN);
if($groupID === false) {
throw new \Exception('Not a valid group');
}
$filterParts = [];
$filterParts[] = $this->access->getFilterForUserCount();
if(!empty($search)) {
$filterParts[] = $this->access->getFilterPartForUserSearch($search);
}
$filterParts[] = 'primaryGroupID=' . $groupID;
$filter = $this->access->combineFilterWithAnd($filterParts);
return $filter;
}
/** /**
* returns a list of users that have the given group as primary group * returns a list of users that have the given group as primary group
* *
* @param string $groupDN * @param string $groupDN
* @param $limit * @param string $search
* @param int $limit
* @param int $offset * @param int $offset
* @return string[] * @return \string[]
*/ */
public function getUsersInPrimaryGroup($groupDN, $limit = -1, $offset = 0) { public function getUsersInPrimaryGroup($groupDN, $search = '', $limit = -1, $offset = 0) {
$groupID = $this->getGroupPrimaryGroupID($groupDN); try {
if($groupID === false) { $filter = $this->prepareFilterForUsersInPrimaryGroup($groupDN, $search);
return $this->access->fetchListOfUsers(
$filter,
array($this->access->connection->ldapUserDisplayName, 'dn'),
$limit,
$offset
);
} catch (\Exception $e) {
return array(); return array();
} }
}
$filter = $this->access->combineFilterWithAnd(array( /**
$this->access->connection->ldapUserFilter, * returns the number of users that have the given group as primary group
'primaryGroupID=' . $groupID *
)); * @param $groupDN
* @param string $search
$users = $this->access->fetchListOfUsers( * @param int $limit
$filter, * @param int $offset
array($this->access->connection->ldapUserDisplayName, 'dn'), * @return int
$limit, */
$offset public function countUsersInPrimaryGroup($groupDN, $search = '', $limit = -1, $offset = 0) {
); try {
$filter = $this->prepareFilterForUsersInPrimaryGroup($groupDN, $search);
return $users; $users = $this->access->countUsers($filter, array('dn'), $limit, $offset);
return (is_int($users)) ? $users : 0;
} catch (\Exception $e) {
return 0;
}
} }
/** /**
@ -473,7 +512,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
$groupUsers = array_slice($groupUsers, $offset, $limit); $groupUsers = array_slice($groupUsers, $offset, $limit);
//and get users that have the group as primary //and get users that have the group as primary
$primaryUsers = $this->getUsersInPrimaryGroup($groupDN, $limit, $offset); $primaryUsers = $this->getUsersInPrimaryGroup($groupDN, $search, $limit, $offset);
$groupUsers = array_unique(array_merge($groupUsers, $primaryUsers)); $groupUsers = array_unique(array_merge($groupUsers, $primaryUsers));
$this->access->connection->writeToCache($cacheKey, $groupUsers); $this->access->connection->writeToCache($cacheKey, $groupUsers);
@ -512,7 +551,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
} }
if(empty($search)) { if(empty($search)) {
$groupUsers = count($members); $primaryUsers = $this->countUsersInPrimaryGroup($groupDN, '');
$groupUsers = count($members) + $primaryUsers;
$this->access->connection->writeToCache($cacheKey, $groupUsers); $this->access->connection->writeToCache($cacheKey, $groupUsers);
return $groupUsers; return $groupUsers;
} }
@ -557,10 +598,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
} }
//and get users that have the group as primary //and get users that have the group as primary
$primaryUsers = $this->getUsersInPrimaryGroup($groupDN); $primaryUsers = $this->countUsersInPrimaryGroup($groupDN, $search);
$groupUsers = array_unique(array_merge($groupUsers, $primaryUsers));
return count($groupUsers); return count($groupUsers) + $primaryUsers;
} }
/** /**

7
apps/user_ldap/tests/group_ldap.php
View File

@ -76,10 +76,15 @@ class Test_Group_Ldap extends \Test\TestCase {
->method('readAttribute') ->method('readAttribute')
->will($this->returnValue(array('u11', 'u22', 'u33', 'u34'))); ->will($this->returnValue(array('u11', 'u22', 'u33', 'u34')));
// for primary groups
$access->expects($this->once())
->method('countUsers')
->will($this->returnValue(2));
$groupBackend = new GroupLDAP($access); $groupBackend = new GroupLDAP($access);
$users = $groupBackend->countUsersInGroup('group'); $users = $groupBackend->countUsersInGroup('group');
$this->assertSame(4, $users); $this->assertSame(6, $users);
} }
public function testCountWithSearchString() { public function testCountWithSearchString() {