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

Skip to content

[Mailer] [Smtp] Add DSN param peer_fingerprint for fingerprint verification #51450

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 30, 2023
Merged

[Mailer] [Smtp] Add DSN param peer_fingerprint for fingerprint verification #51450

Show file tree
Hide file tree
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
[Mailer][Smtp] Add DSN param peer_fingerprint for fingerprint verif… 
…ication
  • Loading branch information
@xdavidwu
xdavidwu committed Aug 24, 2023
commit a9d8431af36f87027576c1ded234b723d14f5ade
5 changes: 5 additions & 0 deletions src/Symfony/Component/Mailer/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
CHANGELOG
=========

6.4
---

* Add DSN parameter `peer_fingerprint` to verify TLS certificate fingerprint

6.3
---

Expand Down
17 changes: 17 additions & 0 deletions src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,23 @@ public static function createProvider(): iterable
$transport,
];

$transport = new EsmtpTransport('example.com', 465, true, null, $logger);
/** @var SocketStream $stream */
$stream = $transport->getStream();
$streamOptions = $stream->getStreamOptions();
$streamOptions['ssl']['peer_fingerprint'] = '6A1CF3B08D175A284C30BC10DE19162307C7286E';
$stream->setStreamOptions($streamOptions);

yield [
new Dsn('smtps', 'example.com', '', '', 465, ['peer_fingerprint' => '6A1CF3B08D175A284C30BC10DE19162307C7286E']),
$transport,
];

yield [
Dsn::fromString('smtps://:@example.com?peer_fingerprint=6A1CF3B08D175A284C30BC10DE19162307C7286E'),
$transport,
];

$transport = new EsmtpTransport('example.com', 465, true, null, $logger);
$transport->setLocalDomain('example.com');

Expand Down
14 changes: 9 additions & 5 deletions src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransportFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,21 @@ public function create(Dsn $dsn): TransportInterface

$transport = new EsmtpTransport($host, $port, $tls, $this->dispatcher, $this->logger);

if ('' !== $dsn->getOption('verify_peer') && !filter_var($dsn->getOption('verify_peer', true), \FILTER_VALIDATE_BOOL)) {
/** @var SocketStream $stream */
$stream = $transport->getStream();
$streamOptions = $stream->getStreamOptions();
/** @var SocketStream $stream */
$stream = $transport->getStream();
$streamOptions = $stream->getStreamOptions();

if ('' !== $dsn->getOption('verify_peer') && !filter_var($dsn->getOption('verify_peer', true), \FILTER_VALIDATE_BOOL)) {
$streamOptions['ssl']['verify_peer'] = false;
$streamOptions['ssl']['verify_peer_name'] = false;
}

$stream->setStreamOptions($streamOptions);
if (null !== $peerFingerprint = $dsn->getOption('peer_fingerprint')) {
$streamOptions['ssl']['peer_fingerprint'] = $peerFingerprint;
}

$stream->setStreamOptions($streamOptions);

if ($user = $dsn->getUser()) {
$transport->setUsername($user);
}
Expand Down