From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 19 Jan 2022 21:01:10 +0000 (+0000)
Subject: [Minor] Rbl: Fix require symbols option
X-Git-Tag: 3.2~91
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5890935eb1daf595b9b42ac4b9182733985a3f99;p=thirdparty%2Frspamd.git

[Minor] Rbl: Fix require symbols option
---

diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index 49b67221f0..8c362add28 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',