revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-22 06:42:42 +01:00
Code Issues Releases Wiki Activity

Make incoming mail handling more robust / correct

Browse source 
Summary:
* Properly handle when no mail headers at all can be parsed
* Properly handle when mail headers can be parsed but no subject line can be found

```
EXCEPTION: (RuntimeException) Undefined index: subject
```

Closes T15769

Test Plan: See T15769

Reviewers: O1 Blessed Committers, valerio.bozzolan

Reviewed By: O1 Blessed Committers, valerio.bozzolan

Subscribers: 20after4, tobiaswiese, valerio.bozzolan, Matthew, Cigaryno

Maniphest Tasks: T15769

Differential Revision: https://we.phorge.it/D25565
This commit is contained in:
Andre Klapper 2024-04-01 12:32:50 +02:00
parent c0bc453405
commit 644f179dd2
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
externals/mimemailparser/MimeMailParser.class.php vendored
View file

@ -308,10 +308,10 @@ class MimeMailParser {
* @param $part Array * @param $part Array
*/ */
private function getPartHeaders($part) { private function getPartHeaders($part) {
if (isset($part['headers'])) { if (isset($part['headers']) && $part['headers']) {
return $part['headers']; return $part['headers'];
} }
return false; throw new Exception('MimeMailParser::getHeaders() could not parse any email headers.');
} }
/** /**

2
scripts/mail/mail_handler.php
View file

@ -55,7 +55,9 @@ foreach (array('text', 'html') as $part) {
} }
$headers = $parser->getHeaders(); $headers = $parser->getHeaders();
if (array_key_exists('subject', $headers)) {
$headers['subject'] = phutil_decode_mime_header($headers['subject']); $headers['subject'] = phutil_decode_mime_header($headers['subject']);
}
$headers['from'] = phutil_decode_mime_header($headers['from']); $headers['from'] = phutil_decode_mime_header($headers['from']);
if ($args->getArg('process-duplicates')) { if ($args->getArg('process-duplicates')) {