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

u

Browse source
This commit is contained in:
Andris Reinman 2017-07-31 00:20:35 +03:00
parent a4bd78f62c
commit 4082b88147
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/message-handler.js
View file

@ -12,7 +12,7 @@ const tools = require('./tools');
const parseDate = require('../imap-core/lib/parse-date');
// index only the following headers for SEARCH
const INDEXED_HEADERS = ['to', 'cc', 'subject', 'from', 'sender', 'reply-to', 'message-id', 'thread-index'];
const INDEXED_HEADERS = ['to', 'cc', 'subject', 'from', 'sender', 'reply-to', 'message-id', 'thread-index', 'x-rspamd-spam', 'x-spam-status'];
class MessageHandler {
constructor(options) {

11
lmtp.js
View file

@ -118,7 +118,6 @@ const serverOptions = {
stream.once('end', () => {
let spamHeader = config.spamHeader && config.spamHeader.toLowerCase();
log.info('spam', spamHeader);
let sender = tools.normalizeAddress((session.envelope.mailFrom && session.envelope.mailFrom.address) || '');
let responses = [];
let users = session.users;
@ -183,8 +182,6 @@ const serverOptions = {
: []
);
log.info('ddd', JSON.stringify(filters));
let forwardTargets = new Set();
let forwardTargetUrls = new Set();
let matchingFilters = [];
@ -199,8 +196,6 @@ const serverOptions = {
.forEach(filter => {
matchingFilters.push(filter.id);
log.info('ddd', JSON.stringify(filter.action));
// apply matching filter
if (!filterActions) {
filterActions = filter.action;
@ -273,7 +268,7 @@ const serverOptions = {
let sendAutoreply = done => {
// never reply to messages marked as spam
if (!sender || !user.autoreply || filterActions.get('spam')) {
if (!sender || !user.autoreply || !user.autoreply.status || !user.autoreply.message || filterActions.get('spam')) {
return setImmediate(done);
}
@ -386,7 +381,7 @@ const serverOptions = {
// if similar message exists, then skip
skipExisting: true
};
log.info('ddd3', JSON.stringify(messageOptions));
messageHandler.add(messageOptions, (err, inserted, info) => {
// remove Delivered-To
chunks.shift();
@ -466,12 +461,10 @@ function checkFilter(filter, prepared, maildata) {
let headerMatches = new Set();
for (let j = prepared.headers.length - 1; j >= 0; j--) {
let header = prepared.headers[j];
log.info('dd5', '%s: %s, %s %s', header.key, header.value, headerFilters.get(header.key), header.value.indexOf(headerFilters.get(header.key)) >= 0);
if (headerFilters.has(header.key) && header.value.indexOf(headerFilters.get(header.key)) >= 0) {
headerMatches.add(header.key);
}
}
console.log(headerMatches.size, headerFilters.size);
if (headerMatches.size < headerFilters.size) {
// not enough matches
return false;