Skip to content

Commit 1cb0d41

Browse files
author
epriestley
committed
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
1 parent d321cc8 commit 1cb0d41

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

scripts/mail/mail_handler.php

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,19 @@
3838
$content = array();
3939
foreach (array('text', 'html') as $part) {
4040
$part_body = $parser->getMessageBody($part);
41-
$part_headers = $parser->getMessageBodyHeaders($part);
42-
$content_type = idx($part_headers, 'content-type');
43-
if (
44-
!phutil_is_utf8($part_body) &&
45-
(preg_match('/charset="(.*?)"/', $content_type, $matches) ||
46-
preg_match('/charset=(\S+)/', $content_type, $matches))
47-
) {
48-
$part_body = phutil_utf8_convert($part_body, 'UTF-8', $matches[1]);
41+
42+
if (strlen($part_body) && !phutil_is_utf8($part_body)) {
43+
$part_headers = $parser->getMessageBodyHeaders($part);
44+
if (!is_array($part_headers)) {
45+
$part_headers = array();
46+
}
47+
$content_type = idx($part_headers, 'content-type');
48+
if (preg_match('/charset="(.*?)"/', $content_type, $matches) ||
49+
preg_match('/charset=(\S+)/', $content_type, $matches)) {
50+
$part_body = phutil_utf8_convert($part_body, 'UTF-8', $matches[1]);
51+
}
4952
}
53+
5054
$content[$part] = $part_body;
5155
}
5256

0 commit comments

Comments
 (0)