Improve TLS server error messages when incoming connection fails

reactphp · Sep 27, 2018 · 4e2d23f · 4e2d23f
1 parent 003aa6c
commit 4e2d23f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/SecureServer.php b/src/SecureServer.php
@@ -184,6 +184,12 @@ function ($conn) use ($that) {
                 $that->emit('connection', array($conn));
             },
             function ($error) use ($that, $connection) {
+                $error = new \RuntimeException(
+                    'Connection from ' . $connection->getRemoteAddress() . ' failed during TLS handshake: ' . $error->getMessage(),
+                    $error->getCode(),
+                    $error
+                );
+
                 $that->emit('error', array($error));
                 $connection->end();
             }

diff --git a/tests/FunctionalSecureServerTest.php b/tests/FunctionalSecureServerTest.php
@@ -420,8 +420,10 @@ public function testEmitsErrorIfConnectionIsClosedBeforeHandshake()
 
         $error = Block\await($errorEvent, $loop, self::TIMEOUT);
 
+        // Connection from tcp://127.0.0.1:39528 failed during TLS handshake: Connection lost during TLS handshak
         $this->assertTrue($error instanceof \RuntimeException);
-        $this->assertEquals('Connection lost during TLS handshake', $error->getMessage());
+        $this->assertStringStartsWith('Connection from tcp://', $error->getMessage());
+        $this->assertStringEndsWith('failed during TLS handshake: Connection lost during TLS handshake', $error->getMessage());
         $this->assertEquals(defined('SOCKET_ECONNRESET') ? SOCKET_ECONNRESET : 0, $error->getCode());
     }
 
@@ -445,8 +447,10 @@ public function testEmitsErrorIfConnectionIsClosedWithIncompleteHandshake()
 
         $error = Block\await($errorEvent, $loop, self::TIMEOUT);
 
+        // Connection from tcp://127.0.0.1:39528 failed during TLS handshake: Connection lost during TLS handshak
         $this->assertTrue($error instanceof \RuntimeException);
-        $this->assertEquals('Connection lost during TLS handshake', $error->getMessage());
+        $this->assertStringStartsWith('Connection from tcp://', $error->getMessage());
+        $this->assertStringEndsWith('failed during TLS handshake: Connection lost during TLS handshake', $error->getMessage());
         $this->assertEquals(defined('SOCKET_ECONNRESET') ? SOCKET_ECONNRESET : 0, $error->getCode());
     }