Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-21 07:46:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

[n1] fix(sync): Add support for message encodings

Browse source
This commit is contained in:
Ben Gotow 2016-11-23 17:07:09 -08:00
parent dd28d6b146
commit 5c37abc578
3 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/local-sync/package.json
View file

@ -16,11 +16,13 @@
"joi": "8.4.2",
"mimelib": "0.2.19",
"nodemailer": "2.5.0",
"quoted-printable": "^1.0.1",
"request": "2.79.0",
"rx": "4.1.0",
"sequelize": "3.27.0",
"sqlite3": "https://github.com/bengotow/node-sqlite3/archive/bengotow/usleep-v3.1.4.tar.gz",
"underscore": "1.8.3",
"utf7": "^1.0.2",
"vision": "4.1.0"
},
"repository": {

1
packages/local-sync/src/local-api/app.js
View file

@ -1,3 +1,4 @@
/* eslint global-require: 0 */
const Hapi = require('hapi');
const HapiSwagger = require('hapi-swagger');
const HapiBoom = require('hapi-boom-decorators')

30
packages/local-sync/src/local-sync-worker/imap/fetch-messages-in-folder.js
View file

@ -1,4 +1,6 @@
const _ = require('underscore');
const QuotedPrintable = require('quoted-printable');
const utf7 = require('utf7').imap;
const {Imap, PromiseUtils, IMAPConnection} = require('isomorphic-core');
const {Capabilities} = IMAPConnection;
@ -154,7 +156,11 @@ class FetchMessagesInFolder {
const mimetype = `${part.type}/${part.subtype}`;
available.push(mimetype);
if (['text/plain', 'text/html', 'application/pgp-encrypted'].includes(mimetype)) {
desired.push({id: part.partID, mimetype});
desired.push({
id: part.partID,
encoding: part.encoding,
mimetype,
});
}
}
}
@ -196,8 +202,26 @@ class FetchMessagesInFolder {
return this._box.fetchEach(uids, {bodies, struct: true}, (msg) => {
msg.body = {};
for (const {id, mimetype} of desiredParts) {
msg.body[mimetype] = msg.parts[id];
for (const {id, mimetype, encoding} of desiredParts) {
try {
if (!encoding) {
msg.body[mimetype] = msg.parts[id];
} else if (encoding.toLowerCase() === 'quoted-printable') {
msg.body[mimetype] = QuotedPrintable.decode(msg.parts[id]);
} else if (encoding.toLowerCase() === '7bit') {
msg.body[mimetype] = utf7.decode(msg.parts[id]);
} else if (encoding && ['ascii', 'utf8', 'utf16le', 'ucs2', 'base64', 'latin1', 'binary', 'hex'].includes(encoding.toLowerCase())) {
msg.body[mimetype] = Buffer.from(msg.parts[id], encoding.toLowerCase()).toString();
} else {
throw new Error(`Unknown encoding ${encoding}`)
}
} catch (err) {
this._logger.error({
encoding,
mimetype,
underlying: err.toString(),
}, `FetchMessagesInFolder: Could not decode message part`)
}
}
this._processMessage(msg);
});