mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-22 14:52:41 +01:00
Fix inbound mail handling for messages with no HTML body part
Summary: See D18776. See <https://discourse.phabricator-community.org/t/cant-create-maniphest-tasks-by-email/754/2>. The change in D18776 to improve handling of non-utf8 HTML parts broke handling of mail with //no// HTML parts. Partly, this is because MimeMailParser has a "traditional" PHP-style API where the return type is an exciting surprise. Test Plan: - Sent a text-only message in `Mail.app`. - Used "Show Raw" to copy it to `mail.txt`, verifying that the raw message contains ONLY a text body. - Ran `cat mail.txt | ./scripts/mail/mail_handler.php --trace --process-duplicates`. - Before patch: error about bad `idx()` on a non-array. - After patch: clean mail processing. - Did the same with a message with both HTML and text bodies to make sure I didn't break anything. Ideally we'd probably get test coverage on this, but it's been touched roughly once a year since 2013 so it'll probably hold. Reviewers: amckinley, alexmv Reviewed By: amckinley, alexmv Differential Revision: https://secure.phabricator.com/D18778
This commit is contained in:
parent
d321cc810a
commit
1cb0d41367
1 changed files with 12 additions and 8 deletions
|
@ -38,15 +38,19 @@ $parser->setText(file_get_contents('php://stdin'));
|
|||
$content = array();
|
||||
foreach (array('text', 'html') as $part) {
|
||||
$part_body = $parser->getMessageBody($part);
|
||||
$part_headers = $parser->getMessageBodyHeaders($part);
|
||||
$content_type = idx($part_headers, 'content-type');
|
||||
if (
|
||||
!phutil_is_utf8($part_body) &&
|
||||
(preg_match('/charset="(.*?)"/', $content_type, $matches) ||
|
||||
preg_match('/charset=(\S+)/', $content_type, $matches))
|
||||
) {
|
||||
$part_body = phutil_utf8_convert($part_body, 'UTF-8', $matches[1]);
|
||||
|
||||
if (strlen($part_body) && !phutil_is_utf8($part_body)) {
|
||||
$part_headers = $parser->getMessageBodyHeaders($part);
|
||||
if (!is_array($part_headers)) {
|
||||
$part_headers = array();
|
||||
}
|
||||
$content_type = idx($part_headers, 'content-type');
|
||||
if (preg_match('/charset="(.*?)"/', $content_type, $matches) ||
|
||||
preg_match('/charset=(\S+)/', $content_type, $matches)) {
|
||||
$part_body = phutil_utf8_convert($part_body, 'UTF-8', $matches[1]);
|
||||
}
|
||||
}
|
||||
|
||||
$content[$part] = $part_body;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue