Pushover/Quarantine utf 8 fix - fixes #6028 (#6031)

* Decode rspamd-subject for pushover notifications Fixes #6028 * Apply iconv_mime_decode to the quarantine function as well This might contain utf-8 encoded text as well * Moved the iconv_mime_decode "fix" back to pipe.php
mailcow · Aug 20, 2024 · 567ebbc · 567ebbc
1 parent f9a7712
commit 567ebbc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/data/conf/rspamd/meta_exporter/pipe.php b/data/conf/rspamd/meta_exporter/pipe.php
@@ -52,7 +52,7 @@ function getallheaders() {
 
 $qid      = $headers['X-Rspamd-Qid'];
 $fuzzy    = $headers['X-Rspamd-Fuzzy'];
-$subject  = $headers['X-Rspamd-Subject'];
+$subject  = iconv_mime_decode($headers['X-Rspamd-Subject']);
 $score    = $headers['X-Rspamd-Score'];
 $rcpts    = $headers['X-Rspamd-Rcpt'];
 $user     = $headers['X-Rspamd-User'];

diff --git a/data/conf/rspamd/meta_exporter/pushover.php b/data/conf/rspamd/meta_exporter/pushover.php
@@ -53,7 +53,7 @@ function getallheaders() {
 $rcpts    = $headers['X-Rspamd-Rcpt'];
 $sender   = $headers['X-Rspamd-From'];
 $ip       = $headers['X-Rspamd-Ip'];
-$subject  = $headers['X-Rspamd-Subject'];
+$subject  = iconv_mime_decode($headers['X-Rspamd-Subject']);
 $messageid= $json_body->message_id;
 $priority = 0;