allow failure of starttls when using TryTls (#71)

genkgo · Sep 1, 2020 · e19a0ae · e19a0ae
1 parent bd2b4b2
commit e19a0ae
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 3 deletions.
diff --git a/src/Exception/SecureConnectionUpgradeException.php b/src/Exception/SecureConnectionUpgradeException.php
@@ -0,0 +1,8 @@
+<?php
+declare(strict_types=1);
+
+namespace Genkgo\Mail\Exception;
+
+final class SecureConnectionUpgradeException extends AbstractProtocolException
+{
+}
diff --git a/src/Protocol/ConnectionInterface.php b/src/Protocol/ConnectionInterface.php
@@ -3,6 +3,8 @@
 
 namespace Genkgo\Mail\Protocol;
 
+use Genkgo\Mail\Exception\SecureConnectionUpgradeException;
+
 interface ConnectionInterface
 {
     /**
@@ -34,6 +36,7 @@ public function receive(): string;
 
     /**
      * @param int $type
+     * @throws SecureConnectionUpgradeException
      */
     public function upgrade(int $type): void;
 

diff --git a/src/Protocol/Imap/Negotiation/TryTlsUpgradeNegotiation.php b/src/Protocol/Imap/Negotiation/TryTlsUpgradeNegotiation.php
@@ -4,6 +4,7 @@
 namespace Genkgo\Mail\Protocol\Imap\Negotiation;
 
 use Genkgo\Mail\Exception\ConnectionInsecureException;
+use Genkgo\Mail\Exception\SecureConnectionUpgradeException;
 use Genkgo\Mail\Protocol\ConnectionInterface;
 use Genkgo\Mail\Protocol\Imap\Client;
 use Genkgo\Mail\Protocol\Imap\NegotiationInterface;
@@ -59,7 +60,10 @@ public function negotiate(Client $client): void
                     ->assertCompletion(CompletionResult::ok())
                     ->assertTagged();
 
-                $this->connection->upgrade($this->crypto);
+                try {
+                    $this->connection->upgrade($this->crypto);
+                } catch (SecureConnectionUpgradeException $e) {
+                }
             }
         }
     }

diff --git a/src/Protocol/PlainTcpConnection.php b/src/Protocol/PlainTcpConnection.php
@@ -4,6 +4,7 @@
 namespace Genkgo\Mail\Protocol;
 
 use Genkgo\Mail\Exception\ConnectionRefusedException;
+use Genkgo\Mail\Exception\SecureConnectionUpgradeException;
 
 /**
  * @codeCoverageIgnore
@@ -49,9 +50,13 @@ public function __construct(string $host, int $port, float $connectionTimeout =
      */
     public function upgrade(int $type): void
     {
-        if ($this->resource === null || \stream_socket_enable_crypto($this->resource, true, $type) === false) {
+        if ($this->resource === null) {
             throw new \InvalidArgumentException('Cannot upgrade connection, resource not available');
         }
+
+        if (@\stream_socket_enable_crypto($this->resource, true, $type) === false) {
+            throw new SecureConnectionUpgradeException('Failed to upgrade connection to a secure one');
+        }
     }
 
     public function connect(): void

diff --git a/src/Protocol/Smtp/Negotiation/TryTlsUpgradeNegotiation.php b/src/Protocol/Smtp/Negotiation/TryTlsUpgradeNegotiation.php
@@ -5,6 +5,7 @@
 
 use Genkgo\Mail\Exception\AssertionFailedException;
 use Genkgo\Mail\Exception\ConnectionInsecureException;
+use Genkgo\Mail\Exception\SecureConnectionUpgradeException;
 use Genkgo\Mail\Protocol\ConnectionInterface;
 use Genkgo\Mail\Protocol\Smtp\Client;
 use Genkgo\Mail\Protocol\Smtp\NegotiationInterface;
@@ -71,6 +72,9 @@ public function negotiate(Client $client): void
             } catch (AssertionFailedException $e) {
                 // apparently HELO OR STARTTLS command is also not implemented
                 // but failure of STARTTLS is allowed
+            } catch (SecureConnectionUpgradeException $e) {
+                // apparently STARTTLS command is implemented
+                // but failed to start a secure connection
             }
         } else {
             $reply->assertCompleted();

diff --git a/test/Unit/Header/SubjectTest.php b/test/Unit/Header/SubjectTest.php
@@ -45,7 +45,6 @@ public function it_does_not_add_a_space_in_subject(): void
         );
     }
 
-
     /**
      * @test
      */