Page MenuHomePhabricator
Files F13225149

D19987.id47720.diff
No OneTemporary
Actions

D19987.id47720.diff
View Options

diff --git a/src/applications/metamta/constants/MetaMTAReceivedMailStatus.php b/src/applications/metamta/constants/MetaMTAReceivedMailStatus.php
--- a/src/applications/metamta/constants/MetaMTAReceivedMailStatus.php
+++ b/src/applications/metamta/constants/MetaMTAReceivedMailStatus.php
@@ -16,6 +16,7 @@
const STATUS_UNHANDLED_EXCEPTION = 'err:exception';
const STATUS_EMPTY = 'err:empty';
const STATUS_EMPTY_IGNORED = 'err:empty-ignored';
+ const STATUS_RESERVED = 'err:reserved-recipient';
public static function getHumanReadableName($status) {
$map = array(
@@ -32,6 +33,7 @@
self::STATUS_UNHANDLED_EXCEPTION => pht('Unhandled Exception'),
self::STATUS_EMPTY => pht('Empty Mail'),
self::STATUS_EMPTY_IGNORED => pht('Ignored Empty Mail'),
+ self::STATUS_RESERVED => pht('Reserved Recipient'),
);
return idx($map, $status, pht('Processing Exception'));
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
--- a/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
@@ -161,12 +161,16 @@
->setFilterMethod('isEnabled')
->execute();
+ $reserved_recipient = null;
$targets = $this->newTargetAddresses();
foreach ($targets as $key => $target) {
// Never accept any reserved address as a mail target. This prevents
// security issues around "hostmaster@" and bad behavior with
// "noreply@".
if (PhabricatorMailUtil::isReservedAddress($target)) {
+ if (!$reserved_recipient) {
+ $reserved_recipient = $target;
+ }
unset($targets[$key]);
continue;
}
@@ -212,8 +216,26 @@
throw $receiver_exception;
}
+
if (!$any_accepted) {
- if (!$sender) {
+ if ($reserved_recipient) {
+ // If nothing accepted the mail, we normally raise an error to help
+ // users who mistakenly send mail to "barges@" instead of "bugs@".
+
+ // However, if the recipient list included a reserved recipient, we
+ // don't bounce the mail with an error.
+
+ // The intent here is that if a user does a "Reply All" and includes
+ // "From: noreply@phabricator" in the receipient list, we just want
+ // to drop the mail rather than send them an unhelpful bounce message.
+
+ throw new PhabricatorMetaMTAReceivedMailProcessingException(
+ MetaMTAReceivedMailStatus::STATUS_RESERVED,
+ pht(
+ 'No application handled this mail. This mail was sent to a '.
+ 'reserved recipient ("%s") so bounces are suppressed.',
+ (string)$reserved_recipient));
+ } else if (!$sender) {
// NOTE: Currently, we'll always drop this mail (since it's headed to
// an unverified recipient). See T12237. These details are still
// useful because they'll appear in the mail logs and Mail web UI.
@@ -244,6 +266,10 @@
// Don't send an error email back in these cases, since they're
// very unlikely to be the sender's fault.
break;
+ case MetaMTAReceivedMailStatus::STATUS_RESERVED:
+ // This probably is the sender's fault, but it's likely an accident
+ // that we received the mail at all.
+ break;
case MetaMTAReceivedMailStatus::STATUS_EMPTY_IGNORED:
// This error is explicitly ignored.
break;

File Metadata

Mime Type
text/plain
Expires
Mon, May 20, 1:42 PM (3 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6293827
Default Alt Text
D19987.id47720.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility