Skip to content

[stable3.7] fix(db): Catch message IDs that are too long #10845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChristophWurst merged 1 commit into from
Mar 11, 2025
Merged

[stable3.7] fix(db): Catch message IDs that are too long #10845

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions lib/Db/MessageMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
use OCP\AppFramework\Db\QBMapper;
use OCP\AppFramework\Db\TTransactional;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\DB\Exception;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
use OCP\IUser;
Expand All @@ -56,6 +57,7 @@
use function mb_convert_encoding;
use function mb_strcut;
use function OCA\Mail\array_flat_map;
use function strlen;

/**
* @template-extends QBMapper<Message>
Expand Down Expand Up @@ -252,7 +254,7 @@ public function writeThreadIds(array $messages): void {
foreach ($messages as $message) {
$query->setParameter(
'thread_root_id',
$message->getThreadRootId(),
self::filterMessageIdLength($message->getThreadRootId()),
$message->getThreadRootId() === null ? IQueryBuilder::PARAM_NULL : IQueryBuilder::PARAM_STR
);
$query->setParameter('id', $message->getDatabaseId(), IQueryBuilder::PARAM_INT);
Expand All @@ -272,6 +274,7 @@ public function writeThreadIds(array $messages): void {
/**
* @param Message ...$messages
* @return void
* @throws Exception
*/
public function insertBulk(Account $account, Message ...$messages): void {
$this->db->beginTransaction();
Expand Down Expand Up @@ -307,11 +310,11 @@ public function insertBulk(Account $account, Message ...$messages): void {
foreach ($messages as $message) {
$qb1->setParameter('uid', $message->getUid(), IQueryBuilder::PARAM_INT);
$qb1->setParameter('message_id', $message->getMessageId(), IQueryBuilder::PARAM_STR);
$inReplyTo = $message->getInReplyTo();
$inReplyTo = self::filterMessageIdLength($message->getInReplyTo());
$qb1->setParameter('in_reply_to', $inReplyTo, $inReplyTo === null ? IQueryBuilder::PARAM_NULL : IQueryBuilder::PARAM_STR);
$references = $message->getReferences();
$references = self::filterMessageIdLength($message->getReferences());
$qb1->setParameter('references', $references, $references === null ? IQueryBuilder::PARAM_NULL : IQueryBuilder::PARAM_STR);
$threadRootId = $message->getThreadRootId();
$threadRootId = self::filterMessageIdLength($message->getThreadRootId());
$qb1->setParameter('thread_root_id', $threadRootId, $threadRootId === null ? IQueryBuilder::PARAM_NULL : IQueryBuilder::PARAM_STR);
$qb1->setParameter('mailbox_id', $message->getMailboxId(), IQueryBuilder::PARAM_INT);
$qb1->setParameter('subject', $message->getSubject(), IQueryBuilder::PARAM_STR);
Expand Down Expand Up @@ -364,6 +367,20 @@ public function insertBulk(Account $account, Message ...$messages): void {
}
}

/**
* @throws Exception
*/
private static function filterMessageIdLength(?string $messageId): ?string {
if ($messageId === null) {
return null;
}
if (strlen($messageId) > 1023) {
throw new Exception("IMAP message ID $messageId is too long for the database");
}

return $messageId;
}

/**
* @param Account $account
* @param bool $permflagsEnabled
Expand Down