Skip to content
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

[stable13] Do not allow one2one calling yourself #660

Merged
merged 2 commits into from
Feb 14, 2018
Merged

[stable13] Do not allow one2one calling yourself #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5672388
Do not allow one2one calling yourself
nickvergessen Feb 13, 2018
4bfe038
Fix scenario description
nickvergessen Feb 14, 2018
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
4 changes: 4 additions & 0 deletions lib/Controller/RoomController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,10 @@ protected function createOneToOneRoom($targetUserName) {
return new DataResponse([], Http::STATUS_NOT_FOUND);
}

if ($this->userId === $targetUserName) {
return new DataResponse([], Http::STATUS_FORBIDDEN);
}

// If room exists: Reuse that one, otherwise create a new one.
try {
$room = $this->manager->getOne2OneRoom($this->userId, $targetUser->getUID());
Expand Down
13 changes: 13 additions & 0 deletions tests/integration/features/bootstrap/FeatureContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,19 @@ public function userCreatesRoom($user, $identifier, TableNode $formData = null)
self::$tokenToIdentifier[$response['token']] = $identifier;
}

/**
* @Then /^user "([^"]*)" tries to create room with (\d+)$/
*
* @param string $user
* @param int $statusCode
* @param TableNode|null $formData
*/
public function userTriesToCreateRoom($user, $statusCode, TableNode $formData = null) {
$this->setCurrentUser($user);
$this->sendRequest('POST', '/apps/spreed/api/v1/room', $formData);
$this->assertStatusCode($this->response, $statusCode);
}

/**
* @Then /^user "([^"]*)" joins room "([^"]*)" with (\d+)$/
*
Expand Down
5 changes: 5 additions & 0 deletions tests/integration/features/one-to-one.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ Feature: one-to-one
Then user "participant2" is participant of the following rooms
Then user "participant3" is participant of the following rooms

Scenario: User1 invites themself to a one2one room
When user "participant1" tries to create room with 403
| roomType | 1 |
| invite | participant1 |

Scenario: User1 invites user2 to a one2one room and user3 is not part of it
When user "participant1" creates room "room1"
| roomType | 1 |
Expand Down