commit 5890935: [Minor] Rbl: Fix require symbols option

Vsevolod Stakhov vsevolod at highsecure.ru
Wed Jan 19 21:07:04 UTC 2022


Author: Vsevolod Stakhov
Date: 2022-01-19 21:01:10 +0000
URL: https://github.com/rspamd/rspamd/commit/5890935eb1daf595b9b42ac4b9182733985a3f99 (HEAD -> master)

[Minor] Rbl: Fix require symbols option

---
 src/plugins/lua/rbl.lua | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index 49b67221f..8c362add2 100644
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -423,6 +423,12 @@ local function gen_rbl_callback(rule)
     return true
   end
 
+  local function check_required_symbols(task, _)
+    if rule.require_symbols then
+      return fun.all(function(sym) task:has_symbol(sym) end, rule.require_symbols)
+    end
+  end
+
   local function check_user(task, _)
     if task:get_user() then
       return false
@@ -741,7 +747,8 @@ local function gen_rbl_callback(rule)
 
   -- Create function pipeline depending on rbl settings
   local pipeline = {
-    is_alive, -- generic for all
+    is_alive, -- check monitored status
+    check_required_symbols -- if we have require_symbols then check those symbols
   }
   local description = {
     'alive',


More information about the Commits mailing list