public nobgit read

NobMail

Based on mailcow: dockerized

Languages

Repository composition by tracked source files.

PHP

PHP 49% JavaScript 35% HTML 9% CSS 4% Shell 2% Python 1% Lua 0% Perl 0% Ruby 0% SCSS 0%

Create file Wiki Documentation

Clone

https://nobgit.com/orgs/nobgit/nobmail.git

ssh://[email protected]:2222/orgs/nobgit/nobmail.git

Commit

[Rspamd] Pushover: Fixes

35d35869

andryyy <[email protected]> 6 years ago

data/conf/rspamd/meta_exporter/pushover.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

Diff

diff --git a/data/conf/rspamd/meta_exporter/pushover.php b/data/conf/rspamd/meta_exporter/pushover.php
index 680c20e8..8c1ab320 100644
--- a/data/conf/rspamd/meta_exporter/pushover.php
+++ b/data/conf/rspamd/meta_exporter/pushover.php
@@ -202,12 +202,21 @@ foreach ($rcpt_final_mailboxes as $rcpt_final) {
     $senders = explode(',', $api_data['senders']);
     $senders = array_filter($senders);
     $senders_regex = $api_data['senders_regex'];
-    $sender_validated = true;
-    if (!empty($senders_regex) && !preg_match($senders_regex, $sender)) {
-      $sender_validated = false;
+    $sender_validated = false;
+    if (empty($senders) && empty($senders_regex)) {
+      $sender_validated = true;
     }
-    if (!empty($senders) && !in_array($sender, $senders)) {
-      $sender_validated = false;
+    else {
+      if (!empty($senders)) {
+        if (in_array($sender, $senders)) {
+          $sender_validated = true;
+        }
+      }
+      if (!empty($senders_regex) && $sender_validated !== true) {
+        if (preg_match($senders_regex, $sender)) {
+          $sender_validated = true;
+        }
+      }
     }
     if ($sender_validated === false) {
       error_log("NOTIFY: pushover pipe: skipping unwanted sender " . $sender);