From 4082b88147b7df4f443f2d0889925986be45983c Mon Sep 17 00:00:00 2001
From: Andris Reinman <andris@kreata.ee>
Date: Mon, 31 Jul 2017 00:20:35 +0300
Subject: [PATCH] u

---
 lib/message-handler.js |  2 +-
 lmtp.js                | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/lib/message-handler.js b/lib/message-handler.js
index a2b3edbf..3ad91fdc 100644
--- a/lib/message-handler.js
+++ b/lib/message-handler.js
@@ -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) {
diff --git a/lmtp.js b/lmtp.js
index 8b7b8973..a983e646 100644
--- a/lmtp.js
+++ b/lmtp.js
@@ -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;