Use tls:// scheme for URIs in error messages for secure connections

Author: clue

src/SecureConnector.php

@@ -37,12 +37,12 @@ public function connect($uri)
             return Promise\reject(new \InvalidArgumentException('Given URI "' . $uri . '" is invalid'));
         }
 
-        $uri = \str_replace('tls://', '', $uri);
         $context = $this->context;
-
         $encryption = $this->streamEncryption;
         $connected = false;
-        $promise = $this->connector->connect($uri)->then(function (ConnectionInterface $connection) use ($context, $encryption, $uri, &$promise, &$connected) {
+        $promise = $this->connector->connect(
+            \str_replace('tls://', '', $uri)
+        )->then(function (ConnectionInterface $connection) use ($context, $encryption, $uri, &$promise, &$connected) {
             // (unencrypted) TCP/IP connection succeeded
             $connected = true;
 
@@ -66,6 +66,17 @@ public function connect($uri)
                     $error->getCode()
                 );
             });
+        }, function (\Exception $e) use ($uri) {
+            if ($e instanceof \RuntimeException) {
+                $message = \preg_replace('/^Connection to [^ ]+/', '', $e->getMessage());
+                $e = new \RuntimeException(
+                    'Connection to ' . $uri . $message,
+                    $e->getCode(),
+                    $e
+                );
+            }
+
+            throw $e;
         });
 
         return new \React\Promise\Promise(

tests/FunctionalConnectorTest.php

@@ -144,10 +144,10 @@ public function testCancelPendingTlsConnectionDuringTlsHandshakeShouldCloseTcpCo
         $loop = Factory::create();
 
         $server = new TcpServer(0, $loop);
-        $uri = str_replace('tcp://', '', $server->getAddress());
+        $uri = str_replace('tcp://', 'tls://', $server->getAddress());
 
         $connector = new Connector(array(), $loop);
-        $promise = $connector->connect('tls://' . $uri);
+        $promise = $connector->connect($uri);
 
         $deferred = new Deferred();
         $server->on('connection', function (ConnectionInterface $connection) use ($promise, $deferred, $loop) {

tests/SecureConnectorTest.php

@@ -68,6 +68,28 @@ public function testConnectionToInvalidSchemeWillReject()
         $promise->then(null, $this->expectCallableOnce());
     }
 
+    public function testConnectWillRejectWithTlsUriWhenUnderlyingConnectorRejects()
+    {
+        $this->tcp->expects($this->once())->method('connect')->with('example.com:80')->willReturn(\React\Promise\reject(new \RuntimeException('Connection to tcp://example.com:80 failed: Connection refused', 42)));
+
+        $promise = $this->connector->connect('example.com:80');
+        $promise->cancel();
+
+        $this->setExpectedException('RuntimeException', 'Connection to tls://example.com:80 failed: Connection refused', 42);
+        $this->throwRejection($promise);
+    }
+
+    public function testConnectWillRejectWithOriginalMessageWhenUnderlyingConnectorRejectsWithInvalidArgumentException()
+    {
+        $this->tcp->expects($this->once())->method('connect')->with('example.com:80')->willReturn(\React\Promise\reject(new \InvalidArgumentException('Invalid', 42)));
+
+        $promise = $this->connector->connect('example.com:80');
+        $promise->cancel();
+
+        $this->setExpectedException('InvalidArgumentException', 'Invalid', 42);
+        $this->throwRejection($promise);
+    }
+
     public function testCancelDuringTcpConnectionCancelsTcpConnection()
     {
         $pending = new Promise\Promise(function () { }, $this->expectCallableOnce());
@@ -79,13 +101,13 @@ public function testCancelDuringTcpConnectionCancelsTcpConnection()
 
     public function testCancelDuringTcpConnectionCancelsTcpConnectionAndRejectsWithTcpRejection()
     {
-        $pending = new Promise\Promise(function () { }, function () { throw new \RuntimeException('Connection cancelled'); });
+        $pending = new Promise\Promise(function () { }, function () { throw new \RuntimeException('Connection to tcp://example.com:80 cancelled', 42); });
         $this->tcp->expects($this->once())->method('connect')->with($this->equalTo('example.com:80'))->will($this->returnValue($pending));
 
         $promise = $this->connector->connect('example.com:80');
         $promise->cancel();
 
-        $this->setExpectedException('RuntimeException', 'Connection cancelled');
+        $this->setExpectedException('RuntimeException', 'Connection to tls://example.com:80 cancelled', 42);
         $this->throwRejection($promise);
     }
 
@@ -139,7 +161,7 @@ public function testConnectionWillBeRejectedIfStreamEncryptionFailsAndClosesConn
         try {
             $this->throwRejection($promise);
         } catch (\RuntimeException $e) {
-            $this->assertEquals('Connection to example.com:80 failed during TLS handshake: TLS error', $e->getMessage());
+            $this->assertEquals('Connection to tls://example.com:80 failed during TLS handshake: TLS error', $e->getMessage());
             $this->assertEquals(123, $e->getCode());
             $this->assertNull($e->getPrevious());
         }
@@ -165,7 +187,7 @@ public function testCancelDuringStreamEncryptionCancelsEncryptionAndClosesConnec
         $promise = $this->connector->connect('example.com:80');
         $promise->cancel();
 
-        $this->setExpectedException('RuntimeException', 'Connection to example.com:80 cancelled during TLS handshake');
+        $this->setExpectedException('RuntimeException', 'Connection to tls://example.com:80 cancelled during TLS handshake');
         $this->throwRejection($promise);
     }