[Mailer] AWS SES transport Source ARN header support

Author: chekalsky

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

@@ -70,6 +70,7 @@ public function testSend()
             $this->assertSame('<b>Hello There!</b>', $content['Content']['Simple']['Body']['Html']['Data']);
             $this->assertSame(['[email protected]', '[email protected]'], $content['ReplyToAddresses']);
             $this->assertSame('aws-configuration-set-name', $content['ConfigurationSetName']);
+            $this->assertSame('aws-source-arn', $content['FromEmailAddressIdentityArn']);
             $this->assertSame('[email protected]', $content['FeedbackForwardingEmailAddress']);
 
             $json = '{"MessageId": "foobar"}';
@@ -91,6 +92,7 @@ public function testSend()
             ->returnPath(new Address('[email protected]'));
 
         $mail->getHeaders()->addTextHeader('X-SES-CONFIGURATION-SET', 'aws-configuration-set-name');
+        $mail->getHeaders()->addTextHeader('X-SES-SOURCE-ARN', 'aws-source-arn');
 
         $message = $transport->send($mail);
 

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

@@ -69,6 +69,7 @@ public function testSend()
             $this->assertSame('Fabien <[email protected]>', $content['Source']);
             $this->assertSame('Hello There!', $content['Message_Body_Text_Data']);
             $this->assertSame('aws-configuration-set-name', $content['ConfigurationSetName']);
+            $this->assertSame('aws-source-arn', $content['FromEmailAddressIdentityArn']);
 
             $xml = '<SendEmailResponse xmlns="https://email.amazonaws.com/doc/2010-03-31/">
   <SendEmailResult>
@@ -90,6 +91,7 @@ public function testSend()
             ->text('Hello There!');
 
         $mail->getHeaders()->addTextHeader('X-SES-CONFIGURATION-SET', 'aws-configuration-set-name');
+        $mail->getHeaders()->addTextHeader('X-SES-SOURCE-ARN', 'aws-source-arn');
 
         $message = $transport->send($mail);
 
@@ -135,6 +137,7 @@ public function testSendWithAttachments()
              ->attach('attached data');
 
         $mail->getHeaders()->addTextHeader('X-SES-CONFIGURATION-SET', 'aws-configuration-set-name');
+        $mail->getHeaders()->addTextHeader('X-SES-SOURCE-ARN', 'aws-source-arn');
 
         $message = $transport->send($mail);
 

src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpAsyncAwsTransportTest.php

@@ -69,6 +69,7 @@ public function testSend()
             $this->assertStringContainsString('Fabien <[email protected]>', $content);
             $this->assertStringContainsString('Hello There!', $content);
             $this->assertSame('aws-configuration-set-name', $body['ConfigurationSetName']);
+            $this->assertSame('aws-source-arn', $body['FromEmailAddressIdentityArn']);
 
             $json = '{"MessageId": "foobar"}';
 
@@ -86,6 +87,7 @@ public function testSend()
             ->text('Hello There!');
 
         $mail->getHeaders()->addTextHeader('X-SES-CONFIGURATION-SET', 'aws-configuration-set-name');
+        $mail->getHeaders()->addTextHeader('X-SES-SOURCE-ARN', 'aws-source-arn');
 
         $message = $transport->send($mail);
 

src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpTransportTest.php

@@ -77,6 +77,7 @@ public function testSend()
             $this->assertStringContainsString('Hello There!', $content);
 
             $this->assertSame('aws-configuration-set-name', $body['ConfigurationSetName']);
+            $this->assertSame('aws-source-arn', $body['FromEmailAddressIdentityArn']);
 
             $xml = '<SendEmailResponse xmlns="https://email.amazonaws.com/doc/2010-03-31/">
   <SendRawEmailResult>
@@ -99,6 +100,7 @@ public function testSend()
             ->text('Hello There!');
 
         $mail->getHeaders()->addTextHeader('X-SES-CONFIGURATION-SET', 'aws-configuration-set-name');
+        $mail->getHeaders()->addTextHeader('X-SES-SOURCE-ARN', 'aws-source-arn');
 
         $message = $transport->send($mail);
 

src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiAsyncAwsTransport.php

@@ -92,6 +92,9 @@ protected function getRequest(SentMessage $message): SendEmailRequest
         if ($header = $email->getHeaders()->get('X-SES-CONFIGURATION-SET')) {
             $request['ConfigurationSetName'] = $header->getBodyAsString();
         }
+        if ($header = $email->getHeaders()->get('X-SES-SOURCE-ARN')) {
+            $request['FromEmailAddressIdentityArn'] = $header->getBodyAsString();
+        }
         if ($email->getReturnPath()) {
             $request['FeedbackForwardingEmailAddress'] = $email->getReturnPath()->toString();
         }

src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php

@@ -99,6 +99,10 @@ private function getPayload(Email $email, Envelope $envelope): array
                 $payload['ConfigurationSetName'] = $header->getBodyAsString();
             }
 
+            if ($header = $email->getHeaders()->get('X-SES-SOURCE-ARN')) {
+                $payload['FromEmailAddressIdentityArn'] = $header->getBodyAsString();
+            }
+
             return $payload;
         }
 
@@ -127,6 +131,9 @@ private function getPayload(Email $email, Envelope $envelope): array
         if ($header = $email->getHeaders()->get('X-SES-CONFIGURATION-SET')) {
             $payload['ConfigurationSetName'] = $header->getBodyAsString();
         }
+        if ($header = $email->getHeaders()->get('X-SES-SOURCE-ARN')) {
+            $payload['FromEmailAddressIdentityArn'] = $header->getBodyAsString();
+        }
 
         return $payload;
     }

src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpAsyncAwsTransport.php

@@ -83,6 +83,10 @@ protected function getRequest(SentMessage $message): SendEmailRequest
             && $configurationSetHeader = $message->getOriginalMessage()->getHeaders()->get('X-SES-CONFIGURATION-SET')) {
             $request['ConfigurationSetName'] = $configurationSetHeader->getBodyAsString();
         }
+        if (($message->getOriginalMessage() instanceof Message)
+            && $sourceArnHeader = $message->getOriginalMessage()->getHeaders()->get('X-SES-SOURCE-ARN')) {
+            $request['FromEmailAddressIdentityArn'] = $sourceArnHeader->getBodyAsString();
+        }
 
         return new SendEmailRequest($request);
     }

src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpTransport.php

@@ -77,6 +77,11 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
             $request['body']['ConfigurationSetName'] = $configurationSetHeader->getBodyAsString();
         }
 
+        if ($message->getOriginalMessage() instanceof Message
+            && $sourceArnHeader = $message->getOriginalMessage()->getHeaders()->get('X-SES-SOURCE-ARN')) {
+            $request['body']['FromEmailAddressIdentityArn'] = $sourceArnHeader->getBodyAsString();
+        }
+
         $response = $this->client->request('POST', 'https://'.$this->getEndpoint(), $request);
 
         $result = new \SimpleXMLElement($response->getContent(false));

src/Symfony/Component/Mailer/CHANGELOG.md

@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * added the `mailer` monolog channel and set it on all transport definitions
+ * Add support for `X-SES-SOURCE-ARN` in `symfony/amazon-mailer`
 
 5.2.0
 -----