bug #30445 [Mime] Fix generate message id with named address (Jibbarth)

fabpot · fabpot · commit 11f1660b9306 · 2019-03-04T21:36:48.000+01:00
This PR was squashed before being merged into the 4.3-dev branch (closes #30445). Discussion ---------- [Mime] Fix generate message id with named address | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | yes | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | #...  | License | MIT | Doc PR | When using a NamedAddress in from(), the generated MessageId don't pass the validation. In effect, the email passed to generateMessageId look like this `Fabien <fabien@symfony.com>` and the strstr transform email in this `4641b2b294b53fe983a05b1a@symfony.com>` By passing the address only instead of toString, it's fixed.  Commits ------- 375ac92 [Mime] Fix generate message id with named address
diff --git a/src/Symfony/Component/Mime/Message.php b/src/Symfony/Component/Mime/Message.php
@@ -97,7 +97,7 @@ public function getPreparedHeaders(): Headers
         }
 
         if (!$headers->has('Message-ID')) {
-            $headers->addIdHeader('Message-ID', $this->generateMessageId($sender->toString()));
+            $headers->addIdHeader('Message-ID', $this->generateMessageId($sender->getAddress()));
         }
 
         // remove the Bcc field which should NOT be part of the sent message
diff --git a/src/Symfony/Component/Mime/Tests/MessageTest.php b/src/Symfony/Component/Mime/Tests/MessageTest.php
@@ -17,6 +17,7 @@
 use Symfony\Component\Mime\Header\MailboxListHeader;
 use Symfony\Component\Mime\Header\UnstructuredHeader;
 use Symfony\Component\Mime\Message;
+use Symfony\Component\Mime\NamedAddress;
 use Symfony\Component\Mime\Part\TextPart;
 
 class MessageTest extends TestCase
@@ -90,6 +91,15 @@ public function testGetPreparedHeadersWithNoFrom()
         (new Message())->getPreparedHeaders();
     }
 
+    public function testGetPreparedHeadersWithNamedFrom()
+    {
+        $message = new Message();
+        $message->getHeaders()->addMailboxListHeader('From', [new NamedAddress('fabien@symfony.com', 'Fabien')]);
+        $h = $message->getPreparedHeaders();
+        $this->assertEquals(new MailboxListHeader('From', [new NamedAddress('fabien@symfony.com', 'Fabien')]), $h->get('From'));
+        $this->assertTrue($h->has('Message-Id'));
+    }
+
     public function testGetPreparedHeadersHasSenderWhenNeeded()
     {
         $message = new Message();

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public function getPreparedHeaders(): Headers`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`if (!$headers->has('Message-ID')) {`
`100`		`- $headers->addIdHeader('Message-ID', $this->generateMessageId($sender->toString()));`
	`100`	`+ $headers->addIdHeader('Message-ID', $this->generateMessageId($sender->getAddress()));`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`// remove the Bcc field which should NOT be part of the sent message`