[Mailer] Use better error code when auth fails

fabpot · fabpot · commit 3b3623948515 · 2022-08-03T07:44:11.000+02:00
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php b/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php
@@ -180,12 +180,15 @@ private function handleAuth(array $modes): void
                 continue;
             }
 
+            $code = null;
             $authNames[] = $authenticator->getAuthKeyword();
             try {
                 $authenticator->authenticate($this);
 
                 return;
             } catch (TransportExceptionInterface $e) {
+                $code = $e->getCode();
+
                 try {
                     $this->executeCommand("RSET\r\n", [250]);
                 } catch (TransportExceptionInterface) {
@@ -198,14 +201,14 @@ private function handleAuth(array $modes): void
         }
 
         if (!$authNames) {
-            throw new TransportException(sprintf('Failed to find an authenticator supported by the SMTP server, which currently supports: "%s".', implode('", "', $modes)));
+            throw new TransportException(sprintf('Failed to find an authenticator supported by the SMTP server, which currently supports: "%s".', implode('", "', $modes)), $code ?: 504);
         }
 
         $message = sprintf('Failed to authenticate on SMTP server with username "%s" using the following authenticators: "%s".', $this->username, implode('", "', $authNames));
         foreach ($errors as $name => $error) {
             $message .= sprintf(' Authenticator "%s" returned "%s".', $name, $error);
         }
 
-        throw new TransportException($message);
+        throw new TransportException($message, $code ?: 535);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -180,12 +180,15 @@ private function handleAuth(array $modes): void`
`180`	`180`	`continue;`
`181`	`181`	`}`
`182`	`182`
	`183`	`+ $code = null;`
`183`	`184`	`$authNames[] = $authenticator->getAuthKeyword();`
`184`	`185`	`try {`
`185`	`186`	`$authenticator->authenticate($this);`
`186`	`187`
`187`	`188`	`return;`
`188`	`189`	`} catch (TransportExceptionInterface $e) {`
	`190`	`+ $code = $e->getCode();`
	`191`	`+`
`189`	`192`	`try {`
`190`	`193`	`$this->executeCommand("RSET\r\n", [250]);`
`191`	`194`	`} catch (TransportExceptionInterface) {`
`@@ -198,14 +201,14 @@ private function handleAuth(array $modes): void`
`198`	`201`	`}`
`199`	`202`
`200`	`203`	`if (!$authNames) {`
`201`		`- throw new TransportException(sprintf('Failed to find an authenticator supported by the SMTP server, which currently supports: "%s".', implode('", "', $modes)));`
	`204`	`+ throw new TransportException(sprintf('Failed to find an authenticator supported by the SMTP server, which currently supports: "%s".', implode('", "', $modes)), $code ?: 504);`
`202`	`205`	`}`
`203`	`206`
`204`	`207`	`$message = sprintf('Failed to authenticate on SMTP server with username "%s" using the following authenticators: "%s".', $this->username, implode('", "', $authNames));`
`205`	`208`	`foreach ($errors as $name => $error) {`
`206`	`209`	`$message .= sprintf(' Authenticator "%s" returned "%s".', $name, $error);`
`207`	`210`	`}`
`208`	`211`
`209`		`- throw new TransportException($message);`
	`212`	`+ throw new TransportException($message, $code ?: 535);`
`210`	`213`	`}`
`211`	`214`	`}`