summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Calviño Sánchez <danxuliu@gmail.com>2024-07-16 14:12:54 +0200
committerDaniel Calviño Sánchez <danxuliu@gmail.com>2024-07-18 17:12:07 +0200
commit6aff0e1b1b895aeb539e630c990047edecd0b6b4 (patch)
tree4d2d207d16a19eb4c0994adf323c85fcf22cb828
parent73923d16c021bef7954975b7af0b64744af988c3 (diff)
wip: Update call flags by federated participantsadd-support-for-federated-calls
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
-rw-r--r--appinfo/routes/routesCallController.php2
-rw-r--r--lib/Controller/CallController.php67
-rw-r--r--lib/Federation/Proxy/TalkV1/Controller/CallController.php34
3 files changed, 103 insertions, 0 deletions
diff --git a/appinfo/routes/routesCallController.php b/appinfo/routes/routesCallController.php
index 286e40f28..fb260175f 100644
--- a/appinfo/routes/routesCallController.php
+++ b/appinfo/routes/routesCallController.php
@@ -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() */
diff --git a/lib/Controller/CallController.php b/lib/Controller/CallController.php
index 1abdd50df..6a6e0117f 100644
--- a/lib/Controller/CallController.php
+++ b/lib/Controller/CallController.php
@@ -307,6 +307,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 {
@@ -315,6 +316,17 @@ 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);
+ $response = $proxy->updateCallFlags($this->room, $this->participant, $flags);
+
+ if ($response->getStatus() === Http::STATUS_BAD_REQUEST
+ || $response->getStatus() === Http::STATUS_NOT_FOUND) {
+ return new DataResponse([], $response->getStatus());
+ }
+ }
+
try {
$this->participantService->updateCallFlags($this->room, $this->participant, $flags);
} catch (\Exception $exception) {
@@ -324,6 +336,61 @@ class CallController extends AEnvironmentAwareController {
return new DataResponse();
}
+ // TODO RequireParticipant?
+ #[PublicPage]
+ #[BruteForceProtection(action: 'talkFederationAccess')]
+ #[BruteForceProtection(action: 'talkRoomToken')]
+ public function updateFederatedCallFlags(string $sessionId, int $flags): DataResponse {
+ $token = $this->request->getParam('token');
+
+ if (!$this->federationAuthenticator->isFederationRequest()) {
+ $response = new DataResponse(null, Http::STATUS_NOT_FOUND);
+ $response->throttle(['token' => $token, 'action' => 'talkRoomToken']);
+ return $response;
+ }
+
+ try {
+ try {
+ $room = $this->federationAuthenticator->getRoom();
+ } catch (RoomNotFoundException) {
+ $room = $this->manager->getRoomByRemoteAccess(
+ $token,
+ Attendee::ACTOR_FEDERATED_USERS,
+ $this->federationAuthenticator->getCloudId(),
+ $this->federationAuthenticator->getAccessToken(),
+ );
+ }
+
+ try {
+ $participant = $this->federationAuthenticator->getParticipant();
+ } catch (ParticipantNotFoundException) {
+ $participant = $this->participantService->getParticipantBySession(
+ $room,
+ $sessionId,
+ );
+ $this->federationAuthenticator->authenticated($room, $participant);
+ }
+ } catch (RoomNotFoundException|ParticipantNotFoundException $e) {
+ $response = new DataResponse(null, Http::STATUS_NOT_FOUND);
+ $response->throttle(['token' => $token, 'action' => 'talkFederationAccess']);
+ return $response;
+ }
+
+ // TODO needed?
+ $session = $participant->getSession();
+ if (!$session instanceof Session) {
+ return new DataResponse([], Http::STATUS_NOT_FOUND);
+ }
+
+ try {
+ $this->participantService->updateCallFlags($room, $participant, $flags);
+ } catch (\Exception $exception) {
+ return new DataResponse([], Http::STATUS_BAD_REQUEST);
+ }
+
+ return new DataResponse();
+ }
+
/**
* Leave a call
*
diff --git a/lib/Federation/Proxy/TalkV1/Controller/CallController.php b/lib/Federation/Proxy/TalkV1/Controller/CallController.php
index 8ca0c5681..04d146b77 100644
--- a/lib/Federation/Proxy/TalkV1/Controller/CallController.php
+++ b/lib/Federation/Proxy/TalkV1/Controller/CallController.php
@@ -65,6 +65,40 @@ class CallController {
return new DataResponse([], $statusCode);
}
+ /**
+ * @see \OCA\Talk\Controller\RoomController::updateFederatedCallFlags()
+ *
+ * @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 = [
+ 'flags' => $flags,
+ ];
+ if ($participant->getSession() instanceof Session) {
+ $options['sessionId'] = $participant->getSession()->getSessionId();
+ }
+
+ $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);
+ }
+
public function leaveFederatedCall(Room $room, Participant $participant): DataResponse {
$options = [];
if ($participant->getSession() instanceof Session) {