diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 1f03a81a7595b09a93648a32736547852caf4d63..7073700cfe1ee123ba6bf0d6753e12387ceb8c83 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -254,32 +254,71 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
}
/**
- * returns a list of users that have the given group as primary group
+ * returns a filter for a "users in primary group" search or count operation
*
* @param string $groupDN
- * @param $limit
- * @param int $offset
- * @return string[]
+ * @param string $search
+ * @return string
+ * @throws \Exception
*/
- public function getUsersInPrimaryGroup($groupDN, $limit = -1, $offset = 0) {
+ private function prepareFilterForUsersInPrimaryGroup($groupDN, $search = '') {
$groupID = $this->getGroupPrimaryGroupID($groupDN);
if($groupID === false) {
- return array();
+ throw new \Exception('Not a valid group');
}
- $filter = $this->access->combineFilterWithAnd(array(
- $this->access->connection->ldapUserFilter,
- 'primaryGroupID=' . $groupID
- ));
+ $filterParts = [];
+ $filterParts[] = $this->access->getFilterForUserCount();
+ if(!empty($search)) {
+ $filterParts[] = $this->access->getFilterPartForUserSearch($search);
+ }
+ $filterParts[] = 'primaryGroupID=' . $groupID;
+
+ $filter = $this->access->combineFilterWithAnd($filterParts);
- $users = $this->access->fetchListOfUsers(
- $filter,
- array($this->access->connection->ldapUserDisplayName, 'dn'),
- $limit,
- $offset
- );
+ return $filter;
+ }
+
+ /**
+ * returns a list of users that have the given group as primary group
+ *
+ * @param string $groupDN
+ * @param string $search
+ * @param int $limit
+ * @param int $offset
+ * @return string[]
+ */
+ public function getUsersInPrimaryGroup($groupDN, $search = '', $limit = -1, $offset = 0) {
+ try {
+ $filter = $this->prepareFilterForUsersInPrimaryGroup($groupDN, $search);
+ return $this->access->fetchListOfUsers(
+ $filter,
+ array($this->access->connection->ldapUserDisplayName, 'dn'),
+ $limit,
+ $offset
+ );
+ } catch (\Exception $e) {
+ return array();
+ }
+ }
- return $users;
+ /**
+ * returns the number of users that have the given group as primary group
+ *
+ * @param string $groupDN
+ * @param string $search
+ * @param int $limit
+ * @param int $offset
+ * @return int
+ */
+ public function countUsersInPrimaryGroup($groupDN, $search = '', $limit = -1, $offset = 0) {
+ try {
+ $filter = $this->prepareFilterForUsersInPrimaryGroup($groupDN, $search);
+ $users = $this->access->countUsers($filter, array('dn'), $limit, $offset);
+ return (int)$users;
+ } catch (\Exception $e) {
+ return 0;
+ }
}
/**
@@ -410,6 +449,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
if(!$this->groupExists($gid)) {
return array();
}
+ $search = $this->access->escapeFilterPart($search, true);
$cacheKey = 'usersInGroup-'.$gid.'-'.$search.'-'.$limit.'-'.$offset;
// check for cache of the exact query
$groupUsers = $this->access->connection->getFromCache($cacheKey);
@@ -478,7 +518,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
$groupUsers = array_slice($groupUsers, $offset, $limit);
//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));
$this->access->connection->writeToCache($cacheKey, $groupUsers);
@@ -517,10 +557,13 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
}
if(empty($search)) {
- $groupUsers = count($members);
+ $primaryUsers = $this->countUsersInPrimaryGroup($groupDN, '');
+ $groupUsers = count($members) + $primaryUsers;
+
$this->access->connection->writeToCache($cacheKey, $groupUsers);
return $groupUsers;
}
+ $search = $this->access->escapeFilterPart($search, true);
$isMemberUid =
(strtolower($this->access->connection->ldapGroupMemberAssocAttr)
=== 'memberuid');
@@ -562,10 +605,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
}
//and get users that have the group as primary
- $primaryUsers = $this->getUsersInPrimaryGroup($groupDN);
- $groupUsers = array_unique(array_merge($groupUsers, $primaryUsers));
+ $primaryUsers = $this->countUsersInPrimaryGroup($groupDN, $search);
- return count($groupUsers);
+ return count($groupUsers) + $primaryUsers;
}
/**
@@ -628,6 +670,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
if(!$this->enabled) {
return array();
}
+ $search = $this->access->escapeFilterPart($search, true);
$pagingSize = $this->access->connection->ldapPagingSize;
if ((! $this->access->connection->hasPagedResultSupport)
|| empty($pagingSize)) {
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 06d96fce441cfbbb11c1a65afb91242708b9bfa5..3a8630fbdcc3aa924f3b89cc8388bf3465dcd617 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -968,7 +968,7 @@ class Access extends LDAPUtility implements user\IUserTools {
/**
* escapes (user provided) parts for LDAP filter
* @param string $input, the provided value
- * @param bool $allowAsterisk wether in * at the beginning should be preserved
+ * @param bool $allowAsterisk whether in * at the beginning should be preserved
* @return string the escaped string
*/
public function escapeFilterPart($input, $allowAsterisk = false) {
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index f3e36fbbf26d777ca38388af647d6b06f7b9f1f7..4434780ce0bd2368d17a2be0e267a42f0fa95496 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -38,6 +38,7 @@ namespace OCA\user_ldap\lib;
* @property boolean hasPagedResultSupport
* @property string[] ldapBaseUsers
* @property int|string ldapPagingSize holds an integer
+ * @property bool|mixed|void ldapGroupMemberAssocAttr
*/
class Connection extends LDAPUtility {
private $ldapConnectionRes = null;
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index 753c8e48a92501a7ecb7a36251f46d37961a8d6f..fe4eebf9e117a95303bd4f4431e0d55c2c260e87 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -857,13 +857,23 @@ class Wizard extends LDAPUtility {
}
$base = $this->configuration->ldapBase[0];
foreach($cns as $cn) {
- $rr = $this->ldap->search($cr, $base, 'cn=' . $cn, array('dn'));
+ $rr = $this->ldap->search($cr, $base, 'cn=' . $cn, array('dn', 'primaryGroupToken'));
if(!$this->ldap->isResource($rr)) {
continue;
}
$er = $this->ldap->firstEntry($cr, $rr);
+ $attrs = $this->ldap->getAttributes($cr, $er);
$dn = $this->ldap->getDN($cr, $er);
- $filter .= '(memberof=' . $dn . ')';
+ if(empty($dn)) {
+ continue;
+ }
+ $filterPart = '(memberof=' . $dn . ')';
+ if(isset($attrs['primaryGroupToken'])) {
+ $pgt = $attrs['primaryGroupToken'][0];
+ $primaryFilterPart = '(primaryGroupID=' . $pgt .')';
+ $filterPart = '(|' . $filterPart . $primaryFilterPart . ')';
+ }
+ $filter .= $filterPart;
}
$filter .= ')';
}
diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php
index 6be791f86bc6cf408154e0f08ab957c82d12d6eb..a2c6beb63a8950a4d25f525bd1e26ef1c8e03a6e 100644
--- a/apps/user_ldap/tests/group_ldap.php
+++ b/apps/user_ldap/tests/group_ldap.php
@@ -75,10 +75,15 @@ class Test_Group_Ldap extends \Test\TestCase {
->method('readAttribute')
->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);
$users = $groupBackend->countUsersInGroup('group');
- $this->assertSame(4, $users);
+ $this->assertSame(6, $users);
}
public function testCountWithSearchString() {