[Mailer] Allow configuring port and tls options when using the Amazon SES bridge

adars · nicolas-grekas · commit 65d3bcb9376d · 2025-11-14T14:58:26.000+01:00
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/CHANGELOG.md b/src/Symfony/Component/Mailer/Bridge/Amazon/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.4
+---
+
+ * Add support for configuring the port and tls options
+
 7.3
 ---
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/README.md b/src/Symfony/Component/Mailer/Bridge/Amazon/README.md
@@ -7,7 +7,7 @@ Configuration example:
 
 ```env
 # SMTP
-MAILER_DSN=ses+smtp://USERNAME:PASSWORD@default?region=REGION&session_token=SESSION_TOKEN
+MAILER_DSN=ses+smtp://USERNAME:PASSWORD@default:PORT?region=REGION&session_token=SESSION_TOKEN
 
 # HTTP
 MAILER_DSN=ses+https://ACCESS_KEY:SECRET_KEY@default?region=REGION&session_token=SESSION_TOKEN
@@ -21,6 +21,7 @@ where:
  - `SECRET_KEY` is your Amazon SES access key secret
  - `REGION` is Amazon SES selected region (optional, default `eu-west-1`)
  - `SESSION_TOKEN` is your Amazon SES session token (optional)
+ - `PORT` is the port you want to communicate to SES with (optional, default `465`)
 
 Resources
 ---------
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesSmtpTransport.php
@@ -28,13 +28,13 @@ class SesSmtpTransport extends EsmtpTransport
     /**
      * @param string|null $region Amazon SES region
      */
-    public function __construct(string $username, #[\SensitiveParameter] string $password, ?string $region = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null, string $host = 'default')
+    public function __construct(string $username, #[\SensitiveParameter] string $password, ?string $region = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null, string $host = 'default', ?int $port = 465, ?bool $tls = true)
     {
         if ('default' === $host) {
             $host = \sprintf('email-smtp.%s.amazonaws.com', $region ?: 'eu-west-1');
         }
 
-        parent::__construct($host, 465, true, $dispatcher, $logger);
+        parent::__construct($host, $port, $tls, $dispatcher, $logger);
 
         $this->setUsername($username);
         $this->setPassword($password);
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesTransportFactory.php
@@ -28,9 +28,11 @@ public function create(Dsn $dsn): TransportInterface
     {
         $scheme = $dsn->getScheme();
         $region = $dsn->getOption('region');
+        $port = $dsn->getPort() ?? 465;
+        $tls = $dsn->getOption('tls');
 
         if ('ses+smtp' === $scheme || 'ses+smtps' === $scheme) {
-            $transport = new SesSmtpTransport($this->getUser($dsn), $this->getPassword($dsn), $region, $this->dispatcher, $this->logger, $dsn->getHost());
+            $transport = new SesSmtpTransport($this->getUser($dsn), $this->getPassword($dsn), $region, $this->dispatcher, $this->logger, $dsn->getHost(), $port, $tls);
 
             if (null !== $pingThreshold = $dsn->getOption('ping_threshold')) {
                 $transport->setPingThreshold((int) $pingThreshold);
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php b/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php
@@ -55,8 +55,10 @@ public function __construct(string $host = 'localhost', int $port = 0, ?bool $tl
         $stream = $this->getStream();
 
         if (null === $tls) {
-            if (465 === $port) {
+            if (\in_array($port, [465, 2465], true)) {
                 $tls = true;
+            } elseif (\in_array($port, [25, 587, 2587], true)) {
+                $tls = false;
             } else {
                 $tls = \defined('OPENSSL_VERSION_NUMBER') && 0 === $port && 'localhost' !== $host;
             }

Original file line number	Diff line number	Diff line change
`@@ -28,13 +28,13 @@ class SesSmtpTransport extends EsmtpTransport`
`28`	`28`	`/**`
`29`	`29`	`* @param string\|null $region Amazon SES region`
`30`	`30`	`*/`
`31`		`- public function __construct(string $username, #[\SensitiveParameter] string $password, ?string $region = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null, string $host = 'default')`
	`31`	`+ public function __construct(string $username, #[\SensitiveParameter] string $password, ?string $region = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null, string $host = 'default', ?int $port = 465, ?bool $tls = true)`
`32`	`32`	`{`
`33`	`33`	`if ('default' === $host) {`
`34`	`34`	`$host = \sprintf('email-smtp.%s.amazonaws.com', $region ?: 'eu-west-1');`
`35`	`35`	`}`
`36`	`36`
`37`		`- parent::__construct($host, 465, true, $dispatcher, $logger);`
	`37`	`+ parent::__construct($host, $port, $tls, $dispatcher, $logger);`
`38`	`38`
`39`	`39`	`$this->setUsername($username);`
`40`	`40`	`$this->setPassword($password);`