Skip to content

ZMS-26: On move fetch target mailbox's user only one #1022

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
NickOvt merged 1 commit into from
Mar 12, 2026
Merged

ZMS-26: On move fetch target mailbox's user only one #1022

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
40 changes: 24 additions & 16 deletions lib/message-handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -959,6 +959,28 @@ class MessageHandler {

let newModseq = (item && item.value && item.value.modifyIndex) || 1;

let sourceUid = [];
let destinationUid = [];

let removeEntries = [];
let existsEntries = [];

let encryptedMoveUserData;
if (targetData.encryptMessages) {
try {
encryptedMoveUserData = await this.users.collection('users').findOne(
{ _id: mailboxData.user },
{
projection: {
pubKey: true
}
}
);
} catch (err) {
return this.moveDone(err, { targetData, sourceUid, destinationUid, mailboxData, existsEntries, removeEntries }, options);
}
}

let cursor = this.database
.collection('messages')
.find({
Expand All @@ -968,12 +990,6 @@ class MessageHandler {
// ordering is needed for IMAP UIDPLUS results
.sort({ uid: 1 });

let sourceUid = [];
let destinationUid = [];

let removeEntries = [];
let existsEntries = [];

let message = {};
// Loop through all moved messages
while (message !== undefined) {
Expand Down Expand Up @@ -1168,16 +1184,8 @@ class MessageHandler {
continue;
} else {
// not yet encrypted, so need to encrypt
let res;

try {
res = await this.users.collection('users').findOne({ _id: mailboxData.user });
} catch (err) {
return this.moveDone(err, { targetData, sourceUid, destinationUid, mailboxData, existsEntries, removeEntries }, options);
}

// get user data
if (!res.pubKey) {
if (!encryptedMoveUserData?.pubKey) {
// no public key available, cannot encrypt
await this.updateMessage(
{
Expand Down Expand Up @@ -1233,7 +1241,7 @@ class MessageHandler {
let encryptRes;

try {
encryptRes = await this.encryptMessageAsync(res.pubKey, raw);
encryptRes = await this.encryptMessageAsync(encryptedMoveUserData.pubKey, raw);
} catch (err) {
return reject(
this.moveDone(err, { targetData, sourceUid, destinationUid, mailboxData, existsEntries, removeEntries }, options)
Expand Down