Merge branch '6.4' into 7.0

* 6.4:
  Fix client side connection timeout breaks mail authentication

Author: fabpot

Exception/UnexpectedResponseException.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mailer\Exception;
+
+class UnexpectedResponseException extends TransportException
+{
+}

Tests/Transport/Smtp/DummyStream.php

@@ -62,6 +62,8 @@ public function write(string $bytes, $debug = true): void
             $this->nextResponse = '334 UGFzc3dvcmQ6';
         } elseif (str_starts_with($bytes, 'cDRzc3cwcmQ=')) {
             $this->nextResponse = '535 5.7.139 Authentication unsuccessful';
+        } elseif (str_starts_with($bytes, 'dGltZWRvdXQ=')) {
+            throw new TransportException('Connection to "localhost" timed out.');
         } elseif (str_starts_with($bytes, 'AUTH CRAM-MD5')) {
             $this->nextResponse = '334 PDAxMjM0NTY3ODkuMDEyMzQ1NjdAc3ltZm9ueT4=';
         } elseif (str_starts_with($bytes, 'dGVzdHVzZXIgNTdlYzg2ODM5OWZhZThjY2M5OWFhZGVjZjhiZTAwNmY=')) {

Tests/Transport/Smtp/EsmtpTransportTest.php

@@ -214,6 +214,41 @@ public function testConstructorWithEmptyAuthenticator()
             $this->assertEquals(504, $e->getCode());
         }
     }
+
+    public function testSocketTimeout()
+    {
+        $stream = new DummyStream();
+        $transport = new EsmtpTransport(stream: $stream);
+        $transport->setUsername('testuser');
+        $transport->setPassword('timedout');
+        $transport->setAuthenticators([new LoginAuthenticator()]);
+
+        $message = new Email();
+        $message->from('sender@example.org');
+        $message->addTo('recipient@example.org');
+        $message->text('.');
+
+        try {
+            $transport->send($message);
+            $this->fail('Symfony\Component\Mailer\Exception\TransportException to be thrown');
+        } catch (TransportException $e) {
+            $this->assertStringStartsWith('Connection to "localhost" timed out.', $e->getMessage());
+        }
+
+        $this->assertEquals(
+            [
+                "EHLO [127.0.0.1]\r\n",
+                // S: 250 localhost
+                // S: 250-AUTH PLAIN LOGIN CRAM-MD5 XOAUTH2
+                "AUTH LOGIN\r\n",
+                // S: 334 VXNlcm5hbWU6
+                "dGVzdHVzZXI=\r\n",
+                // S: 334 UGFzc3dvcmQ6
+                "dGltZWRvdXQ=\r\n",
+            ],
+            $stream->getCommands()
+        );
+    }
 }
 
 class CustomEsmtpTransport extends EsmtpTransport

Transport/Smtp/EsmtpTransport.php

@@ -15,6 +15,7 @@
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Mailer\Exception\TransportException;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
+use Symfony\Component\Mailer\Exception\UnexpectedResponseException;
 use Symfony\Component\Mailer\Transport\Smtp\Auth\AuthenticatorInterface;
 use Symfony\Component\Mailer\Transport\Smtp\Stream\AbstractStream;
 use Symfony\Component\Mailer\Transport\Smtp\Stream\SocketStream;
@@ -199,7 +200,7 @@ private function handleAuth(array $modes): void
                 $authenticator->authenticate($this);
 
                 return;
-            } catch (TransportExceptionInterface $e) {
+            } catch (UnexpectedResponseException $e) {
                 $code = $e->getCode();
 
                 try {

Transport/Smtp/SmtpTransport.php

@@ -17,6 +17,7 @@
 use Symfony\Component\Mailer\Exception\LogicException;
 use Symfony\Component\Mailer\Exception\TransportException;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
+use Symfony\Component\Mailer\Exception\UnexpectedResponseException;
 use Symfony\Component\Mailer\SentMessage;
 use Symfony\Component\Mailer\Transport\AbstractTransport;
 use Symfony\Component\Mailer\Transport\Smtp\Stream\AbstractStream;
@@ -330,7 +331,7 @@ private function assertResponseCode(string $response, array $codes): void
             $codeStr = $code ? sprintf('code "%s"', $code) : 'empty code';
             $responseStr = $response ? sprintf(', with message "%s"', trim($response)) : '';
 
-            throw new TransportException(sprintf('Expected response code "%s" but got ', implode('/', $codes)).$codeStr.$responseStr.'.', $code ?: 0);
+            throw new UnexpectedResponseException(sprintf('Expected response code "%s" but got ', implode('/', $codes)).$codeStr.$responseStr.'.', $code ?: 0);
         }
     }