Browse Source

[Rspamd] Moore Pushover fixes

andryyy 5 years ago
parent
commit
6efe0d5aab

+ 4 - 5
data/conf/rspamd/local.d/metadata_exporter.conf

@@ -12,10 +12,10 @@ rules {
 		selector = "ratelimited";
 		formatter = "json";
 	}
-  UNAUTHMAIL {
+  PUSHOVERMAIL {
     backend = "http";
     url = "http://nginx:9081/pushover.php";
-    selector = "unauth_mail";
+    selector = "mailcow_rcpt";
     # Only return msgid, do not parse the full message
     formatter = "msgid";
     meta_headers = true;
@@ -23,14 +23,13 @@ rules {
 }
 
 custom_select {
-  unauth_mail = <<EOD
+  mailcow_rcpt = <<EOD
 return function(task)
   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
     return false
   else
-    local uname = task:get_user()
-    if not uname then
+    if task:get_symbol("RCPT_MAILCOW_DOMAIN") then
       return true
     end
     return false

+ 0 - 1
data/conf/rspamd/meta_exporter/pushover.php

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