Skip to content
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.

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

[10.x] Fix decoding issue in MailLogTransport #49727

Merged
merged 2 commits into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
Handle multipart messages and only decode content
  • Loading branch information
rojtjo committed Jan 17, 2024
commit 6d57118b3d536b887145abce1ae3ac3158dd80d6
31 changes: 28 additions & 3 deletions src/Illuminate/Mail/Transport/LogTransport.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,42 @@ public function __construct(LoggerInterface $logger)
*/
public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage
{
$string = $message->toString();
$string = str($message->toString());

if (str_contains($string, 'Content-Transfer-Encoding: quoted-printable')) {
$string = quoted_printable_decode($string);
if ($string->contains('Content-Type: multipart/')) {
$boundary = $string
->after('boundary=')
->before("\r\n")
->prepend('--')
->append("\r\n");

$string = $string
->explode($boundary)
->map($this->decodeQuotedPrintableContent(...))
->implode($boundary);
} elseif ($string->contains('Content-Transfer-Encoding: quoted-printable')) {
$string = $this->decodeQuotedPrintableContent($string);
}

$this->logger->debug($string);

return new SentMessage($message, $envelope ?? Envelope::create($message));
}

protected function decodeQuotedPrintableContent(string $part): string
{
if (! str_contains($part, 'Content-Transfer-Encoding: quoted-printable')) {
return $part;
}

[$headers, $content] = explode("\r\n\r\n", $part, 2);

return implode("\r\n\r\n", [
$headers,
quoted_printable_decode($content),
]);
}

/**
* Get the logger for the LogTransport instance.
*
Expand Down
27 changes: 27 additions & 0 deletions tests/Mail/MailLogTransportTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Illuminate\Tests\Mail;

use Illuminate\Mail\Attachment;
use Illuminate\Mail\Message;
use Illuminate\Mail\Transport\LogTransport;
use Monolog\Handler\StreamHandler;
Expand Down Expand Up @@ -59,6 +60,32 @@ public function testItDecodesTheMessageBeforeLogging()
$this->assertStringContainsString('https://example.com/reset-password=5e113c71a4c210aff04b3fa66f1b1299', $actualLoggedValue);
}

public function testItOnlyDecodesQuotedPrintablePartsOfTheMessageBeforeLogging()
{
$message = (new Message(new Email))
->from('[email protected]', 'no-reply')
->to('[email protected]', 'Taylor')
->html(<<<'BODY'
Hi,

<a href="https://example.com/reset-password=5e113c71a4c210aff04b3fa66f1b1299">Click here to reset your password</a>.

All the best,

Burt & Irving
BODY)
->text('A text part')
->attach(Attachment::fromData(fn () => 'My attachment', 'attachment.txt'));

$actualLoggedValue = $this->getLoggedEmailMessage($message);

$this->assertStringContainsString('href=', $actualLoggedValue);
$this->assertStringContainsString('Burt & Irving', $actualLoggedValue);
$this->assertStringContainsString('https://example.com/reset-password=5e113c71a4c210aff04b3fa66f1b1299', $actualLoggedValue);
$this->assertStringContainsString('name=attachment.txt', $actualLoggedValue);
$this->assertStringContainsString('filename=attachment.txt', $actualLoggedValue);
}

public function testGetLogTransportWithPsrLogger()
{
$this->app['config']->set('mail.driver', 'log');
Expand Down