nodemailer/wildduck
1
1
Fork 0
mirror of https://github.com/nodemailer/wildduck.git synced 2024-12-27 02:10:52 +08:00
Code Issues Projects Releases Packages Wiki Activity

removed received header parsing

Browse source
This commit is contained in:
Andris Reinman 2021-02-26 16:43:29 +02:00
parent f56a19f6b2
commit 83f4a0598c
3 changed files with 4 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

189
lib/parse-received.js
View file

@ -1,189 +0,0 @@
'use strict';
const net = require('net');
const parseReceived = headerValue => {
headerValue = headerValue.trim();
let state = 'none';
let values = [];
let expect = false;
let quoted = false;
let escaped = false;
let curKey;
let timestamp = '';
let commentLevel = 0;
let nextValue = () => {
curKey = '';
let val = { key: '', value: '', comment: '' };
values.push(val);
return val;
};
let curValue = nextValue();
for (let i = 0; i < headerValue.length; i++) {
let c = headerValue.charAt(i);
if (state === 'timestamp') {
timestamp += c;
continue;
}
if (escaped) {
curValue[curKey] += c;
escaped = false;
continue;
}
if (quoted) {
if (c === quoted) {
quoted = false;
state = 'none';
continue;
}
curValue[curKey] += c;
continue;
}
if (expect) {
if (c === expect) {
if (commentLevel) {
commentLevel--;
if (commentLevel) {
// still in nested comment
curValue[curKey] += c;
continue;
}
}
expect = false;
state = 'none';
curValue = nextValue();
continue;
}
if (c === '(') {
commentLevel++;
}
curValue[curKey] += c;
continue;
}
switch (c) {
case ' ':
case '\t':
case '\n':
case '\r':
state = 'none';
break;
case '"':
case "'":
// start quoting
quoted = c;
break;
case '(':
// start comment block
expect = ')';
commentLevel++;
curKey = 'comment';
break;
case ';':
state = 'timestamp';
break;
case '\\':
escaped = true;
break;
default:
if (state === 'none') {
state = 'val';
switch (curKey) {
case '':
curKey = 'key';
curValue[curKey] += c;
break;
case 'key':
curKey = 'value';
curValue[curKey] += c;
break;
case 'value':
case 'comment':
curValue = nextValue();
curKey = 'key';
curValue[curKey] += c;
break;
}
} else {
if (curKey === 'comment' && c === '(') {
commentLevel++;
}
curValue[curKey] += c;
}
}
}
timestamp = timestamp.split(';').shift().trim();
let result = {};
// join non key values into strings
for (let i = values.length - 1; i > 1; i--) {
let val = values[i];
let prev = values[i - 1];
let key = val.key.toLowerCase();
if (!['from', 'by', 'with', 'id', 'for', 'envelope-from', ''].includes(key) && prev.key) {
prev.value = [prev.value || []]
.concat(val.key || [])
.concat(val.value || [])
.join(' ');
prev.comment = [prev.comment || []].concat(val.comment || []).join(' ');
values.splice(i, 1);
}
}
for (let val of values) {
if (val.comment) {
val.comment = val.comment.replace(/\s+/g, ' ').trim();
}
if (val.key) {
let key = val.key.toLowerCase();
if (key !== 'from' && !result.tls && /tls|cipher=|Google Transport Security/i.test(val.comment)) {
result.tls = { value: '' };
if (val.comment) {
result.tls.comment = val.comment;
}
val.comment = '';
}
result[key] = { value: val.value };
if (val.comment) {
result[key].comment = val.comment;
}
if (key === 'from' && result[key].comment) {
let ipmatch = result[key].comment.match(/\[([^\s\]]+)\]/);
if (ipmatch && ipmatch[1] && net.isIP(ipmatch[1])) {
result[key].ip = ipmatch[1];
}
}
} else if (!result.tls && /tls|cipher=|Google Transport Security/i.test(val.comment)) {
result.tls = { value: val.value };
if (val.comment) {
result.tls.comment = val.comment;
}
}
}
let withValue = (result.with && result.with.value) || '';
if (!result.tls && /SMTPS/.test(withValue)) {
result.tls = { value: '', comment: withValue };
}
if (timestamp) {
result.timestamp = timestamp;
}
result.full = headerValue.replace(/\s+/g, ' ').trim();
return result;
};
module.exports = parseReceived;

8
pop3.js
View file

@ -162,8 +162,8 @@ const serverOptions = {
.exec(done);
};
updateUIDIndex(() => {
return callback(null, {
updateUIDIndex(() =>
callback(null, {
messages: messages
// show older first
.reverse()
@ -178,8 +178,8 @@ const serverOptions = {
})),
count: messages.length,
size: messages.reduce((acc, message) => acc + message.size, 0)
});
});
})
);
});
});
});

5
webhooks.js
View file

@ -11,7 +11,6 @@ const { ObjectID } = require('mongodb');
const axios = require('axios');
const packageData = require('./package.json');
const { MARKED_SPAM, MARKED_HAM } = require('./lib/events');
const parseReceived = require('./lib/parse-received');
let loggelf;
@ -207,10 +206,6 @@ module.exports.start = callback => {
}
}
if (parsedHeader.received) {
data.received = [].concat(parsedHeader.received || []).map(parseReceived);
}
data.messageId = messageData.msgid;
data.subject = messageData.subject;
data.date = messageData.idate.toISOString();