diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jérémy Derussé 2021-05-12 23:02:07 +02:00
parent b802c6d98d
commit 05a9497230
No known key found for this signature in database
GPG Key ID: 2083FA5758C473D2
4 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php
View File

@ -65,6 +65,7 @@ class SesApiAsyncAwsTransportTest extends TestCase
$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 @@ class SesApiAsyncAwsTransportTest extends TestCase
$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>')

2
src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiTransportTest.php
View File

@ -66,6 +66,7 @@ class SesApiTransportTest extends TestCase
$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 @@ class SesApiTransportTest extends TestCase
$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!');

15
src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiAsyncAwsTransport.php
View File

@ -107,4 +107,19 @@ class SesApiAsyncAwsTransport extends SesHttpAsyncAwsTransport
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);
}
}

16
src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php
View File

@ -16,6 +16,7 @@ use Symfony\Component\Mailer\Envelope;
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 @@ class SesApiTransport extends AbstractApiTransport
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);
}
}