feat(email): Recognize guests invited via email

Signed-off-by: Joas Schilling <[email protected]>

lib/Chat/MessageParser.php

@@ -142,7 +142,7 @@ protected function getActorInformation(Message $message, string $actorType, stri
 				$displayName = $this->guestNames[$actorId];
 			} else {
 				try {
-					$participant = $this->participantService->getParticipantByActor($message->getRoom(), Attendee::ACTOR_GUESTS, $actorId);
+					$participant = $this->participantService->getParticipantByActor($message->getRoom(), str_contains($actorId, '@') ? Attendee::ACTOR_EMAILS : Attendee::ACTOR_GUESTS, $actorId);
 					$displayName = $participant->getAttendee()->getDisplayName();
 				} catch (ParticipantNotFoundException) {
 				}

lib/Controller/PageController.php

@@ -13,6 +13,7 @@
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Exceptions\RoomNotFoundException;
 use OCA\Talk\Manager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
@@ -50,6 +51,7 @@
 use OCP\Notification\IManager as INotificationManager;
 use OCP\Security\Bruteforce\IThrottler;
 use Psr\Log\LoggerInterface;
+use SensitiveParameter;
 
 #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
 class PageController extends Controller {
@@ -96,9 +98,9 @@ public function __construct(
 	#[PublicPage]
 	#[UseSession]
 	#[BruteForceProtection(action: 'talkRoomToken')]
-	public function showCall(string $token): Response {
+	public function showCall(string $token, string $email = '', string $access = ''): Response {
 		// This is the entry point from the `/call/{token}` URL which is hardcoded in the server.
-		return $this->index($token);
+		return $this->pageHandler($token, email: $email, accessToken: $access);
 	}
 
 	/**
@@ -113,7 +115,7 @@ public function showCall(string $token): Response {
 	#[BruteForceProtection(action: 'talkRoomPassword')]
 	public function authenticatePassword(string $token, string $password = ''): Response {
 		// This is the entry point from the `/call/{token}` URL which is hardcoded in the server.
-		return $this->pageHandler($token, '', $password);
+		return $this->pageHandler($token, password: $password);
 	}
 
 	#[NoCSRFRequired]
@@ -152,11 +154,18 @@ public function index(string $token = '', string $callUser = ''): Response {
 	 * @return TemplateResponse|RedirectResponse
 	 * @throws HintException
 	 */
-	protected function pageHandler(string $token = '', string $callUser = '', string $password = ''): Response {
+	protected function pageHandler(
+		string $token = '',
+		string $callUser = '',
+		string $password = '',
+		string $email = '',
+		#[SensitiveParameter]
+		string $accessToken = '',
+	): Response {
 		$bruteForceToken = $token;
 		$user = $this->userSession->getUser();
 		if (!$user instanceof IUser) {
-			return $this->guestEnterRoom($token, $password);
+			return $this->guestEnterRoom($token, $password, $email, $accessToken);
 		}
 
 		$throttle = false;
@@ -332,12 +341,23 @@ public function recording(string $token): Response {
 	}
 
 	/**
-	 * @param string $token
-	 * @param string $password
 	 * @return TemplateResponse|RedirectResponse
 	 * @throws HintException
 	 */
-	protected function guestEnterRoom(string $token, string $password): Response {
+	protected function guestEnterRoom(
+		string $token,
+		string $password,
+		string $email,
+		#[SensitiveParameter]
+		string $accessToken,
+	): Response {
+		if ($email && $accessToken) {
+			return $this->invitedEmail(
+				$token,
+				$email,
+				$accessToken,
+			);
+		}
 		try {
 			$room = $this->manager->getRoomByToken($token);
 			if ($room->getType() !== Room::TYPE_PUBLIC) {
@@ -405,6 +425,62 @@ protected function guestEnterRoom(string $token, string $password): Response {
 		return $response;
 	}
 
+	/**
+	 * @return TemplateResponse|RedirectResponse
+	 * @throws HintException
+	 */
+	protected function invitedEmail(
+		string $token,
+		string $email,
+		#[SensitiveParameter]
+		string $accessToken,
+	): Response {
+		try {
+			$this->manager->getRoomByAccessToken(
+				$token,
+				Attendee::ACTOR_EMAILS,
+				$email,
+				$accessToken,
+			);
+			$this->talkSession->renewSessionId();
+			$this->talkSession->setAuthedEmailActorIdForRoom($token, $email);
+		} catch (RoomNotFoundException) {
+			$redirectUrl = $this->url->linkToRoute('spreed.Page.index');
+			if ($token) {
+				$redirectUrl = $this->url->linkToRoute('spreed.Page.showCall', ['token' => $token]);
+			}
+			$response = new RedirectResponse($this->url->linkToRoute('core.login.showLoginForm', [
+				'redirect_url' => $redirectUrl,
+			]));
+			$response->throttle(['token' => $token, 'action' => 'talkRoomToken']);
+			return $response;
+		}
+
+		$this->publishInitialStateForGuest();
+		$this->eventDispatcher->dispatchTyped(new RenderReferenceEvent());
+
+		$response = new PublicTemplateResponse($this->appName, 'index', [
+			'id-app-content' => '#content-vue',
+			'id-app-navigation' => null,
+		]);
+
+		$response->setFooterVisible(false);
+		$csp = new ContentSecurityPolicy();
+		$csp->addAllowedConnectDomain('*');
+		$csp->addAllowedMediaDomain('blob:');
+		$csp->addAllowedWorkerSrcDomain('blob:');
+		$csp->addAllowedWorkerSrcDomain("'self'");
+		$csp->addAllowedChildSrcDomain('blob:');
+		$csp->addAllowedChildSrcDomain("'self'");
+		$csp->addAllowedScriptDomain('blob:');
+		$csp->addAllowedScriptDomain("'self'");
+		$csp->addAllowedConnectDomain('blob:');
+		$csp->addAllowedConnectDomain("'self'");
+		$csp->addAllowedImageDomain('https://*.tile.openstreetmap.org');
+		$response->setContentSecurityPolicy($csp);
+		return $response;
+	}
+
 	/**
 	 * @param string $token
 	 * @return RedirectResponse

lib/Controller/RoomController.php

@@ -1076,6 +1076,8 @@ protected function formatParticipantList(array $participants, bool $includeStatu
 				$result['displayName'] = $participant->getAttendee()->getDisplayName();
 			} elseif ($participant->getAttendee()->getActorType() === Attendee::ACTOR_CIRCLES) {
 				$result['displayName'] = $participant->getAttendee()->getDisplayName();
+			} elseif ($participant->getAttendee()->getActorType() === Attendee::ACTOR_EMAILS) {
+				$result['displayName'] = $participant->getAttendee()->getDisplayName();
 			} elseif ($participant->getAttendee()->getActorType() === Attendee::ACTOR_FEDERATED_USERS) {
 				if ($participant->getSession() instanceof Session && $participant->getSession()->getLastPing() <= $maxPingAge) {
 					$this->participantService->leaveRoomAsSession($this->room, $participant);
@@ -1643,8 +1645,10 @@ public function joinRoom(string $token, string $password = '', bool $force = tru
 			}
 		}
 
+		$authenticatedEmailGuest = $this->session->getAuthedEmailActorIdForRoom($token);
+
 		$headers = [];
-		if ($room->isFederatedConversation()) {
+		if ($authenticatedEmailGuest !== null || $room->isFederatedConversation()) {
 			// Skip password checking
 			$result = [
 				'result' => true,
@@ -1659,6 +1663,12 @@ public function joinRoom(string $token, string $password = '', bool $force = tru
 				$participant = $this->participantService->joinRoom($this->roomService, $room, $user, $password, $result['result']);
 				$this->participantService->generatePinForParticipant($room, $participant);
 			} else {
+				if ($authenticatedEmailGuest !== null && $previousParticipant === null) {
+					try {
+						$previousParticipant = $this->participantService->getParticipantByActor($room, Attendee::ACTOR_EMAILS, $authenticatedEmailGuest);
+					} catch (ParticipantNotFoundException $e) {
+					}
+				}
 				$participant = $this->participantService->joinRoomAsNewGuest($this->roomService, $room, $password, $result['result'], $previousParticipant);
 				$this->session->setGuestActorIdForRoom($room->getToken(), $participant->getAttendee()->getActorId());
 			}

lib/Controller/SignalingController.php

@@ -515,7 +515,7 @@ public function pullMessages(string $token): DataResponse {
 			$sessionId = $this->session->getSessionForRoom($token);
 			if ($sessionId === null) {
 				// User is not active in this room
-				return new DataResponse([['type' => 'usersInRoom', 'data' => []]], Http::STATUS_NOT_FOUND);
+				return new DataResponse([['type' => 'usersInRoom', 'data' => [1]]], Http::STATUS_NOT_FOUND);
 			}
 
 			$room = $this->manager->getRoomForSession($this->userId, $sessionId);
@@ -527,7 +527,7 @@ public function pullMessages(string $token): DataResponse {
 			}
 		} catch (RoomNotFoundException) {
 			$this->banIpIfGuestGotBanned($token);
-			return new DataResponse([['type' => 'usersInRoom', 'data' => []]], Http::STATUS_NOT_FOUND);
+			return new DataResponse([['type' => 'usersInRoom', 'data' => [2]]], Http::STATUS_NOT_FOUND);
 		}
 
 		while ($seconds > 0) {
@@ -559,7 +559,7 @@ public function pullMessages(string $token): DataResponse {
 			$sessionId = $this->session->getSessionForRoom($token);
 			if ($sessionId === null) {
 				// User is not active in this room
-				return new DataResponse([['type' => 'usersInRoom', 'data' => []]], Http::STATUS_NOT_FOUND);
+				return new DataResponse([['type' => 'usersInRoom', 'data' => [3]]], Http::STATUS_NOT_FOUND);
 			}
 		}
 
@@ -569,7 +569,7 @@ public function pullMessages(string $token): DataResponse {
 			$data[] = ['type' => 'usersInRoom', 'data' => $this->getUsersInRoom($room, $pingTimestamp)];
 		} catch (RoomNotFoundException) {
 			$this->banIpIfGuestGotBanned($token);
-			$data[] = ['type' => 'usersInRoom', 'data' => []];
+			$data[] = ['type' => 'usersInRoom', 'data' => [4]];
 
 			// Was the session killed or the complete conversation?
 			try {

lib/GuestManager.php

@@ -79,7 +79,7 @@ public function sendEmailInvitation(Room $room, Participant $participant): void
 		$event = new BeforeEmailInvitationSentEvent($room, $participant->getAttendee());
 		$this->dispatcher->dispatchTyped($event);
 
-		$link = $this->url->linkToRouteAbsolute('spreed.Page.showCall', ['token' => $room->getToken()]);
+		$link = $this->url->linkToRouteAbsolute('spreed.Page.showCall', ['token' => $room->getToken(), 'email' => $email, 'access' => $participant->getAttendee()->getAccessToken()]);
 
 		$message = $this->mailer->createMessage();
 

lib/Manager.php

@@ -37,6 +37,7 @@
 use OCP\Security\IHasher;
 use OCP\Security\ISecureRandom;
 use OCP\Server;
+use SensitiveParameter;
 
 class Manager {
 
@@ -746,7 +747,34 @@ public function getRoomByActor(string $token, string $actorType, string $actorId
 	 * @return Room
 	 * @throws RoomNotFoundException
 	 */
-	public function getRoomByRemoteAccess(string $token, string $actorType, string $actorId, string $remoteAccess, ?string $sessionId = null): Room {
+	public function getRoomByRemoteAccess(
+		string $token,
+		string $actorType,
+		string $actorId,
+		#[SensitiveParameter]
+		string $remoteAccess,
+		?string $sessionId = null,
+	): Room {
+		return $this->getRoomByAccessToken($token, $actorType, $actorId, $sessionId, $remoteAccess, $sessionId);
+	}
+
+	/**
+	 * @param string $token
+	 * @param string $actorType
+	 * @param string $actorId
+	 * @param string $remoteAccess
+	 * @param ?string $sessionId
+	 * @return Room
+	 * @throws RoomNotFoundException
+	 */
+	public function getRoomByAccessToken(
+		string $token,
+		string $actorType,
+		string $actorId,
+		#[SensitiveParameter]
+		string $accessToken,
+		?string $sessionId = null
+	): Room {
 		$query = $this->db->getQueryBuilder();
 		$helper = new SelectHelper();
 		$helper->selectRoomsTable($query);
@@ -755,7 +783,7 @@ public function getRoomByRemoteAccess(string $token, string $actorType, string $
 			->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
 				$query->expr()->eq('a.actor_type', $query->createNamedParameter($actorType)),
 				$query->expr()->eq('a.actor_id', $query->createNamedParameter($actorId)),
-				$query->expr()->eq('a.access_token', $query->createNamedParameter($remoteAccess)),
+				$query->expr()->eq('a.access_token', $query->createNamedParameter($accessToken)),
 				$query->expr()->eq('a.room_id', 'r.id')
 			))
 			->where($query->expr()->eq('r.token', $query->createNamedParameter($token)));
@@ -946,7 +974,7 @@ public function getRoomForSession(?string $userId, ?string $sessionId): Room {
 				throw new RoomNotFoundException();
 			}
 		} else {
-			if ($row['actor_type'] !== Attendee::ACTOR_GUESTS) {
+			if ($row['actor_type'] !== Attendee::ACTOR_GUESTS && $row['actor_type'] !== Attendee::ACTOR_EMAILS) {
 				throw new RoomNotFoundException();
 			}
 		}

lib/Service/ParticipantService.php

@@ -821,6 +821,10 @@ public function inviteEmailAddress(Room $room, string $email): Participant {
 		$attendee->setRoomId($room->getId());
 		$attendee->setActorType(Attendee::ACTOR_EMAILS);
 		$attendee->setActorId($email);
+		$attendee->setAccessToken($this->secureRandom->generate(
+			FederationManager::TOKEN_LENGTH,
+			ISecureRandom::CHAR_HUMAN_READABLE
+		));
 
 		if ($room->getSIPEnabled() !== Webinary::SIP_DISABLED
 			&& $this->talkConfig->isSIPConfigured()) {

lib/TalkSession.php

@@ -49,6 +49,14 @@ public function removeGuestActorIdForRoom(string $token): void {
 		$this->removeValue('spreed-guest-id', $token);
 	}
 
+	public function getAuthedEmailActorIdForRoom(string $token): ?string {
+		return $this->getValue('spreed-authed-email', $token);
+	}
+
+	public function setAuthedEmailActorIdForRoom(string $token, string $actorId): void {
+		$this->setValue('spreed-authed-email', $token, $actorId);
+	}
+
 	public function getFileShareTokenForRoom(string $roomToken): ?string {
 		return $this->getValue('spreed-file-share-token', $roomToken);
 	}