From: Go MAEDA <maeda@farend.jp>
Date: Tue, 25 Jun 2019 23:38:28 +0000 (+0000)
Subject: LF line terminators cause misparse of a multi-part email when rdm-mailhandler.rb... 
X-Git-Tag: 4.1.0~751
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6b2fe85b74af26b5f9eda7d3b8b6a4591f63ab92;p=redmine.git

LF line terminators cause misparse of a multi-part email when rdm-mailhandler.rb is invoked from /etc/aliases (#31549).

Patch by Yuichi HARADA.


git-svn-id: http://svn.redmine.org/redmine/trunk@18317 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/extra/mail_handler/rdm-mailhandler.rb b/extra/mail_handler/rdm-mailhandler.rb
index 51a0a5afb..b7284841d 100644
--- a/extra/mail_handler/rdm-mailhandler.rb
+++ b/extra/mail_handler/rdm-mailhandler.rb
@@ -153,7 +153,7 @@ END_DESC
 
     headers = { 'User-Agent' => "Redmine mail handler/#{VERSION}" }
 
-    data = { 'key' => key, 'email' => email,
+    data = { 'key' => key, 'email' => email.gsub(/(?<!\r)\n|\r(?!\n)/, "\r\n"),
                            'allow_override' => allow_override,
                            'unknown_user' => unknown_user,
                            'default_group' => default_group,