Merge pull request #63308 from nextcloud/backport/62580/stable32

[stable32] fix(iMIP): Prevent mails from carrying an unrelated user's name

Author: susnux

apps/dav/lib/CalDAV/Schedule/IMipPlugin.php

@@ -10,9 +10,11 @@
 
 use OCA\DAV\CalDAV\CalendarObject;
 use OCA\DAV\CalDAV\EventComparisonService;
+use OCP\Accounts\IAccountManager;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Defaults;
 use OCP\IAppConfig;
+use OCP\IUser;
 use OCP\IUserSession;
 use OCP\Mail\IMailer;
 use OCP\Mail\Provider\Address;
@@ -63,6 +65,7 @@ public function __construct(
 		private IMipService $imipService,
 		private EventComparisonService $eventComparisonService,
 		private IMailManager $mailManager,
+		private IAccountManager $accountManager,
 	) {
 		parent::__construct('');
 	}
@@ -179,21 +182,17 @@ public function schedule(Message $iTipMessage) {
 		}
 		$this->imipService->setL10nFromAttendee($attendee);
 
-		// Build the sender name.
+		$sender = substr($iTipMessage->sender, 7);
+
 		// Due to a bug in sabre, the senderName property for an iTIP message can actually also be a VObject Property
-		// If the iTIP message senderName is null or empty use the user session name as the senderName
 		if (($iTipMessage->senderName instanceof Parameter) && !empty(trim($iTipMessage->senderName->getValue()))) {
 			$senderName = trim($iTipMessage->senderName->getValue());
 		} elseif (is_string($iTipMessage->senderName) && !empty(trim($iTipMessage->senderName))) {
 			$senderName = trim($iTipMessage->senderName);
-		} elseif ($this->userSession->getUser() !== null) {
-			$senderName = trim($this->userSession->getUser()->getDisplayName());
 		} else {
-			$senderName = '';
+			$senderName = $this->getSenderNameFor($sender);
 		}
 
-		$sender = substr($iTipMessage->sender, 7);
-
 		$replyingAttendee = null;
 		switch (strtolower($iTipMessage->method)) {
 			case self::METHOD_REPLY:
@@ -333,6 +332,40 @@ public function schedule(Message $iTipMessage) {
 		}
 	}
 
+	/**
+	 * Messages are regularly brokered on behalf of somebody else, so the
+	 * session user's name is only used when the sender address is one of
+	 * theirs.
+	 */
+	private function getSenderNameFor(string $sender): ?string {
+		$user = $this->userSession->getUser();
+		if ($user !== null && $this->isAddressOfUser($sender, $user)) {
+			return trim($user->getDisplayName()) ?: null;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Profile email addresses are part of the user's calendar-user-address-set
+	 * and therefore valid sender addresses next to the system email address.
+	 */
+	private function isAddressOfUser(string $address, IUser $user): bool {
+		if (strcasecmp((string)$user->getEMailAddress(), $address) === 0) {
+			return true;
+		}
+
+		$emailCollection = $this->accountManager->getAccount($user)
+			->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
+		foreach ($emailCollection->getProperties() as $property) {
+			if (strcasecmp($property->getValue(), $address) === 0) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 	/**
 	 * @return ?VCalendar
 	 */

apps/dav/lib/Server.php

@@ -356,7 +356,8 @@ public function __construct(
 						$userSession,
 						\OCP\Server::get(IMipService::class),
 						\OCP\Server::get(EventComparisonService::class),
-						\OCP\Server::get(\OCP\Mail\Provider\IManager::class)
+						\OCP\Server::get(\OCP\Mail\Provider\IManager::class),
+						\OCP\Server::get(IAccountManager::class),
 					));
 				}
 				$this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());

apps/dav/tests/unit/CalDAV/Schedule/IMipPluginCharsetTest.php

@@ -13,6 +13,7 @@
 use OCA\DAV\CalDAV\EventComparisonService;
 use OCA\DAV\CalDAV\Schedule\IMipPlugin;
 use OCA\DAV\CalDAV\Schedule\IMipService;
+use OCP\Accounts\IAccountManager;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Defaults;
 use OCP\IAppConfig;
@@ -55,6 +56,7 @@ class IMipPluginCharsetTest extends TestCase {
 	private IUserSession&MockObject $userSession;
 	private LoggerInterface $logger;
 	private IUserManager&MockObject $userManager;
+	private IAccountManager&MockObject $accountManager;
 
 	// Services
 	private EventComparisonService $eventComparisonService;
@@ -120,6 +122,7 @@ protected function setUp(): void {
 		$this->userSession->method('getUser')
 			->willReturn($user);
 		$this->mailManager = $this->createMock(IManager::class);
+		$this->accountManager = $this->createMock(IAccountManager::class);
 		$this->imipPlugin = new IMipPlugin(
 			$this->appConfig,
 			$this->mailer,
@@ -130,6 +133,7 @@ protected function setUp(): void {
 			$this->imipService,
 			$this->eventComparisonService,
 			$this->mailManager,
+			$this->accountManager,
 		);
 
 		// ITipMessage