[Mailer] Check email validity before opening an SMTP connection

Author: fabpot

SentMessage.php

@@ -29,6 +29,8 @@ class SentMessage
      */
     public function __construct(RawMessage $message, SmtpEnvelope $envelope)
     {
+        $message->ensureValidity();
+
         $this->raw = $message instanceof Message ? new RawMessage($message->toIterable()) : $message;
         $this->original = $message;
         $this->envelope = $envelope;

Transport/Smtp/SmtpTransport.php

@@ -104,18 +104,15 @@ public function getLocalDomain(): string
 
     public function send(RawMessage $message, SmtpEnvelope $envelope = null): ?SentMessage
     {
-        $this->ping();
-        if (!$this->started) {
-            $this->start();
-        }
-
         try {
             $message = parent::send($message, $envelope);
         } catch (TransportExceptionInterface $e) {
-            try {
-                $this->executeCommand("RSET\r\n", [250]);
-            } catch (TransportExceptionInterface $_) {
-                // ignore this exception as it probably means that the server error was final
+            if ($this->started) {
+                try {
+                    $this->executeCommand("RSET\r\n", [250]);
+                } catch (TransportExceptionInterface $_) {
+                    // ignore this exception as it probably means that the server error was final
+                }
             }
 
             throw $e;
@@ -163,6 +160,11 @@ public function executeCommand(string $command, array $codes): string
 
     protected function doSend(SentMessage $message): void
     {
+        $this->ping();
+        if (!$this->started) {
+            $this->start();
+        }
+
         try {
             $envelope = $message->getEnvelope();
             $this->doMailFromCommand($envelope->getSender()->getAddress());

Transport/Smtp/Stream/SocketStream.php

@@ -26,7 +26,7 @@ final class SocketStream extends AbstractStream
     private $url;
     private $host = 'localhost';
     private $port = 465;
-    private $timeout = 15;
+    private $timeout = 5;
     private $tls = true;
     private $sourceIp;
     private $streamContextOptions = [];