瀏覽代碼

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
Délano 1 年之前
父節點
當前提交
567ebbc324
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      data/conf/rspamd/meta_exporter/pipe.php
  2. 1 1
      data/conf/rspamd/meta_exporter/pushover.php

+ 1 - 1
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'];

+ 1 - 1
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;