From e45b8715fe439e7b254e55b0da207aed371eaa8f Mon Sep 17 00:00:00 2001 From: Anton Yuzhaninov Date: Fri, 1 May 2020 13:43:42 +0100 Subject: [PATCH] [Fix] Fix FROM_NEQ_ENVFROM Regression was introduced in 23675060063301aaa3c93044e0029fda553d4e8f --- rules/headers_checks.lua | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/rules/headers_checks.lua b/rules/headers_checks.lua index 6c5489822..ec8208d8c 100644 --- a/rules/headers_checks.lua +++ b/rules/headers_checks.lua @@ -656,13 +656,14 @@ local check_from_id = rspamd_config:register_symbol{ task:insert_result('FROM_NAME_EXCESS_SPACE', 1.0) end end - if (envfrom and envfrom[1] and - util.strequal_caseless(envfrom[1].addr, from[1].addr)) - then - task:insert_result('FROM_EQ_ENVFROM', 1.0) + + if envfrom then + if util.strequal_caseless(envfrom[1].addr, from[1].addr) then + task:insert_result('FROM_EQ_ENVFROM', 1.0) + elseif envfrom[1].addr ~= '' then + task:insert_result('FROM_NEQ_ENVFROM', 1.0, from[1].addr, envfrom[1].addr) + end end - elseif (envfrom and envfrom[1] and envfrom[1].addr) then - task:insert_result('FROM_NEQ_ENVFROM', 1.0, ((from or E)[1] or E).addr or '', envfrom[1].addr) end local to = task:get_recipients(2) -- 2.39.5