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

[Rspamd] Moore Pushover fixes

master
andryyy 2020-04-16 15:42:10 +02:00
parent fec0f688b1
commit 6efe0d5aab
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/conf/rspamd/local.d/metadata_exporter.conf
View File

@ -12,10 +12,10 @@ rules {
selector = "ratelimited"; selector = "ratelimited";
formatter = "json"; formatter = "json";
} }
UNAUTHMAIL { PUSHOVERMAIL {
backend = "http"; backend = "http";
url = "http://nginx:9081/pushover.php"; url = "http://nginx:9081/pushover.php";
selector = "unauth_mail"; selector = "mailcow_rcpt";
# Only return msgid, do not parse the full message # Only return msgid, do not parse the full message
formatter = "msgid"; formatter = "msgid";
meta_headers = true; meta_headers = true;
@ -23,14 +23,13 @@ rules {
} }
custom_select { custom_select {
unauth_mail = <<EOD mailcow_rcpt = <<EOD
return function(task) return function(task)
local action = task:get_metric_action('default') local action = task:get_metric_action('default')
if task:has_symbol('NO_LOG_STAT') or (action == 'reject' or action == 'add header' or action == 'rewrite subject') then if task:has_symbol('NO_LOG_STAT') or (action == 'reject' or action == 'add header' or action == 'rewrite subject') then
return false return false
else else
local uname = task:get_user() if task:get_symbol("RCPT_MAILCOW_DOMAIN") then
if not uname then
return true return true
end end
return false return false

1
data/conf/rspamd/meta_exporter/pushover.php
View File

@ -46,7 +46,6 @@ if (!function_exists('getallheaders')) {
} }
} }
$headers = getallheaders(); $headers = getallheaders();
$qid = $headers['X-Rspamd-Qid']; $qid = $headers['X-Rspamd-Qid'];