Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[Mailer] Use better error code when auth fails #47170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 3, 2022
Merged

[Mailer] Use better error code when auth fails #47170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
}
}