Skip to content

Fix flow and chat permissions #7917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 3 commits into from
Sep 15, 2022
Merged

Fix flow and chat permissions #7917

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37c9d6d
Only post flow messages when people have permissions
nickvergessen Sep 14, 2022
1f037ba
Also filter out conversations where the user has no chat permissions
nickvergessen Sep 14, 2022
add1d45
Update lib/Flow/Operation.php
nickvergessen Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions lib/Flow/Operation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
use OCA\Talk\Exceptions\ParticipantNotFoundException;
use OCA\Talk\Exceptions\RoomNotFoundException;
use OCA\Talk\Manager as TalkManager;
use OCA\Talk\Model\Attendee;
use OCA\Talk\Participant;
use OCA\Talk\Room;
use OCP\EventDispatcher\Event;
Expand Down Expand Up @@ -116,7 +117,17 @@ public function onEvent(string $eventName, Event $event, IRuleMatcher $ruleMatch
}

$room = $this->getRoom($token, $uid);
if (!($room->getReadOnly() !== Room::READ_WRITE)) {
// Ignore conversation because it is locked
continue;
}

$participant = $this->getParticipant($uid, $room);
if (!($participant->getPermissions() & Attendee::PERMISSIONS_CHAT)) {
// Ignore conversation because the user has no permissions
continue;
}

$this->chatManager->sendMessage(
$room,
$participant,
Expand Down
3 changes: 2 additions & 1 deletion src/views/FlowPostToConversation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
import axios from '@nextcloud/axios'
import { generateOcsUrl } from '@nextcloud/router'
import { FLOW, CONVERSATION } from '../constants.js'
import { FLOW, CONVERSATION, PARTICIPANT } from '../constants.js'

export default {
name: 'FlowPostToConversation',
Expand Down Expand Up @@ -80,6 +80,7 @@ export default {
axios.get(generateOcsUrl('/apps/spreed/api/v4/room')).then((response) => {
this.roomOptions = response.data.ocs.data.filter(function(room) {
return room.readOnly === CONVERSATION.STATE.READ_WRITE
&& (room.permissions & PARTICIPANT.PERMISSIONS.CHAT) !== 0
})
})
},
Expand Down