diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-04-20 21:51:53 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-04-20 21:52:21 +0100 |
| commit | 9b054676f05cbad1ab1b50e17cb49523c31280fb (patch) | |
| tree | cd4eaf645edcd79bdeb6009c8ee7dfe1414d9b95 /src/plugins/lua/dmarc.lua | |
| parent | 2a00044ef7432d5bde39b1ef5a81935f01784265 (diff) | |
| download | rspamd-9b054676f05cbad1ab1b50e17cb49523c31280fb.tar.gz rspamd-9b054676f05cbad1ab1b50e17cb49523c31280fb.zip | |
[Minor] Add more fields to the DMARC reports
Issue: #2847
Diffstat (limited to 'src/plugins/lua/dmarc.lua')
| -rw-r--r-- | src/plugins/lua/dmarc.lua | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua index a8de73567..7f6296bdc 100644 --- a/src/plugins/lua/dmarc.lua +++ b/src/plugins/lua/dmarc.lua @@ -66,6 +66,10 @@ Content-Transfer-Encoding: 7bit This is an aggregate report from %s. +Report domain: %s +Submitter: %s +Report ID: %s + ------=_NextPart_000_024E_01CC9B0A.AFE54C00 Content-Type: application/gzip Content-Transfer-Encoding: base64 @@ -962,16 +966,20 @@ if opts['reporting'] == true then table.insert(atmp, k) end local addr_string = table.concat(atmp, ', ') + -- TODO: migrate to templates and remove this shit local rhead = string.format(report_template:gsub("\n", "\r\n"), - report_settings.from_name, + report_settings.from_name, report_settings.email, addr_string, reporting_domain, report_settings.domain, report_id, rspamd_util.time_to_string(rspamd_util.get_time()), - rspamd_util.random_hex(12) .. '@rspamd', - report_settings.domain, + rspamd_util.random_hex(12) .. '@rspamd', -- Message-id + report_settings.domain, -- Plain text part + reporting_domain, + addr_string, + report_id, report_settings.domain, reporting_domain, report_start, report_end) |