nodemailer/wildduck
1
1
Fork 0
mirror of https://github.com/nodemailer/wildduck.git synced 2025-10-06 20:05:58 +08:00
Code Issues Projects Releases Packages Wiki Activity

Make sure that addressregister addresses are decoded from mime-words

Browse source
This commit is contained in:
Andris Reinman 2021-04-15 15:41:08 +03:00
parent d5503a202e
commit ce15670d7c
6 changed files with 52 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/api/openapi.yml
View file

@ -1421,7 +1421,7 @@ paths:
tags:
- Messages
summary: Upload Message
description: 'This method allows to upload either an RFC822 formatted message or a message structure to a mailbox. Raw message is stored unmodified, no headers are added or removed. If you want to generate the uploaded message from strucutred data fields, then do not use the raw property.'
description: 'This method allows to upload either an RFC822 formatted message or a message structure to a mailbox. Raw message is stored unmodified, no headers are added or removed. If you want to generate the uploaded message from structured data fields, then do not use the raw property.'
operationId: uploadMessage
requestBody:
content:

16
lib/api/addresses.js
View file

@ -7,6 +7,7 @@ const ObjectID = require('mongodb').ObjectID;
const tools = require('../tools');
const consts = require('../consts');
const roles = require('../roles');
const libmime = require('libmime');
const { nextPageCursorSchema, previousPageCursorSchema, pageNrSchema, sessSchema, sessIPSchema, booleanSchema, metaDataSchema } = require('../schemas');
const log = require('npmlog');
const isemail = require('isemail');
@ -1199,11 +1200,22 @@ module.exports = (db, server, userHandler) => {
res.json({
success: true,
results: addresses.map(addressData => ({
results: addresses.map(addressData => {
let name = addressData.name || false;
try {
// try to decode
if (name) {
name = libmime.decodeWords(name);
}
} catch (E) {
// ignore
}
return {
id: addressData._id.toString(),
name: addressData.name || false,
address: addressData.address
}))
};
})
});
return next();

4
lib/api/messages.js
View file

@ -1805,7 +1805,11 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler) => {
let envelope = compiled.getEnvelope();
let envelopeFrom = envelope.from;
if (result.value.draft) {
// override From addresses for drafts
envelope.from = data.from.address = await validateFromAddress(userData, envelopeFrom);
}
if (!result.value.to && !envelope.to.length && referencedMessage && ['reply', 'replyAll'].includes(result.value.reference.action)) {
envelope.to = envelope.to.concat(parseAddresses(referencedMessage.replyTo || [])).concat(parseAddresses(referencedMessage.replyCc || []));

7
lib/message-handler.js
View file

@ -150,6 +150,12 @@ class MessageHandler {
let updates = { updated: new Date() };
if (addr.name) {
updates.name = addr.name;
try {
// try to decode
updates.name = libmime.decodeWords(updates.name);
} catch (E) {
// ignore
}
}
await this.database.collection('addressregister').findOneAndUpdate(
@ -514,6 +520,7 @@ class MessageHandler {
}
let parsed = messageData.mimeTree && messageData.mimeTree.parsedHeader;
if (parsed) {
let keyList = mailboxData.specialUse === '\\Sent' ? ['to', 'cc', 'bcc'] : ['from'];
for (let key of keyList) {

18
package.json
View file

@ -16,20 +16,20 @@
"author": "Andris Reinman",
"license": "EUPL-1.2",
"devDependencies": {
"ajv": "7.2.3",
"ajv": "8.1.0",
"chai": "4.3.4",
"docsify-cli": "4.4.3",
"eslint": "7.22.0",
"eslint": "7.24.0",
"eslint-config-nodemailer": "1.2.0",
"eslint-config-prettier": "8.1.0",
"eslint-config-prettier": "8.2.0",
"grunt": "1.3.0",
"grunt-cli": "1.4.1",
"grunt-cli": "1.4.2",
"grunt-eslint": "23.0.0",
"grunt-mocha-test": "0.13.3",
"grunt-shell-spawn": "0.4.0",
"grunt-wait": "0.3.0",
"imapflow": "1.0.56",
"mailparser": "3.1.0",
"mailparser": "3.2.0",
"mocha": "8.3.2",
"request": "2.88.2",
"supertest": "6.1.3"
@ -37,7 +37,7 @@
"dependencies": {
"@phc/pbkdf2": "1.1.14",
"accesscontrol": "2.2.1",
"argon2-browser": "1.15.3",
"argon2-browser": "1.15.4",
"axios": "0.21.1",
"base32.js": "0.1.0",
"bcryptjs": "2.4.3",
@ -49,10 +49,10 @@
"humanname": "0.2.2",
"iconv-lite": "0.6.2",
"ioredfour": "1.0.2-ioredis-03",
"ioredis": "4.24.4",
"ioredis": "4.26.0",
"isemail": "3.2.0",
"joi": "17.4.0",
"js-yaml": "4.0.0",
"js-yaml": "4.1.0",
"key-fingerprint": "1.1.0",
"libbase64": "1.2.1",
"libmime": "5.0.0",
@ -60,7 +60,7 @@
"mailsplit": "5.0.1",
"mobileconfig": "2.3.1",
"mongo-cursor-pagination": "7.4.0",
"mongodb": "3.6.5",
"mongodb": "3.6.6",
"mongodb-extended-json": "1.11.0",
"node-forge": "0.10.0",
"nodemailer": "6.5.0",

15
test/api-test.js
View file

@ -466,9 +466,15 @@ describe('API tests', function () {
it('should POST /users/:user/mailboxes/:mailbox/messages with text and html', async () => {
const message = {
from: {
name: 'test tester',
address: 'testuser@example.com'
name: 'test töster',
address: 'bestöser@öxample.com'
},
to: [
{
name: 'best böster',
address: 'bestöser2@öxample.com'
}
],
subject: 'hello world',
text: 'Hello hello world!',
html: '<p>Hello hello world!</p>'
@ -559,5 +565,10 @@ describe('API tests', function () {
const deleteResponse = await server.delete(`/users/${userId}/outbound/${submitResponse.body.queueId}`).expect(200);
expect(deleteResponse.body.deleted).to.equal(2);
});
it('should GET /users/:user/addressregister', async () => {
const response = await server.get(`/users/${userId}/addressregister?query=best`);
expect(response.body.results[0].name).to.equal('test töster');
});
});
});