From: Andrew Lewis <nerf@judo.za.org>
Date: Tue, 9 May 2017 12:19:55 +0000 (+0200)
Subject: [Fix] Multimap: Received IP filters with Redis
X-Git-Tag: 1.6.0~241
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=27d6bffa5b295e0fbca6d3eda0ee17c834fede81;p=rspamd.git

[Fix] Multimap: Received IP filters with Redis

 - Issue: #1623
 - Reported by: @andryyy
---

diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua
index ae63b47bd..1db4b7967 100644
--- a/src/plugins/lua/multimap.lua
+++ b/src/plugins/lua/multimap.lua
@@ -373,7 +373,8 @@ local function multimap_callback(task, rule)
       ret = r['cdb']:lookup(srch)
     elseif r['redis_key'] then
       local srch = value
-      if r['type'] == 'ip' then
+      if r['type'] == 'ip' or (r['type'] == 'received' and
+        (r['filter'] == 'real_ip' or r['filter'] == 'from_ip' or not r['filter'])) then
         srch = value:to_string()
       end
       ret = rspamd_redis_make_request(task,