Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2021-07-05 16:26:40 +0300
committerJoas Schilling <coding@schilljs.com>2021-08-24 17:55:34 +0300
commit3d34a71b579ea0f8b77819777958026e9b9050e9 (patch)
treeaaa804ac5d91e99504752fc0bddebfa4c4f98eac /lib
parentf520e9809984c9092beb1243ad59953e1e56c5f9 (diff)
Fix tracking of circles/groups memberships when removing of either
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/Listener/AMembershipListener.php119
-rw-r--r--lib/Listener/CircleMembershipListener.php61
-rw-r--r--lib/Listener/GroupMembershipListener.php49
3 files changed, 159 insertions, 70 deletions
diff --git a/lib/Listener/AMembershipListener.php b/lib/Listener/AMembershipListener.php
new file mode 100644
index 000000000..d1d122f17
--- /dev/null
+++ b/lib/Listener/AMembershipListener.php
@@ -0,0 +1,119 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com>
+ *
+ * @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\Talk\Listener;
+
+use OCA\Circles\Api\v1\Circles;
+use OCA\Talk\Exceptions\ParticipantNotFoundException;
+use OCA\Talk\Manager;
+use OCA\Talk\Model\Attendee;
+use OCA\Talk\Participant;
+use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
+use OCP\App\IAppManager;
+use OCP\EventDispatcher\IEventListener;
+use OCP\IGroupManager;
+use OCP\IUser;
+
+abstract class AMembershipListener implements IEventListener {
+
+ /** @var Manager */
+ protected $manager;
+ /** @var IAppManager */
+ protected $appManager;
+ /** @var IGroupManager */
+ protected $groupManager;
+ /** @var ParticipantService */
+ protected $participantService;
+
+ public function __construct(Manager $manager,
+ IAppManager $appManager,
+ IGroupManager $groupManager,
+ ParticipantService $participantService) {
+ $this->manager = $manager;
+ $this->appManager = $appManager;
+ $this->groupManager = $groupManager;
+ $this->participantService = $participantService;
+ }
+
+ protected function removeFromRoomsUnlessStillLinked(array $rooms, IUser $user): void {
+ $rooms = $this->filterRoomsWithOtherGroupMemberships($rooms, $user);
+ $rooms = $this->filterRoomsWithOtherCircleMemberships($rooms, $user);
+
+ foreach ($rooms as $room) {
+ try {
+ $participant = $room->getParticipant($user->getUID());
+ $participantType = $participant->getAttendee()->getParticipantType();
+ if ($participantType === Participant::USER) {
+ $this->participantService->removeUser($room, $user, Room::PARTICIPANT_REMOVED);
+ }
+ } catch (ParticipantNotFoundException $e) {
+ }
+ }
+ }
+
+ protected function filterRoomsWithOtherGroupMemberships(array $rooms, IUser $user): array {
+ $userGroupIds = $this->groupManager->getUserGroupIds($user);
+
+ $furtherMemberships = [];
+ foreach ($userGroupIds as $groupId) {
+ $groupRooms = $this->manager->getRoomsForActor(Attendee::ACTOR_GROUPS, $groupId);
+ foreach ($groupRooms as $room) {
+ $furtherMemberships[$room->getId()] = true;
+ }
+ }
+
+ return array_filter($rooms, static function (Room $room) use ($furtherMemberships) {
+ // Only delete from rooms where the user is not member via another group
+ return !isset($furtherMemberships[$room->getId()]);
+ });
+ }
+
+ protected function filterRoomsWithOtherCircleMemberships(array $rooms, IUser $user): array {
+ if (!$this->appManager->isEnabledForUser('circles', $user)) {
+ \OC::$server->getLogger()->error('Circles not enabled', ['app' => 'nickv']);
+ return $rooms;
+ }
+
+ try {
+ /** @var Circles $circlesApi */
+ $circles = Circles::joinedCircles($user->getUID());
+ } catch (\Exception $e) {
+ return $rooms;
+ }
+
+ $furtherMemberships = [];
+ foreach ($circles as $circle) {
+ $circleRooms = $this->manager->getRoomsForActor(Attendee::ACTOR_CIRCLES, $circle->getSingleId());
+
+ foreach ($circleRooms as $room) {
+ $furtherMemberships[$room->getId()] = true;
+ }
+ }
+
+ return array_filter($rooms, static function (Room $room) use ($furtherMemberships) {
+ // Only delete from rooms where the user is not member via another group
+ return !isset($furtherMemberships[$room->getId()]);
+ });
+ }
+}
diff --git a/lib/Listener/CircleMembershipListener.php b/lib/Listener/CircleMembershipListener.php
index 2050c1400..4846e80b4 100644
--- a/lib/Listener/CircleMembershipListener.php
+++ b/lib/Listener/CircleMembershipListener.php
@@ -25,43 +25,39 @@ namespace OCA\Talk\Listener;
use OCA\Circles\Events\AddingCircleMemberEvent;
use OCA\Circles\Events\RemovingCircleMemberEvent;
-use OCA\Circles\Model\Circle;
use OCA\Circles\Model\Member;
use OCA\Talk\Exceptions\ParticipantNotFoundException;
use OCA\Talk\Manager;
use OCA\Talk\Model\Attendee;
use OCA\Talk\Participant;
use OCA\Talk\Service\ParticipantService;
+use OCP\App\IAppManager;
use OCP\EventDispatcher\Event;
-use OCP\EventDispatcher\IEventListener;
use OCP\IGroupManager;
use OCP\ISession;
use OCP\IUser;
use OCP\IUserManager;
-class CircleMembershipListener implements IEventListener {
-
+class CircleMembershipListener extends AMembershipListener {
/** @var ISession */
private $session;
/** @var IUserManager */
private $userManager;
- /** @var IGroupManager */
- private $groupManager;
- /** @var Manager */
- private $manager;
- /** @var ParticipantService */
- private $participantService;
-
- public function __construct(ISession $session,
- IUserManager $userManager,
+
+ public function __construct(Manager $manager,
+ IAppManager $appManager,
IGroupManager $groupManager,
- Manager $manager,
- ParticipantService $participantService) {
- $this->session = $session;
+ ParticipantService $participantService,
+ IUserManager $userManager,
+ ISession $session) {
+ parent::__construct(
+ $manager,
+ $appManager,
+ $groupManager,
+ $participantService
+ );
$this->userManager = $userManager;
- $this->groupManager = $groupManager;
- $this->manager = $manager;
- $this->participantService = $participantService;
+ $this->session = $session;
}
public function handle(Event $event): void {
@@ -70,7 +66,7 @@ class CircleMembershipListener implements IEventListener {
}
if ($event instanceof RemovingCircleMemberEvent) {
- $this->removeFormerMemberFromRooms($event->getCircle(), $event->getMember());
+ $this->removeFormerMemberFromRooms($event);
}
}
@@ -148,17 +144,36 @@ class CircleMembershipListener implements IEventListener {
}
}
- protected function removeFormerMemberFromRooms(Circle $circle, Member $member): void {
- if ($member->getUserType() !== Member::TYPE_USER || $member->getUserId() === '') {
+ protected function removeFormerMemberFromRooms(RemovingCircleMemberEvent $event): void {
+ $circle = $event->getCircle();
+ $removedMember = $event->getMember();
+
+ if ($removedMember->getUserType() !== Member::TYPE_USER || $removedMember->getUserId() === '') {
// Not a user?
return;
}
+ $user = $this->userManager->get($removedMember->getUserId());
+ if (!$user instanceof IUser) {
+ // User doesn't exist anymore?
+ return;
+ }
+
+ $removedBy = $removedMember->getInvitedBy();
+ if ($removedBy->getUserType() === Member::TYPE_USER && $removedBy->getUserId() !== '') {
+ $this->session->set('talk-overwrite-actor', $removedBy->getUserId());
+ } else if ($removedBy->getUserType() === Member::TYPE_APP && $removedBy->getUserId() === 'occ') {
+ $this->session->set('talk-overwrite-actor-cli', 'cli');
+ }
+
$rooms = $this->manager->getRoomsForActor(Attendee::ACTOR_CIRCLES, $circle->getSingleId());
if (empty($rooms)) {
return;
}
- // FIXME we now need to check user groups and circles?
+ $this->removeFromRoomsUnlessStillLinked($rooms, $user);
+
+ $this->session->remove('talk-overwrite-actor');
+ $this->session->remove('talk-overwrite-actor-cli');
}
}
diff --git a/lib/Listener/GroupMembershipListener.php b/lib/Listener/GroupMembershipListener.php
index d67e04d5c..85f426f63 100644
--- a/lib/Listener/GroupMembershipListener.php
+++ b/lib/Listener/GroupMembershipListener.php
@@ -24,36 +24,15 @@ declare(strict_types=1);
namespace OCA\Talk\Listener;
use OCA\Talk\Exceptions\ParticipantNotFoundException;
-use OCA\Talk\Manager;
use OCA\Talk\Model\Attendee;
use OCA\Talk\Participant;
-use OCA\Talk\Room;
-use OCA\Talk\Service\ParticipantService;
use OCP\EventDispatcher\Event;
-use OCP\EventDispatcher\IEventListener;
use OCP\Group\Events\UserAddedEvent;
use OCP\Group\Events\UserRemovedEvent;
use OCP\IGroup;
-use OCP\IGroupManager;
use OCP\IUser;
-class GroupMembershipListener implements IEventListener {
-
- /** @var IGroupManager */
- private $groupManager;
- /** @var Manager */
- private $manager;
- /** @var ParticipantService */
- private $participantService;
-
- public function __construct(IGroupManager $groupManager,
- Manager $manager,
- ParticipantService $participantService) {
- $this->groupManager = $groupManager;
- $this->manager = $manager;
- $this->participantService = $participantService;
- }
-
+class GroupMembershipListener extends AMembershipListener {
public function handle(Event $event): void {
if ($event instanceof UserAddedEvent) {
$this->addNewMemberToRooms($event->getGroup(), $event->getUser());
@@ -88,30 +67,6 @@ class GroupMembershipListener implements IEventListener {
return;
}
- $userGroupIds = $this->groupManager->getUserGroupIds($user);
-
- $furtherMemberships = [];
- foreach ($userGroupIds as $groupId) {
- $groupRooms = $this->manager->getRoomsForActor(Attendee::ACTOR_GROUPS, $groupId);
- foreach ($groupRooms as $room) {
- $furtherMemberships[$room->getId()] = true;
- }
- }
-
- $rooms = array_filter($rooms, static function (Room $room) use ($furtherMemberships) {
- // Only delete from rooms where the user is not member via another group
- return !isset($furtherMemberships[$room->getId()]);
- });
-
- foreach ($rooms as $room) {
- try {
- $participant = $room->getParticipant($user->getUID());
- $participantType = $participant->getAttendee()->getParticipantType();
- if ($participantType === Participant::USER) {
- $this->participantService->removeUser($room, $user, Room::PARTICIPANT_REMOVED);
- }
- } catch (ParticipantNotFoundException $e) {
- }
- }
+ $this->removeFromRoomsUnlessStillLinked($rooms, $user);
}
}