-
-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor user_ldap group membership to use flat DB
Move away from serialized arrays. Also use a QBMapper class for the new table. Signed-off-by: Côme Chilliet <[email protected]>
- Loading branch information
Showing
6 changed files
with
313 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2023 Côme Chilliet <[email protected]> | ||
| * | ||
| * @author Côme Chilliet <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OCA\User_LDAP\Db; | ||
|
|
||
| use OCP\AppFramework\Db\Entity; | ||
|
|
||
| /** | ||
| * @method void setUserid(string $userid) | ||
| * @method string getUserid() | ||
| * @method void setGroupid(string $groupid) | ||
| * @method string getGroupid() | ||
| */ | ||
| class GroupMembership extends Entity { | ||
| /** @var string */ | ||
| protected $groupid; | ||
|
|
||
| /** @var string */ | ||
| protected $userid; | ||
|
|
||
| public function __construct() { | ||
| $this->addType('groupid', 'string'); | ||
| $this->addType('userid', 'string'); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2023 Côme Chilliet <[email protected]> | ||
| * | ||
| * @author Côme Chilliet <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OCA\User_LDAP\Db; | ||
|
|
||
| use OCP\AppFramework\Db\QBMapper; | ||
| use OCP\IDBConnection; | ||
|
|
||
| /** | ||
| * @template-extends QBMapper<GroupMembership> | ||
| */ | ||
| class GroupMembershipMapper extends QBMapper { | ||
| public function __construct(IDBConnection $db) { | ||
| parent::__construct($db, 'ldap_group_membership', GroupMembership::class); | ||
| } | ||
|
|
||
| /** | ||
| * @return string[] | ||
| */ | ||
| public function getKnownGroups(): array { | ||
| $query = $this->db->getQueryBuilder(); | ||
| $result = $query->selectDistinct('groupid') | ||
| ->from($this->getTableName()) | ||
| ->executeQuery(); | ||
|
|
||
| $groups = $result->fetchAll(); | ||
| $result->closeCursor(); | ||
| return $groups; | ||
| } | ||
|
|
||
| /** | ||
| * @return GroupMembership[] | ||
| */ | ||
| public function findGroupMemberships(string $groupid): array { | ||
| $qb = $this->db->getQueryBuilder(); | ||
| $select = $qb->select('*') | ||
| ->from($this->getTableName()) | ||
| ->where($qb->expr()->eq('groupid', $qb->createNamedParameter($groupid))); | ||
|
|
||
| return $this->findEntities($select); | ||
| } | ||
|
|
||
| public function deleteGroups(array $removedGroups): void { | ||
| $query = $this->db->getQueryBuilder(); | ||
| $query->delete($this->getTableName()) | ||
| ->where($query->expr()->in('groupid', $query->createParameter('groupids'))); | ||
|
|
||
| foreach (array_chunk($removedGroups, 1000) as $removedGroupsChunk) { | ||
| $query->setParameter('groupids', $removedGroupsChunk, IQueryBuilder::PARAM_STR_ARRAY); | ||
| $query->executeStatement(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.