nodemailer/wildduck
1
1
Fork 0
mirror of https://github.com/nodemailer/wildduck.git synced 2024-09-20 15:26:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not encrypt draft messages

Browse source
This commit is contained in:
Andris Reinman 2019-10-02 14:33:06 +03:00
parent 7b8a863125
commit d5fdb3f4e2
2 changed files with 38 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/api/messages.js
View file

@ -2662,7 +2662,7 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler) => {
return next();
}
if (userData.encryptMessages) {
if (userData.encryptMessages && !result.value.draft) {
try {
let encrypted = await encryptMessage(userData.pubKey, raw);
if (encrypted) {

68
lib/handlers/on-append.js
View file

@ -50,39 +50,45 @@ module.exports = (server, messageHandler, userCache) => (path, flags, date, raw,
}
messageHandler.counters.ttlcounter('iup:' + session.user.id, raw.length, limit, false, () => {
messageHandler.encryptMessage(userData.encryptMessages ? userData.pubKey : false, raw, (err, encrypted) => {
if (!err && encrypted) {
raw = encrypted;
}
messageHandler.add(
{
user: session.user.id,
path,
meta: {
source: 'IMAP',
from: '',
to: [session.user.address || session.user.username],
origin: session.remoteAddress,
transtype: 'APPEND',
time: new Date()
},
session,
date,
flags,
raw
},
(err, status, data) => {
if (err) {
if (err.imapResponse) {
return callback(null, err.imapResponse);
}
flags = Array.isArray(flags) ? flags : [].concat(flags || []);
return callback(err);
}
callback(null, status, data);
messageHandler.encryptMessage(
userData.encryptMessages && !flags.includes('\\Draft') ? userData.pubKey : false,
raw,
(err, encrypted) => {
if (!err && encrypted) {
raw = encrypted;
}
);
});
messageHandler.add(
{
user: session.user.id,
path,
meta: {
source: 'IMAP',
from: '',
to: [session.user.address || session.user.username],
origin: session.remoteAddress,
transtype: 'APPEND',
time: new Date()
},
session,
date,
flags,
raw
},
(err, status, data) => {
if (err) {
if (err.imapResponse) {
return callback(null, err.imapResponse);
}
return callback(err);
}
callback(null, status, data);
}
);
}
);
});
});
});