|
|
@@ -48,12 +48,11 @@ use Exception; |
|
|
|
use OC\ServerNotAvailableException; |
|
|
|
use OCP\Cache\CappedMemoryCache; |
|
|
|
use OCP\GroupInterface; |
|
|
|
use OCP\Group\Backend\ABackend; |
|
|
|
use OCP\Group\Backend\IDeleteGroupBackend; |
|
|
|
use OCP\Group\Backend\IGetDisplayNameBackend; |
|
|
|
use Psr\Log\LoggerInterface; |
|
|
|
|
|
|
|
class Group_LDAP extends ABackend implements GroupInterface, IGroupLDAP, IGetDisplayNameBackend, IDeleteGroupBackend { |
|
|
|
class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, IGetDisplayNameBackend, IDeleteGroupBackend { |
|
|
|
protected bool $enabled = false; |
|
|
|
|
|
|
|
/** @var CappedMemoryCache<string[]> $cachedGroupMembers array of users with gid as key */ |
|
|
@@ -64,7 +63,6 @@ class Group_LDAP extends ABackend implements GroupInterface, IGroupLDAP, IGetDis |
|
|
|
protected CappedMemoryCache $cachedNestedGroups; |
|
|
|
protected GroupPluginManager $groupPluginManager; |
|
|
|
protected LoggerInterface $logger; |
|
|
|
protected Access $access; |
|
|
|
|
|
|
|
/** |
|
|
|
* @var string $ldapGroupMemberAssocAttr contains the LDAP setting (in lower case) with the same name |
|
|
@@ -72,7 +70,7 @@ class Group_LDAP extends ABackend implements GroupInterface, IGroupLDAP, IGetDis |
|
|
|
protected string $ldapGroupMemberAssocAttr; |
|
|
|
|
|
|
|
public function __construct(Access $access, GroupPluginManager $groupPluginManager) { |
|
|
|
$this->access = $access; |
|
|
|
parent::__construct($access); |
|
|
|
$filter = $this->access->connection->ldapGroupFilter; |
|
|
|
$gAssoc = $this->access->connection->ldapGroupMemberAssocAttr; |
|
|
|
if (!empty($filter) && !empty($gAssoc)) { |
|
|
@@ -1333,11 +1331,4 @@ class Group_LDAP extends ABackend implements GroupInterface, IGroupLDAP, IGetDis |
|
|
|
$this->access->connection->writeToCache($cacheKey, $displayName); |
|
|
|
return $displayName; |
|
|
|
} |
|
|
|
|
|
|
|
public function searchInGroup(string $gid, string $search = '', int $limit = -1, int $offset = 0): array { |
|
|
|
if (!$this->enabled) { |
|
|
|
return []; |
|
|
|
} |
|
|
|
return parent::searchInGroup($gid, $search, $limit, $offset); |
|
|
|
} |
|
|
|
} |