mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-30 02:32:42 +01:00
1cb0d41367
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
99 lines
2.9 KiB
PHP
Executable file
99 lines
2.9 KiB
PHP
Executable file
#!/usr/bin/env php
|
|
<?php
|
|
|
|
// NOTE: This script is very oldschool and takes the environment as an argument.
|
|
// Some day, we could take a shot at cleaning this up.
|
|
if ($argc > 1) {
|
|
foreach (array_slice($argv, 1) as $arg) {
|
|
if (!preg_match('/^-/', $arg)) {
|
|
$_SERVER['PHABRICATOR_ENV'] = $arg;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
$root = dirname(dirname(dirname(__FILE__)));
|
|
require_once $root.'/scripts/__init_script__.php';
|
|
require_once $root.'/externals/mimemailparser/MimeMailParser.class.php';
|
|
|
|
$args = new PhutilArgumentParser($argv);
|
|
$args->parseStandardArguments();
|
|
$args->parse(
|
|
array(
|
|
array(
|
|
'name' => 'process-duplicates',
|
|
'help' => pht(
|
|
"Process this message, even if it's a duplicate of another message. ".
|
|
"This is mostly useful when debugging issues with mail routing."),
|
|
),
|
|
array(
|
|
'name' => 'env',
|
|
'wildcard' => true,
|
|
),
|
|
));
|
|
|
|
$parser = new MimeMailParser();
|
|
$parser->setText(file_get_contents('php://stdin'));
|
|
|
|
$content = array();
|
|
foreach (array('text', 'html') as $part) {
|
|
$part_body = $parser->getMessageBody($part);
|
|
|
|
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;
|
|
}
|
|
|
|
$headers = $parser->getHeaders();
|
|
$headers['subject'] = iconv_mime_decode($headers['subject'], 0, 'UTF-8');
|
|
$headers['from'] = iconv_mime_decode($headers['from'], 0, 'UTF-8');
|
|
|
|
if ($args->getArg('process-duplicates')) {
|
|
$headers['message-id'] = Filesystem::readRandomCharacters(64);
|
|
}
|
|
|
|
$received = new PhabricatorMetaMTAReceivedMail();
|
|
$received->setHeaders($headers);
|
|
$received->setBodies($content);
|
|
|
|
$attachments = array();
|
|
foreach ($parser->getAttachments() as $attachment) {
|
|
if (preg_match('@text/(plain|html)@', $attachment->getContentType()) &&
|
|
$attachment->getContentDisposition() == 'inline') {
|
|
// If this is an "inline" attachment with some sort of text content-type,
|
|
// do not treat it as a file for attachment. MimeMailParser already picked
|
|
// it up in the getMessageBody() call above. We still want to treat 'inline'
|
|
// attachments with other content types (e.g., images) as attachments.
|
|
continue;
|
|
}
|
|
|
|
$file = PhabricatorFile::newFromFileData(
|
|
$attachment->getContent(),
|
|
array(
|
|
'name' => $attachment->getFilename(),
|
|
'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
|
|
));
|
|
$attachments[] = $file->getPHID();
|
|
}
|
|
|
|
try {
|
|
$received->setAttachments($attachments);
|
|
$received->save();
|
|
$received->processReceivedMail();
|
|
} catch (Exception $e) {
|
|
$received
|
|
->setMessage(pht('EXCEPTION: %s', $e->getMessage()))
|
|
->save();
|
|
|
|
throw $e;
|
|
}
|