[Mailer] Fix SES API call with UTF-8 Addresses

jderusse · jderusse · commit 61622d38791c · 2021-05-12T23:07:22.000+02:00
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php
@@ -65,6 +65,7 @@ public function testSend()
 
             $this->assertSame('Hello!', $content['Content']['Simple']['Subject']['Data']);
             $this->assertSame('"Saif Eddin" <saif.gmati@symfony.com>', $content['Destination']['ToAddresses'][0]);
+            $this->assertSame('"=?UTF-8?B?SsOpcsOpbXk=?=" <jeremy@derusse.com>', $content['Destination']['CcAddresses'][0]);
             $this->assertSame('"Fabien" <fabpot@symfony.com>', $content['FromEmailAddress']);
             $this->assertSame('Hello There!', $content['Content']['Simple']['Body']['Text']['Data']);
             $this->assertSame('<b>Hello There!</b>', $content['Content']['Simple']['Body']['Html']['Data']);
@@ -84,6 +85,7 @@ public function testSend()
         $mail = new Email();
         $mail->subject('Hello!')
             ->to(new Address('saif.gmati@symfony.com', 'Saif Eddin'))
+            ->cc(new Address('jeremy@derusse.com', 'Jérémy'))
             ->from(new Address('fabpot@symfony.com', 'Fabien'))
             ->text('Hello There!')
             ->html('<b>Hello There!</b>')
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiTransportTest.php
@@ -66,6 +66,7 @@ public function testSend()
 
             $this->assertSame('Hello!', $content['Message_Subject_Data']);
             $this->assertSame('"Saif Eddin" <saif.gmati@symfony.com>', $content['Destination_ToAddresses_member'][0]);
+            $this->assertSame('"=?UTF-8?B?SsOpcsOpbXk=?=" <jeremy@derusse.com>', $content['Destination_CcAddresses_member'][0]);
             $this->assertSame('"Fabien" <fabpot@symfony.com>', $content['Source']);
             $this->assertSame('Hello There!', $content['Message_Body_Text_Data']);
             $this->assertSame('aws-configuration-set-name', $content['ConfigurationSetName']);
@@ -86,6 +87,7 @@ public function testSend()
         $mail = new Email();
         $mail->subject('Hello!')
             ->to(new Address('saif.gmati@symfony.com', 'Saif Eddin'))
+            ->cc(new Address('jeremy@derusse.com', 'Jérémy'))
             ->from(new Address('fabpot@symfony.com', 'Fabien'))
             ->text('Hello There!');
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiAsyncAwsTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiAsyncAwsTransport.php
@@ -107,4 +107,19 @@ private function getRecipients(Email $email, Envelope $envelope): array
             return !\in_array($address, $emailRecipients, true);
         });
     }
+
+    protected function stringifyAddresses(array $addresses): array
+    {
+        return array_map(function (Address $a) {
+            // AWS does not support UTF-8 address
+            if (preg_match('~[\x00-\x08\x10-\x19\x7F-\xFF\r\n]~', $name = $a->getName())) {
+                return sprintf('"=?UTF-8?B?%s?=" <%s>',
+                    base64_encode($name),
+                    $a->getEncodedAddress()
+                );
+            }
+
+            return $a->toString();
+        }, $addresses);
+    }
 }
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Mailer\Exception\HttpTransportException;
 use Symfony\Component\Mailer\SentMessage;
 use Symfony\Component\Mailer\Transport\AbstractApiTransport;
+use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Email;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
@@ -130,4 +131,19 @@ private function getPayload(Email $email, Envelope $envelope): array
 
         return $payload;
     }
+
+    protected function stringifyAddresses(array $addresses): array
+    {
+        return array_map(function (Address $a) {
+            // AWS does not support UTF-8 address
+            if (preg_match('~[\x00-\x08\x10-\x19\x7F-\xFF\r\n]~', $name = $a->getName())) {
+                return sprintf('"=?UTF-8?B?%s?=" <%s>',
+                    base64_encode($name),
+                    $a->getEncodedAddress()
+                );
+            }
+
+            return $a->toString();
+        }, $addresses);
+    }
 }
