paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #116 from andryyy/dev 

Use Rspamds new tag symbol
master
André Peters 2017-03-12 14:38:44 +01:00 committed by GitHub
parent 7f4defb302 09850a76e5
commit 8efb1c933a
2 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/Dockerfiles/rspamd/Dockerfile
View File

@ -9,8 +9,8 @@ RUN dpkg-divert --local --rename --add /sbin/initctl \
&& dpkg-divert --local --rename --add /usr/bin/ischroot \ && dpkg-divert --local --rename --add /usr/bin/ischroot \
&& ln -sf /bin/true /usr/bin/ischroot && ln -sf /bin/true /usr/bin/ischroot
RUN apt-key adv --fetch-keys http://rspamd.com/apt-stable/gpg.key \ RUN apt-key adv --fetch-keys http://rspamd.com/apt/gpg.key \
&& echo "deb http://rspamd.com/apt-stable/ xenial main" > /etc/apt/sources.list.d/rspamd.list \ && echo "deb http://rspamd.com/apt/ xenial main" > /etc/apt/sources.list.d/rspamd.list \
&& apt-get update \ && apt-get update \
&& apt-get -y install rspamd ca-certificates python-pip && apt-get -y install rspamd ca-certificates python-pip

33
data/conf/rspamd/lua/rspamd.local.lua
View File

@ -24,27 +24,32 @@ auth_domain_map = rspamd_config:add_map({
}) })
rspamd_config:register_post_filter(function(task) rspamd_config:register_post_filter(function(task)
local tag = nil
local util = require("rspamd_util") local util = require("rspamd_util")
local rspamd_logger = require "rspamd_logger" local rspamd_logger = require "rspamd_logger"
local user_tagged = task:get_recipients(2)[1]['user']
local domain = task:get_recipients(1)[1]['domain'] local tagged_rcpt = task:get_symbol("TAGGED_RCPT")
local user, tag = user_tagged:match("([^+]+)+(.*)") local user = task:get_recipients(0)[1]['user']
local domain = task:get_recipients(0)[1]['domain']
local rcpt = user .. '@' .. domain
local authdomain = auth_domain_map:get_key(domain) local authdomain = auth_domain_map:get_key(domain)
local action = task:get_metric_action('default')
if tagged_rcpt[1].options[1] then
local tag = tagged_rcpt[1].options[1]
rspamd_logger.infox("found tag: %s", tag)
local action = task:get_metric_action('default') local action = task:get_metric_action('default')
rspamd_logger.infox("metric action now: %s", action) rspamd_logger.infox("metric action now: %s", action)
if action ~= 'no action' and action ~= 'greylist' then if action ~= 'no action' and action ~= 'greylist' then
rspamd_logger.infox("skipping tag handler for action: %s", action)
return false return false
end end
if tag and authdomain then if authdomain then
rspamd_logger.infox("domain: %1, tag: %2", domain, tag) rspamd_logger.infox("found mailcow domain %s", domain)
local user_untagged = user .. '@' .. domain rspamd_logger.infox("querying tag settings for user %s", rcpt)
rspamd_logger.infox("querying tag settings for user %1", user_untagged)
if modify_subject_map:get_key(user_untagged) then if modify_subject_map:get_key(rcpt) then
rspamd_logger.infox("found user in map for subject rewrite") rspamd_logger.infox("user wants subject modified for tagged mail")
local sbj = task:get_header('Subject') local sbj = task:get_header('Subject')
new_sbj = '=?UTF-8?B?' .. tostring(util.encode_base64('[' .. tag .. '] ' .. sbj)) .. '?=' new_sbj = '=?UTF-8?B?' .. tostring(util.encode_base64('[' .. tag .. '] ' .. sbj)) .. '?='
task:set_rmilter_reply({ task:set_rmilter_reply({
@ -52,18 +57,18 @@ rspamd_config:register_post_filter(function(task)
add_headers = {['Subject'] = new_sbj} add_headers = {['Subject'] = new_sbj}
}) })
else else
rspamd_logger.infox("add X-Moo-Tag header") rspamd_logger.infox("Add X-Moo-Tag header")
task:set_rmilter_reply({ task:set_rmilter_reply({
add_headers = {['X-Moo-Tag'] = 'YES'} add_headers = {['X-Moo-Tag'] = 'YES'}
}) })
end end
else else
rspamd_logger.infox("skip delimiter handling for untagged message or authenticated user") rspamd_logger.infox("skip delimiter handling for unknown domain")
end end
return false return false
end
end) end)
rspamd_config.MRAPTOR = { rspamd_config.MRAPTOR = {
callback = function(task) callback = function(task)
local parts = task:get_parts() local parts = task:get_parts()