Browse Source

[Minor] Filter artificial Received header in multimap by default

 - Also filter headers in CHECK_RECEIVED rule
tags/1.5.0
Andrew Lewis 7 years ago
parent
commit
28d3143551
2 changed files with 9 additions and 1 deletions
  1. 4
    1
      rules/misc.lua
  2. 5
    0
      src/plugins/lua/multimap.lua

+ 4
- 1
rules/misc.lua View File

@@ -17,6 +17,7 @@ limitations under the License.
-- This is main lua config file for rspamd

local E = {}
local fun = require "fun"
local util = require "rspamd_util"
local rspamd_regexp = require "rspamd_regexp"

@@ -610,6 +611,9 @@ rspamd_config:set_metric_symbol('TO_MATCH_ENVRCPT_SOME', 0, 'Some of the recipie
rspamd_config.CHECK_RECEIVED = {
callback = function (task)
local received = task:get_received_headers()
received = fun.filter(function(h)
return not h['artificial']
end, received):totable()
task:insert_result('RCVD_COUNT_' .. #received, 1.0)
end
}
@@ -788,7 +792,6 @@ rspamd_config:register_dependency(freemail_reply_neq_from_id, 'FREEMAIL_FROM')

rspamd_config.OMOGRAPH_URL = {
callback = function(task)
local fun = require "fun"
local urls = task:get_urls()

if urls then

+ 5
- 0
src/plugins/lua/multimap.lua View File

@@ -712,6 +712,11 @@ local function multimap_callback(task, rule)
received = function()
local hdrs = task:get_received_headers()
if hdrs and hdrs[1] then
if not rule['artificial'] then
hdrs = fun.filter(function(h)
return not h['artificial']
end, hdrs):totable()
end
for pos, h in ipairs(hdrs) do
match_received_header(rule, pos, #hdrs, h)
end

Loading…
Cancel
Save