From 8cb310ccc99cc0ab3f1af8781d19d0cd08a9fb44 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Sun, 25 Sep 2016 16:23:24 +0100 Subject: [PATCH] [Feature] Allow whitelisting by IP for greylisting plugin --- src/plugins/lua/greylist.lua | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/plugins/lua/greylist.lua b/src/plugins/lua/greylist.lua index 05afaeab6..646164424 100644 --- a/src/plugins/lua/greylist.lua +++ b/src/plugins/lua/greylist.lua @@ -132,6 +132,14 @@ local function greylist_check(task) return end + if ip and ip:is_valid() and whitelisted_ip then + if whitelisted_ip:get_key(ip) then + -- Do not check whitelisted ip + rspamd_logger.infox(task, 'skip greylisting for whitelisted IP') + return + end + end + local body_key = data_key(task) local meta_key = envelope_key(task) local hash_key = body_key .. meta_key @@ -216,6 +224,12 @@ local function greylist_set(task) return end + if ip and ip:is_valid() and whitelisted_ip then + if whitelisted_ip:get_key(ip) then + return + end + end + local is_whitelisted = task:get_mempool():get_variable("grey_whitelisted") local do_greylisting = task:get_mempool():get_variable("grey_greylisted") -- 2.39.5