From 6efe0d5aab512a21625e14e3029ef6ebf6e5f351 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Thu, 16 Apr 2020 15:42:10 +0200
Subject: [PATCH] [Rspamd] Moore Pushover fixes

---
 data/conf/rspamd/local.d/metadata_exporter.conf | 9 ++++-----
 data/conf/rspamd/meta_exporter/pushover.php     | 1 -
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/data/conf/rspamd/local.d/metadata_exporter.conf b/data/conf/rspamd/local.d/metadata_exporter.conf
index 4ce07df06..32a1b514f 100644
--- a/data/conf/rspamd/local.d/metadata_exporter.conf
+++ b/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
diff --git a/data/conf/rspamd/meta_exporter/pushover.php b/data/conf/rspamd/meta_exporter/pushover.php
index 35369c274..637b103a2 100644
--- a/data/conf/rspamd/meta_exporter/pushover.php
+++ b/data/conf/rspamd/meta_exporter/pushover.php
@@ -46,7 +46,6 @@ if (!function_exists('getallheaders'))  {
   }
 }
 
-
 $headers = getallheaders();
 
 $qid      = $headers['X-Rspamd-Qid'];