Page MenuHomePhabricator
Files F13188067

D20593.diff
No OneTemporary
Actions

D20593.diff
View Options

diff --git a/src/applications/metamta/management/PhabricatorMailManagementReceiveTestWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementReceiveTestWorkflow.php
--- a/src/applications/metamta/management/PhabricatorMailManagementReceiveTestWorkflow.php
+++ b/src/applications/metamta/management/PhabricatorMailManagementReceiveTestWorkflow.php
@@ -29,6 +29,12 @@
'param' => 'object',
'help' => pht('Simulate mail delivery "To:" the given object.'),
),
+ array(
+ 'name' => 'cc',
+ 'param' => 'address',
+ 'help' => pht('Simulate a mail delivery "Cc:" address.'),
+ 'repeat' => true,
+ ),
));
}
@@ -84,6 +90,8 @@
$from = $user->loadPrimaryEmail()->getAddress();
}
+ $cc = $args->getArg('cc');
+
$console->writeErr("%s\n", pht('Reading message body from stdin...'));
$body = file_get_contents('php://stdin');
@@ -91,6 +99,7 @@
$header_content = array(
'Message-ID' => Filesystem::readRandomCharacters(12),
'From' => $from,
+ 'Cc' => implode(', ', $cc),
);
if (preg_match('/.+@.+/', $to)) {
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
@@ -104,24 +104,43 @@
}
public function loadAllRecipientPHIDs() {
- $addresses = array_merge(
- $this->getToAddresses(),
- $this->getCCAddresses());
+ $addresses = $this->newTargetAddresses();
- return $this->loadPHIDsFromAddresses($addresses);
- }
-
- public function loadCCPHIDs() {
- return $this->loadPHIDsFromAddresses($this->getCCAddresses());
- }
+ // See T13317. Don't allow reserved addresses (like "noreply@...") to
+ // match user PHIDs.
+ foreach ($addresses as $key => $address) {
+ if (PhabricatorMailUtil::isReservedAddress($address)) {
+ unset($addresses[$key]);
+ }
+ }
- private function loadPHIDsFromAddresses(array $addresses) {
- if (empty($addresses)) {
+ if (!$addresses) {
return array();
}
- $users = id(new PhabricatorUserEmail())
- ->loadAllWhere('address IN (%Ls)', $addresses);
- return mpull($users, 'getUserPHID');
+
+ $address_strings = array();
+ foreach ($addresses as $address) {
+ $address_strings[] = phutil_string_cast($address->getAddress());
+ }
+
+ // See T13317. If a verified email address is in the "To" or "Cc" line,
+ // we'll count the user who owns that address as a recipient.
+
+ // We require the address be verified because we'll trigger behavior (like
+ // adding subscribers) based on the recipient list, and don't want to add
+ // Alice as a subscriber if she adds an unverified "internal-bounces@"
+ // address to her account and this address gets caught in the crossfire.
+ // In the best case this is confusing; in the worst case it could
+ // some day give her access to objects she can't see.
+
+ $recipients = id(new PhabricatorUserEmail())
+ ->loadAllWhere(
+ 'address IN (%Ls) AND isVerified = 1',
+ $address_strings);
+
+ $recipient_phids = mpull($recipients, 'getUserPHID');
+
+ return $recipient_phids;
}
public function processReceivedMail() {

File Metadata

Mime Type
text/plain
Expires
May 12 2024, 4:59 AM (5 w, 19 m ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6285223
Default Alt Text
D20593.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility