Added parameter to disallow creating of rooms with public access #8082
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ | |
| /** | ||
| * @copyright Copyright (c) 2016 Lukas Reschke <[email protected]> | ||
| * @copyright Copyright (c) 2016 Joas Schilling <[email protected]> | ||
| * @copyright Copyright (c) 2022 Informatyka Boguslawski sp. z o.o. sp.k., http://www.ib.pl/ | ||
| * | ||
| * @author Lukas Reschke <[email protected]> | ||
| * @author Joas Schilling <[email protected]> | ||
|
|
@@ -1115,6 +1116,11 @@ public function addParticipantToRoom(string $newParticipant, string $source = 'u | |
|
|
||
| $this->participantService->addCircle($this->room, $circle, $participants); | ||
| } elseif ($source === 'emails') { | ||
| // E-mails cannot be added if public rooms are disabled. | ||
| if ($this->config->getAppValue('spreed', 'public_rooms_allowed', 'yes') === 'no') { | ||
| return new DataResponse([], Http::STATUS_BAD_REQUEST); | ||
| } | ||
|
|
||
| $data = []; | ||
| if ($this->roomService->setType($this->room, Room::TYPE_PUBLIC)) { | ||
| $data = ['type' => $this->room->getType()]; | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| declare(strict_types=1); | ||
| /** | ||
| * @copyright Copyright (c) 2016 Joas Schilling <[email protected]> | ||
| * @copyright Copyright (c) 2022 Informatyka Boguslawski sp. z o.o. sp.k., http://www.ib.pl/ | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
|
|
@@ -156,6 +157,7 @@ public function createRoomObject(array $row): Room { | |
| } | ||
|
|
||
| return new Room( | ||
| $this->config, | ||
| $this, | ||
| $this->db, | ||
| $this->dispatcher, | ||
|
|
@@ -908,6 +910,12 @@ public function getChangelogRoom(string $userId): Room { | |
| * @return Room | ||
| */ | ||
| public function createRoom(int $type, string $name = '', string $objectType = '', string $objectId = ''): Room { | ||
|
|
||
| // Force group room if public room was requested and public rooms are disallowed. | ||
| if (($type === Room::TYPE_PUBLIC) && ($this->config->getAppValue('spreed', 'public_rooms_allowed', 'yes') === 'no')) { | ||
| $type = Room::TYPE_GROUP; | ||
| } | ||
|
|
||
| $token = $this->getNewToken(); | ||
|
|
||
| $insert = $this->db->getQueryBuilder(); | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ | |
| /** | ||
| * @copyright Copyright (c) 2016 Lukas Reschke <[email protected]> | ||
| * @copyright Copyright (c) 2016 Joas Schilling <[email protected]> | ||
| * @copyright Copyright (c) 2022 Informatyka Boguslawski sp. z o.o. sp.k., http://www.ib.pl/ | ||
| * | ||
| * @author Lukas Reschke <[email protected]> | ||
| * @author Joas Schilling <[email protected]> | ||
|
|
@@ -38,6 +39,7 @@ | |
| use OCA\Talk\Service\RoomService; | ||
| use OCP\AppFramework\Utility\ITimeFactory; | ||
| use OCP\Comments\IComment; | ||
| use OCP\IConfig; | ||
| use OCP\DB\QueryBuilder\IQueryBuilder; | ||
| use OCP\EventDispatcher\IEventDispatcher; | ||
| use OCP\IDBConnection; | ||
|
|
@@ -185,8 +187,10 @@ class Room { | |
|
|
||
| protected ?string $currentUser = null; | ||
| protected ?Participant $participant = null; | ||
| protected IConfig $config; | ||
|
|
||
| public function __construct(IConfig $config, | ||
| Manager $manager, | ||
| IDBConnection $db, | ||
| IEventDispatcher $dispatcher, | ||
| ITimeFactory $timeFactory, | ||
|
|
@@ -216,6 +220,7 @@ public function __construct(Manager $manager, | |
| ?\DateTime $lobbyTimer, | ||
| string $objectType, | ||
| string $objectId) { | ||
| $this->config = $config; | ||
| $this->manager = $manager; | ||
| $this->db = $db; | ||
| $this->dispatcher = $dispatcher; | ||
|
|
@@ -257,6 +262,11 @@ public function getType(): int { | |
| } | ||
|
|
||
| public function setType(int $type): void { | ||
| // Force group room if public room was requested and public rooms are disallowed. | ||
| if (($type === self::TYPE_PUBLIC) && ($this->config->getAppValue('spreed', 'public_rooms_allowed', 'yes') === 'no')) { | ||
| $type = self::TYPE_GROUP; | ||
| } | ||
|
Comment on lines
+265
to
+268
Member
There was a problem hiding this comment. This is not correct. You want to do this change on the RoomService, not the model.
Contributor
Author
There was a problem hiding this comment. Modified places where choosen to avoid problems with lack of return errors handling. If you still recommend moving it elswhere - please suggest detailed change.
Member
There was a problem hiding this comment. As per above, you should do it only in the RoomService
Contributor
Author
There was a problem hiding this comment. Don't see any mention of |
||
|
|
||
| $this->type = $type; | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| declare(strict_types=1); | ||
| /** | ||
| * @copyright Copyright (c) 2019 Joas Schilling <[email protected]> | ||
| * @copyright Copyright (c) 2022 Informatyka Boguslawski sp. z o.o. sp.k., http://www.ib.pl/ | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
|
|
@@ -146,6 +147,11 @@ protected function initMatterbridge(): void { | |
| 'matterbridge_enable', | ||
| $this->serverConfig->getAppValue('spreed', 'enable_matterbridge', '0') === '1' | ||
| ); | ||
|
|
||
| $this->initialState->provideInitialState( | ||
| 'public_rooms_allowed', | ||
| $this->serverConfig->getAppValue('spreed', 'public_rooms_allowed', 'yes') === 'yes' | ||
|
Member
There was a problem hiding this comment. We need to expose this to the mobile clients as a capability so they can also hide the features accordingly.
Contributor
Author
There was a problem hiding this comment. This mod was created for web UI. Not experienced in nextcloud devel nor using mobile app so please suggest required changes if necessary.
Member
There was a problem hiding this comment. Basically add a line like this which in addition also checks your config: Line 151 in 91d3bd8
Contributor
Author
There was a problem hiding this comment. Not experienced with capabilities in Nextcloud - please create change suggestion and will just accept it to this PR or make separate PR to adjust it. |
||
| ); | ||
| } | ||
|
|
||
| protected function initStunServers(): void { | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| declare(strict_types=1); | ||
| /** | ||
| * @copyright Copyright (c) 2020 Joas Schilling <[email protected]> | ||
| * @copyright Copyright (c) 2022 Informatyka Boguslawski sp. z o.o. sp.k., http://www.ib.pl/ | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
|
|
@@ -105,6 +106,11 @@ protected function publishInitialStateForUser(IUser $user, IRootFolder $rootFold | |
| $appManager->isEnabledForUser('circles', $user) | ||
| ); | ||
|
|
||
| $this->initialState->provideInitialState( | ||
| 'public_rooms_allowed', | ||
| $this->serverConfig->getAppValue('spreed', 'public_rooms_allowed', 'yes') === 'yes' | ||
| ); | ||
|
|
||
| $this->initialState->provideInitialState( | ||
| 'guests_accounts_enabled', | ||
| $appManager->isEnabledForUser('guests', $user) | ||
|
|
@@ -158,6 +164,11 @@ protected function publishInitialStateForUser(IUser $user, IRootFolder $rootFold | |
| 'enable_matterbridge', | ||
| $this->serverConfig->getAppValue('spreed', 'enable_matterbridge', '0') === '1' | ||
| ); | ||
|
|
||
| $this->initialState->provideInitialState( | ||
| 'public_rooms_allowed', | ||
| $this->serverConfig->getAppValue('spreed', 'public_rooms_allowed', 'yes') === 'yes' | ||
| ); | ||
| } | ||
|
|
||
| protected function publishInitialStateForGuest(): void { | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| <!-- | ||
| - @copyright Copyright (c) 2020 Vincent Petry <[email protected]> | ||
| - @copyright Copyright (c) 2022 Informatyka Boguslawski sp. z o.o. sp.k., http://www.ib.pl/ | ||
| - | ||
| - @author Vincent Petry <[email protected]> | ||
| - | ||
|
|
@@ -54,7 +55,7 @@ | |
| </NcAppSettingsSection> | ||
|
|
||
| <!-- Guest access --> | ||
| <NcAppSettingsSection v-if="canFullModerate && publicRoomsEnabled" | ||
| id="guests" | ||
| :title="t('spreed', 'Guests access')"> | ||
| <LinkShareSettings ref="linkShareSettings" /> | ||
|
|
@@ -148,6 +149,7 @@ export default { | |
| return { | ||
| showSettings: false, | ||
| matterbridgeEnabled: loadState('spreed', 'enable_matterbridge'), | ||
| publicRoomsEnabled: loadState('spreed', 'public_rooms_allowed'), | ||
| isEditingDescription: false, | ||
| isDescriptionLoading: false, | ||
| showDeviceChecker: false, | ||
|
|
@@ -225,9 +227,11 @@ export default { | |
| handleShowSettings({ token }) { | ||
| this.$store.dispatch('updateConversationSettingsToken', token) | ||
| this.showSettings = true | ||
| if (loadState('spreed', 'public_rooms_allowed')) { | ||
| this.$nextTick(() => { | ||
| this.$refs.linkShareSettings.$el.focus() | ||
| }) | ||
| } | ||
| }, | ||
|
|
||
| handleHideSettings() { | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| <!-- | ||
| - @copyright Copyright (c) 2019 Marco Ambrosini <[email protected]> | ||
| - @copyright Copyright (c) 2022 Informatyka Boguslawski sp. z o.o. sp.k., http://www.ib.pl/ | ||
| - | ||
| - @author Marco Ambrosini <[email protected]> | ||
| - | ||
|
|
@@ -45,7 +46,7 @@ | |
| <template v-if="page === 0"> | ||
| <SetConversationName v-model="conversationNameInput" | ||
| @click-enter="handleEnter" /> | ||
| <NcCheckboxRadioSwitch :checked.sync="isPublic" v-if="publicRoomsEnabled"> | ||
| {{ t('spreed', 'Allow guests to join via link') }} | ||
| </NcCheckboxRadioSwitch> | ||
| <!-- Password protection --> | ||
|
|
@@ -138,6 +139,7 @@ import isInCall from '../../../mixins/isInCall.js' | |
| import participant from '../../../mixins/participant.js' | ||
| import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js' | ||
| import { EventBus } from '../../../services/EventBus.js' | ||
| import { loadState } from '@nextcloud/initial-state' | ||
|
|
||
| export default { | ||
|
|
||
|
|
@@ -177,6 +179,7 @@ export default { | |
| password: '', | ||
| passwordProtect: false, | ||
| listable: CONVERSATION.LISTABLE.NONE, | ||
| publicRoomsEnabled: loadState('spreed', 'public_rooms_allowed'), | ||
| } | ||
| }, | ||
|
|
||
|
|
||
This file contains hidden or 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 |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| <!-- | ||
| - @copyright Copyright (c) 2020 Marco Ambrosini <[email protected]> | ||
| - @copyright Copyright (c) 2022 Informatyka Boguslawski sp. z o.o. sp.k., http://www.ib.pl/ | ||
| - | ||
| - @author Marco Ambrosini <[email protected]> | ||
| - | ||
|
|
@@ -34,7 +35,7 @@ | |
| @click="handleClickParticipant" /> | ||
| </template> | ||
|
|
||
| <template v-if="addableEmails.length !== 0 && publicRoomsEnabled"> | ||
| <NcAppNavigationCaption :title="t('spreed', 'Add emails')" /> | ||
| <ParticipantsList :items="addableEmails" | ||
| @click="handleClickParticipant" /> | ||
|
|
@@ -102,6 +103,7 @@ import NcAppNavigationCaption from '@nextcloud/vue/dist/Components/NcAppNavigati | |
| import Hint from '../../../Hint.vue' | ||
| import AccountPlus from 'vue-material-design-icons/AccountPlus.vue' | ||
| import NcButton from '@nextcloud/vue/dist/Components/NcButton.js' | ||
| import { loadState } from '@nextcloud/initial-state' | ||
|
|
||
| export default { | ||
| name: 'ParticipantsSearchResults', | ||
|
|
@@ -163,6 +165,12 @@ export default { | |
| }, | ||
| }, | ||
|
|
||
| data() { | ||
| return { | ||
| publicRoomsEnabled: loadState('spreed', 'public_rooms_allowed'), | ||
| } | ||
| }, | ||
|
|
||
| computed: { | ||
| sourcesWithoutResults() { | ||
| return !this.addableUsers.length | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| declare(strict_types=1); | ||
| /** | ||
| * @copyright Copyright (c) 2020 Joas Schilling <[email protected]> | ||
| * @copyright Copyright (c) 2022 Informatyka Boguslawski sp. z o.o. sp.k., http://www.ib.pl/ | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
|
|
@@ -38,6 +39,7 @@ | |
| use OCP\AppFramework\Utility\ITimeFactory; | ||
| use OCP\BackgroundJob\IJobList; | ||
| use OCP\EventDispatcher\IEventDispatcher; | ||
| use OCP\IConfig; | ||
| use OCP\IDBConnection; | ||
| use OCP\IUser; | ||
| use OCP\Security\IHasher; | ||
|
|
@@ -359,6 +361,7 @@ public function testVerifyPassword(): void { | |
| ); | ||
|
|
||
| $room = new Room( | ||
| $this->createMock(IConfig::class), | ||
| $this->createMock(Manager::class), | ||
| $this->createMock(IDBConnection::class), | ||
| $dispatcher, | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure if we should simply convert it. Or just error with a 400 Bad Request and a message the clients can display.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Conversion was choosen because spreed code ignores errors returned by modified functions and this seems to be safer. Conversion should never happen because function should be not available in UI also (and if bad guys will try to modify POST, will get group conversation which should not hurt regular users).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That assumes all clients got updated in the meantime :)
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, we use web UI only - feel free to extend it for other required areas if necessary (not experienced enough in nc devel to propose it now).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can fix it with one step by moving it to
RoomService::createConversationand throwing an exception or basically adjust this list here:spreed/lib/Service/RoomService.php
Lines 141 to 147 in 2200896
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
typeis property ofRoomnotRoomServiceso verification should take place inRoomclass to avoid future problems (i.e. code outside ofRoomServicewill create/change room of disabled type). Seems that nowRoom::setTypeandRoomconstructor are the best places for this verification but code using it should properly handle errors when disabled type is passed. Please let me know if its possible to just throw exception inRoommethods mentioned above without messing with room type conversions (there should not be any other trash left after such exception - not sure if it would be safe now).