Browse Source

[Fix] Update greylisting threshold as it can be easily dynamic

Issue: #4908
Closes: #4908
pull/4910/head
Vsevolod Stakhov 1 month ago
parent
commit
2edcc63aea
No account linked to committer's email address
1 changed files with 4 additions and 7 deletions
  1. 4
    7
      src/plugins/lua/greylist.lua

+ 4
- 7
src/plugins/lua/greylist.lua View File

@@ -329,9 +329,11 @@ local function greylist_set(task)
end
end

if settings.greylist_min_score then
-- We need to update this on each scan, as it can vary per settings or be redefined dynamically
local greylist_min_score = settings.greylist_min_score or rspamd_config:get_metric_action('greylist')
if greylist_min_score then
local score = task:get_metric_score('default')[1]
if score < settings.greylist_min_score then
if score < greylist_min_score then
rspamd_logger.infox(task, 'Score too low - skip greylisting')
if action == 'greylist' then
-- We are going to accept message
@@ -493,11 +495,6 @@ if opts then

if settings['greylist_min_score'] then
settings['greylist_min_score'] = tonumber(settings['greylist_min_score'])
else
local greylist_threshold = rspamd_config:get_metric_action('greylist')
if greylist_threshold then
settings['greylist_min_score'] = greylist_threshold
end
end

whitelisted_ip = lua_map.rspamd_map_add(N, 'whitelisted_ip', 'radix',

Loading…
Cancel
Save