From 567ebbc324496f1a6a36867a29470c648bcc409e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A9lano?= Date: Tue, 20 Aug 2024 13:39:20 +0200 Subject: [PATCH] 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 --- data/conf/rspamd/meta_exporter/pipe.php | 2 +- data/conf/rspamd/meta_exporter/pushover.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/conf/rspamd/meta_exporter/pipe.php b/data/conf/rspamd/meta_exporter/pipe.php index 88e66e8e..1858ee66 100644 --- a/data/conf/rspamd/meta_exporter/pipe.php +++ b/data/conf/rspamd/meta_exporter/pipe.php @@ -52,7 +52,7 @@ $headers = 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 index 10265d15..f122b281 100644 --- a/data/conf/rspamd/meta_exporter/pushover.php +++ b/data/conf/rspamd/meta_exporter/pushover.php @@ -53,7 +53,7 @@ $qid = $headers['X-Rspamd-Qid']; $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;