Merge pull request #10445 from nextcloud/backport/10442/stable4.1

[stable4.1] fix(imap): Consider charset for preview text decoding
nextcloud · Dec 6, 2024 · e47ab8d · e47ab8d
2 parents 0dfbc3a + ff31459
commit e47ab8d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/lib/IMAP/MessageMapper.php b/lib/IMAP/MessageMapper.php
@@ -25,6 +25,7 @@
 use OCA\Mail\Attachment;
 use OCA\Mail\Db\Mailbox;
 use OCA\Mail\Exception\ServiceException;
+use OCA\Mail\IMAP\Charset\Converter;
 use OCA\Mail\Model\IMAPMessage;
 use OCA\Mail\Service\SmimeService;
 use OCA\Mail\Support\PerformanceLoggerTask;
@@ -50,9 +51,12 @@ class MessageMapper {
 	private SMimeService $smimeService;
 	private ImapMessageFetcherFactory $imapMessageFactory;
 
-	public function __construct(LoggerInterface $logger,
+	public function __construct(
+		LoggerInterface $logger,
 		SmimeService $smimeService,
-		ImapMessageFetcherFactory $imapMessageFactory, ) {
+		ImapMessageFetcherFactory $imapMessageFactory,
+		private Converter $converter,
+	) {
 		$this->logger = $logger;
 		$this->smimeService = $smimeService;
 		$this->imapMessageFactory = $imapMessageFactory;
@@ -937,7 +941,7 @@ public function getBodyStructureData(Horde_Imap_Client_Socket $client,
 				if ($enc = $mimeHeaders->getValue('content-transfer-encoding')) {
 					$structure->setTransferEncoding($enc);
 					$structure->setContents($htmlBody);
-					$htmlBody = $structure->getContents();
+					$htmlBody = $this->converter->convert($structure);
 				}
 				$mentionsUser = $this->checkLinks($htmlBody, $emailAddress);
 				$html = new Html2Text($htmlBody, ['do_links' => 'none','alt_image' => 'hide']);
@@ -956,7 +960,7 @@ public function getBodyStructureData(Horde_Imap_Client_Socket $client,
 				if ($enc = $mimeHeaders->getValue('content-transfer-encoding')) {
 					$structure->setTransferEncoding($enc);
 					$structure->setContents($textBody);
-					$textBody = $structure->getContents();
+					$textBody = $this->converter->convert($structure);
 				}
 				return new MessageStructureData(
 					$hasAttachments,

diff --git a/tests/Unit/IMAP/MessageMapperTest.php b/tests/Unit/IMAP/MessageMapperTest.php
@@ -17,6 +17,7 @@
 use Horde_Imap_Client_Ids;
 use Horde_Imap_Client_Socket;
 use OCA\Mail\Db\Mailbox;
+use OCA\Mail\IMAP\Charset\Converter;
 use OCA\Mail\IMAP\ImapMessageFetcher;
 use OCA\Mail\IMAP\ImapMessageFetcherFactory;
 use OCA\Mail\IMAP\MessageMapper;
@@ -40,17 +41,21 @@ class MessageMapperTest extends TestCase {
 	/** @var ImapMessageFetcherFactory|MockObject */
 	private $imapMessageFactory;
 
+	private Converter|MockObject $converter;
+
 	protected function setUp(): void {
 		parent::setUp();
 
 		$this->logger = $this->createMock(LoggerInterface::class);
 		$this->sMimeService = $this->createMock(SmimeService::class);
 		$this->imapMessageFactory = $this->createMock(ImapMessageFetcherFactory::class);
+		$this->converter = $this->createMock(Converter::class);
 
 		$this->mapper = new MessageMapper(
 			$this->logger,
 			$this->sMimeService,
 			$this->imapMessageFactory,
+			$this->converter,
 		);
 	}