bug #37961 [Mailer] Fixed 'verify_peer' option in mailer DSN being ignored (SnakePin)

fabpot · fabpot · commit 0d990449b34c · 2020-08-31T21:53:05.000+02:00
This PR was squashed before being merged into the 5.1 branch. Discussion ---------- [Mailer] Fixed 'verify_peer' option in mailer DSN being ignored | Q | A | ------------- | --- | Branch? | 5.1  | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | N/A  | License | MIT | Doc PR | N/A  The mailer DSN option 'verify_peer' was being ignored because `$dsn->getOption('verify_peer', true)` was returning a string and thus NOT operator on it was always resulting in false. I propose changing the line where it is used with a `filter_var` call with the `FILTER_VALIDATE_BOOLEAN` as the filter parameter to overcome this issue. Commits ------- 1c789e8 [Mailer] Fixed 'verify_peer' option in mailer DSN being ignored
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportFactoryTest.php b/src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportFactoryTest.php
@@ -81,5 +81,22 @@ public function createProvider(): iterable
             new Dsn('smtps', 'example.com', '', '', 465, ['verify_peer' => false]),
             $transport,
         ];
+
+        yield [
+            new Dsn('smtps', 'example.com', '', '', 465, ['verify_peer' => 'false']),
+            $transport,
+        ];
+
+        yield [
+            Dsn::fromString('smtps://:@example.com?verify_peer=0'),
+            $transport,
+        ];
+
+        $transport = new EsmtpTransport('example.com', 465, true, $eventDispatcher, $logger);
+
+        yield [
+            Dsn::fromString('smtps://:@example.com?verify_peer='),
+            $transport,
+        ];
     }
 }
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransportFactory.php b/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransportFactory.php
@@ -29,7 +29,7 @@ public function create(Dsn $dsn): TransportInterface
 
         $transport = new EsmtpTransport($host, $port, $tls, $this->dispatcher, $this->logger);
 
-        if (!$dsn->getOption('verify_peer', true)) {
+        if ('' !== $dsn->getOption('verify_peer') && !filter_var($dsn->getOption('verify_peer', true), FILTER_VALIDATE_BOOLEAN)) {
             /** @var SocketStream $stream */
             $stream = $transport->getStream();
             $streamOptions = $stream->getStreamOptions();
