diff options
| author | Andrew Lewis <nerf@judo.za.org> | 2017-03-09 17:37:52 +0200 |
|---|---|---|
| committer | Andrew Lewis <nerf@judo.za.org> | 2017-03-09 17:37:52 +0200 |
| commit | 786769f7c0f7c9c077321e76e69092a6e2f0106c (patch) | |
| tree | 17898a98b07bc9e373031accc7ee6f4182b0e6fa | |
| parent | d1cbf812db1cd50623d2e58a8aa79bf7e660eaec (diff) | |
| download | rspamd-786769f7c0f7c9c077321e76e69092a6e2f0106c.tar.gz rspamd-786769f7c0f7c9c077321e76e69092a6e2f0106c.zip | |
[Fix] Metadata exporter: use rule-specific settings for emails
- Reported by @croessner
| -rw-r--r-- | src/plugins/lua/metadata_exporter.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/lua/metadata_exporter.lua b/src/plugins/lua/metadata_exporter.lua index 7882a265c..c8717bc5d 100644 --- a/src/plugins/lua/metadata_exporter.lua +++ b/src/plugins/lua/metadata_exporter.lua @@ -137,13 +137,13 @@ local formatters = { default = function(task) return task:get_content() end, - email_alert = function(task) + email_alert = function(task, rule) local meta = get_general_metadata(task, true) - meta.mail_from = settings.mail_from - meta.mail_to = settings.mail_to + meta.mail_from = rule.mail_from or settings.mail_from + meta.mail_to = rule.mail_to or settings.mail_to meta.our_message_id = rspamd_util.random_hex(12) .. '@rspamd' meta.date = rspamd_util.time_to_string(rspamd_util.get_time()) - return simple_template(settings.email_template, meta) + return simple_template(rule.email_template or settings.email_template, meta) end, json = function(task) return ucl.to_format(get_general_metadata(task), 'json-compact') @@ -625,7 +625,7 @@ local function gen_exporter(rule) if selected then rspamd_logger.debugm(N, task, 'Message selected for processing') local formatter = rule.formatter or 'default' - local formatted = formatters[formatter](task) + local formatted = formatters[formatter](task, rule) if formatted then pushers[rule.backend](task, formatted, rule) else |