diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Mailer] Check email validity before opening an SMTP connection

This commit is contained in:
Fabien Potencier 2019-09-05 14:01:23 +02:00
parent b7371ea5c6
commit dc376f52a5
8 changed files with 61 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Transport/SendgridApiTransportTest.php
View File

@ -50,7 +50,8 @@ class SendgridApiTransportTest extends TestCase
$email = new Email();
$email->from('foo@example.com')
->to('bar@example.com')
->bcc('baz@example.com');
->bcc('baz@example.com')
->text('content');
$response = $this->createMock(ResponseInterface::class);
@ -74,14 +75,15 @@ class SendgridApiTransportTest extends TestCase
],
],
'from' => ['email' => 'foo@example.com'],
'content' => [],
'content' => [
['type' => 'text/plain', 'value' => 'content'],
],
],
'auth_bearer' => 'foo',
])
->willReturn($response);
$mailer = new SendgridApiTransport('foo', $httpClient);
$mailer->send($email);
}
}

2
src/Symfony/Component/Mailer/SentMessage.php
View File

@ -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;

20
src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php
View File

@ -104,18 +104,15 @@ class SmtpTransport extends AbstractTransport
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 @@ class SmtpTransport extends AbstractTransport
protected function doSend(SentMessage $message): void
{
$this->ping();
if (!$this->started) {
$this->start();
}
try {
$envelope = $message->getEnvelope();
$this->doMailFromCommand($envelope->getSender()->getAddress());

2
src/Symfony/Component/Mailer/Transport/Smtp/Stream/SocketStream.php
View File

@ -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 = [];

14
src/Symfony/Component/Mime/Email.php
View File

@ -399,6 +399,15 @@ class Email extends Message
return $this->generateBody();
}
public function ensureValidity()
{
if (null === $this->text && null === $this->html && !$this->attachments) {
throw new LogicException('A message must have a text or an HTML part or attachments.');
}
parent::ensureValidity();
}
/**
* Generates an AbstractPart based on the raw body of a message.
*
@ -421,10 +430,9 @@ class Email extends Message
*/
private function generateBody(): AbstractPart
{
$this->ensureValidity();
[$htmlPart, $attachmentParts, $inlineParts] = $this->prepareParts();
if (null === $this->text && null === $this->html && !$attachmentParts) {
throw new LogicException('A message must have a text or an HTML part or attachments.');
}
$part = null === $this->text ? null : new TextPart($this->text, $this->textCharset);
if (null !== $htmlPart) {

9
src/Symfony/Component/Mime/Message.php
View File

@ -123,6 +123,15 @@ class Message extends RawMessage
yield from $body->toIterable();
}
public function ensureValidity()
{
if (!$this->headers->has('From')) {
throw new LogicException('An email must have a "From" header.');
}
parent::ensureValidity();
}
private function generateMessageId(string $email): string
{
return bin2hex(random_bytes(16)).strstr($email, '@');

9
src/Symfony/Component/Mime/RawMessage.php
View File

@ -11,6 +11,8 @@
namespace Symfony\Component\Mime;
use Symfony\Component\Mime\Exception\LogicException;
/**
* @author Fabien Potencier <fabien@symfony.com>
*/
@ -51,6 +53,13 @@ class RawMessage implements \Serializable
$this->message = $message;
}
/**
* @throws LogicException if the message is not valid
*/
public function ensureValidity()
{
}
/**
* @internal
*/

27
src/Symfony/Component/Mime/Tests/EmailTest.php
View File

@ -251,62 +251,62 @@ class EmailTest extends TestCase
$att = new DataPart($file = fopen(__DIR__.'/Fixtures/mimetypes/test', 'r'));
$img = new DataPart($image = fopen(__DIR__.'/Fixtures/mimetypes/test.gif', 'r'), 'test.gif');
$e = new Email();
$e = (new Email())->from('me@example.com');
$e->text('text content');
$this->assertEquals($text, $e->getBody());
$this->assertEquals('text content', $e->getTextBody());
$e = new Email();
$e = (new Email())->from('me@example.com');
$e->html('html content');
$this->assertEquals($html, $e->getBody());
$this->assertEquals('html content', $e->getHtmlBody());
$e = new Email();
$e = (new Email())->from('me@example.com');
$e->html('html content');
$e->text('text content');
$this->assertEquals(new AlternativePart($text, $html), $e->getBody());
$e = new Email();
$e = (new Email())->from('me@example.com');
$e->html('html content', 'iso-8859-1');
$e->text('text content', 'iso-8859-1');
$this->assertEquals('iso-8859-1', $e->getTextCharset());
$this->assertEquals('iso-8859-1', $e->getHtmlCharset());
$this->assertEquals(new AlternativePart(new TextPart('text content', 'iso-8859-1'), new TextPart('html content', 'iso-8859-1', 'html')), $e->getBody());
$e = new Email();
$e = (new Email())->from('me@example.com');
$e->attach($file);
$e->text('text content');
$this->assertEquals(new MixedPart($text, $att), $e->getBody());
$e = new Email();
$e = (new Email())->from('me@example.com');
$e->attach($file);
$e->html('html content');
$this->assertEquals(new MixedPart($html, $att), $e->getBody());
$e = new Email();
$e = (new Email())->from('me@example.com');
$e->attach($file);
$this->assertEquals(new MixedPart($att), $e->getBody());
$e = new Email();
$e = (new Email())->from('me@example.com');
$e->html('html content');
$e->text('text content');
$e->attach($file);
$this->assertEquals(new MixedPart(new AlternativePart($text, $html), $att), $e->getBody());
$e = new Email();
$e = (new Email())->from('me@example.com');
$e->html('html content');
$e->text('text content');
$e->attach($file);
$e->attach($image, 'test.gif');
$this->assertEquals(new MixedPart(new AlternativePart($text, $html), $att, $img), $e->getBody());
$e = new Email();
$e = (new Email())->from('me@example.com');
$e->text('text content');
$e->attach($file);
$e->attach($image, 'test.gif');
$this->assertEquals(new MixedPart($text, $att, $img), $e->getBody());
$e = new Email();
$e = (new Email())->from('me@example.com');
$e->html($content = 'html content <img src="test.gif">');
$e->text('text content');
$e->attach($file);
@ -314,13 +314,12 @@ class EmailTest extends TestCase
$fullhtml = new TextPart($content, 'utf-8', 'html');
$this->assertEquals(new MixedPart(new AlternativePart($text, $fullhtml), $att, $img), $e->getBody());
$e = new Email();
$e = (new Email())->from('me@example.com');
$e->html($content = 'html content <img src="cid:test.gif">');
$e->text('text content');
$e->attach($file);
$e->attach($image, 'test.gif');
$fullhtml = new TextPart($content, 'utf-8', 'html');
$inlinedimg = (new DataPart($image, 'test.gif'))->asInline();
$body = $e->getBody();
$this->assertInstanceOf(MixedPart::class, $body);
$this->assertCount(2, $related = $body->getParts());
@ -336,7 +335,7 @@ class EmailTest extends TestCase
fwrite($r, $content);
rewind($r);
$e = new Email();
$e = (new Email())->from('me@example.com');
$e->html($r);
// embedding the same image twice results in one image only in the email
$e->embed($image, 'test.gif');