commit b936888: [Minor] Improve logic to select a random monitored mode for RBLs

[Vsevolod Stakhov]

Author: Vsevolod Stakhov
Date: 2022-01-15 12:57:50 +0000
URL: https://github.com/rspamd/rspamd/commit/b9368887523031fcad0524cee98af04181a59f3c (HEAD -> master)

[Minor] Improve logic to select a random monitored mode for RBLs

---
 src/plugins/lua/rbl.lua | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index e901e1a2f..22305aa1f 100644
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -47,21 +47,26 @@ local known_selectors = {} -- map from selector string to selector id
 local url_flag_bits = rspamd_url.flags
 
 local function get_monitored(rbl)
+  local function is_random_monitored()
+    return (rbl.dkim
+        or rbl.urls
+        or rbl.emails
+        or rbl.no_ip
+        or rbl.rdns
+        or rbl.helo)
+  end
+
   local default_monitored = '1.0.0.127'
   local ret = {
     rcode = 'nxdomain',
     prefix = default_monitored,
-    random = false,
+    random = is_random_monitored(),
   }
 
   if rbl.monitored_address then
     ret.prefix = rbl.monitored_address
   end
 
-  if rbl.dkim or rbl.urls or rbl.emails then
-    ret.random = true
-  end
-
   lua_util.debugm(N, rspamd_config,
       'added monitored address: %s (%s random)',
       ret.prefix, ret.random)