Mirrors
/
nextcloud-spreed
mirror of https://github.com/nextcloud/spreed
3
0
Fork 0
Code Releases Activity
Browse Source

feat: Update call flags by federated participants 

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
pull/12668/head
Daniel Calviño Sánchez 1 year ago
parent
1163e734e6
commit
9b526a0365
4 changed files with 122 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      appinfo/routes/routesCallController.php
  2. 40
      lib/Controller/CallController.php
  3. 37
      lib/Federation/Proxy/TalkV1/Controller/CallController.php
  4. 43
      tests/integration/features/federation/call.feature

2
appinfo/routes/routesCallController.php
View File

@ -25,6 +25,8 @@ return [
['name' => 'Call#sipDialOut', 'url' => '/api/{apiVersion}/call/{token}/dialout/{attendeeId}', 'verb' => 'POST', 'requirements' => $requirements],
/** @see \OCA\Talk\Controller\CallController::updateCallFlags() */
['name' => 'Call#updateCallFlags', 'url' => '/api/{apiVersion}/call/{token}', 'verb' => 'PUT', 'requirements' => $requirements],
/** @see \OCA\Talk\Controller\CallController::updateFederatedCallFlags() */
['name' => 'Call#updateFederatedCallFlags', 'url' => '/api/{apiVersion}/call/{token}/federation', 'verb' => 'PUT', 'requirements' => $requirements],
/** @see \OCA\Talk\Controller\CallController::leaveCall() */
['name' => 'Call#leaveCall', 'url' => '/api/{apiVersion}/call/{token}', 'verb' => 'DELETE', 'requirements' => $requirements],
/** @see \OCA\Talk\Controller\CallController::leaveFederatedCall() */

40
lib/Controller/CallController.php
View File

@ -313,6 +313,7 @@ class CallController extends AEnvironmentAwareController {
* 400: Updating in-call flags is not possible
* 404: Call session not found
*/
#[FederationSupported]
#[PublicPage]
#[RequireParticipant]
public function updateCallFlags(int $flags): DataResponse {
@ -321,6 +322,12 @@ class CallController extends AEnvironmentAwareController {
return new DataResponse([], Http::STATUS_NOT_FOUND);
}
if ($this->room->isFederatedConversation()) {
/** @var \OCA\Talk\Federation\Proxy\TalkV1\Controller\CallController $proxy */
$proxy = \OCP\Server::get(\OCA\Talk\Federation\Proxy\TalkV1\Controller\CallController::class);
return $proxy->updateFederatedCallFlags($this->room, $this->participant, $flags);
}
try {
$this->participantService->updateCallFlags($this->room, $this->participant, $flags);
} catch (\Exception $exception) {
@ -330,6 +337,39 @@ class CallController extends AEnvironmentAwareController {
return new DataResponse();
}
/**
* Update the in-call flags on the host server using the session id of the
* federated user.
*
* @param string $sessionId Federated session id to update the flags with
* @param int<0, 15> $flags New flags
* @psalm-param int-mask-of<Participant::FLAG_*> $flags New flags
* @return DataResponse<Http::STATUS_OK|Http::STATUS_BAD_REQUEST, array<empty>, array{}>|DataResponse<Http::STATUS_NOT_FOUND, null, array{}>
*
* 200: In-call flags updated successfully
* 400: Updating in-call flags is not possible
* 404: Call session not found
*/
#[PublicPage]
#[RequireFederatedParticipant]
#[BruteForceProtection(action: 'talkFederationAccess')]
#[BruteForceProtection(action: 'talkRoomToken')]
public function updateFederatedCallFlags(string $sessionId, int $flags): DataResponse {
if (!$this->federationAuthenticator->isFederationRequest()) {
$response = new DataResponse(null, Http::STATUS_NOT_FOUND);
$response->throttle(['token' => $this->room->getToken(), 'action' => 'talkRoomToken']);
return $response;
}
try {
$this->participantService->updateCallFlags($this->room, $this->participant, $flags);
} catch (\Exception) {
return new DataResponse([], Http::STATUS_BAD_REQUEST);
}
return new DataResponse();
}
/**
* Leave a call
*

37
lib/Federation/Proxy/TalkV1/Controller/CallController.php
View File

@ -71,6 +71,43 @@ class CallController {
return new DataResponse([], $statusCode);
}
/**
* @see \OCA\Talk\Controller\RoomController::updateFederatedCallFlags()
*
* @param Room $room the federated room to update the call flags in
* @param Participant $participant the federated user to update the call
* flags; the participant must have a session
* @param int<0, 15> $flags New flags
* @psalm-param int-mask-of<Participant::FLAG_*> $flags New flags
* @return DataResponse<Http::STATUS_OK|Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND, array<empty>, array{}>
* @throws CannotReachRemoteException
*
* 200: In-call flags updated successfully for federated user
* 400: Updating in-call flags is not possible
* 404: Room not found
*/
public function updateFederatedCallFlags(Room $room, Participant $participant, int $flags): DataResponse {
$options = [
'sessionId' => $participant->getSession()->getSessionId(),
'flags' => $flags,
];
$proxy = $this->proxy->put(
$participant->getAttendee()->getInvitedCloudId(),
$participant->getAttendee()->getAccessToken(),
$room->getRemoteServer() . '/ocs/v2.php/apps/spreed/api/v4/call/' . $room->getRemoteToken() . '/federation',
$options,
);
$statusCode = $proxy->getStatusCode();
if (!in_array($statusCode, [Http::STATUS_OK, Http::STATUS_BAD_REQUEST, Http::STATUS_NOT_FOUND], true)) {
$this->proxy->logUnexpectedStatusCode(__METHOD__, $proxy->getStatusCode());
throw new CannotReachRemoteException();
}
return new DataResponse([], $statusCode);
}
/**
* @see \OCA\Talk\Controller\RoomController::leaveFederatedCall()
*

43
tests/integration/features/federation/call.feature
View File

@ -54,6 +54,49 @@ Feature: federation/call
| federated_users | participant1@{$LOCAL_URL} | 3 |
| users | participant2 | 7 |
Scenario: update call flags
Given user "participant1" creates room "room" (v4)
| roomType | 2 |
| roomName | room |
And user "participant1" adds federated_user "participant2@REMOTE" to room "room" with 200 (v4)
And using server "REMOTE"
And user "participant2" has the following invitations (v1)
| remoteServerUrl | remoteToken | state | inviterCloudId | inviterDisplayName |
| LOCAL | room | 0 | participant1@http://localhost:8080 | participant1-displayname |
And user "participant2" accepts invite to room "room" of server "LOCAL" with 200 (v1)
| id | name | type | remoteServer | remoteToken |
| LOCAL::room | room | 2 | LOCAL | room |
And using server "LOCAL"
And user "participant1" joins room "room" with 200 (v4)
And using server "REMOTE"
And user "participant2" joins room "LOCAL::room" with 200 (v4)
And user "participant2" joins call "LOCAL::room" with 200 (v4)
| flags | 7 |
And user "participant2" is participant of room "LOCAL::room" (v4)
| callFlag |
| 7 |
And user "participant2" sees the following attendees in room "LOCAL::room" with 200 (v4)
| actorType | actorId | inCall |
| federated_users | participant1@{$LOCAL_URL} | 0 |
| users | participant2 | 7 |
When user "participant2" updates call flags in room "LOCAL::room" to "1" with 200 (v4)
And using server "LOCAL"
And user "participant1" is participant of room "room" (v4)
| callFlag |
| 7 |
And user "participant1" sees the following attendees in room "room" with 200 (v4)
| actorType | actorId | inCall |
| users | participant1 | 0 |
| federated_users | participant2@{$REMOTE_URL} | 1 |
And using server "REMOTE"
And user "participant2" is participant of room "LOCAL::room" (v4)
| callFlag |
| 7 |
And user "participant2" sees the following attendees in room "LOCAL::room" with 200 (v4)
| actorType | actorId | inCall |
| federated_users | participant1@{$LOCAL_URL} | 0 |
| users | participant2 | 1 |
Scenario: leave call
Given user "participant1" creates room "room" (v4)
| roomType | 2 |

Write Preview
Loading…
Cancel
Save