From: AL <AlexeySa@users.noreply.github.com>
Date: Thu, 27 Oct 2016 11:32:18 +0000 (+0300)
Subject: [Minor] Greylist first message with invalid MX
X-Git-Tag: 1.4.0~177^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fd22c46fd00b93a8d2372c9369d07c8d2ced1db;p=thirdparty%2Frspamd.git

[Minor] Greylist first message with invalid MX
---

diff --git a/src/plugins/lua/mx_check.lua b/src/plugins/lua/mx_check.lua
index bf38f63c6f..e92a5e7fa0 100644
--- a/src/plugins/lua/mx_check.lua
+++ b/src/plugins/lua/mx_check.lua
@@ -28,6 +28,7 @@ local settings = {
   symbol_good_mx = 'MX_GOOD',
   expire = 86400, -- 1 day by default
   expire_novalid = 7200, -- 2 hours by default for no valid mxes
+  greylist_invalid = false, -- Greylist first message with invalid MX (require greylist plugin)
   key_prefix = 'rmx'
 }
 local redis_params
@@ -68,6 +69,14 @@ local function mx_check(task)
       end
       if not valid then
         task:insert_result(settings.symbol_bad_mx, 1.0)
+        -- Greylist message
+        if settings.greylist_invalid then
+          local grey_is_whitelisted = task:get_mempool():get_variable("grey_whitelisted")
+          if not grey_is_whitelisted then
+            local end_time = rspamd_util.time_to_string(rspamd_util.get_time() + 3600)
+            task:get_mempool():set_variable("grey_greylisted", end_time)
+          end
+        end
         local ret,_,_ = rspamd_redis_make_request(task,
           redis_params, -- connect params
           key, -- hash key