Merge pull request #63 from clue-labs/ip-or-null

clue · web-flow · commit 761ffae4ee2f · 2017-01-25T15:47:52.000+01:00
Properly return null for unknown addresses
diff --git a/src/Connection.php b/src/Connection.php
@@ -26,11 +26,15 @@ public function handleClose()
 
     public function getRemoteAddress()
     {
-        return $this->parseAddress(stream_socket_get_name($this->stream, true));
+        return $this->parseAddress(@stream_socket_get_name($this->stream, true));
     }
 
     private function parseAddress($address)
     {
+        if ($address === false) {
+            return null;
+        }
+
         return trim(substr($address, 0, strrpos($address, ':')), '[]');
     }
 }
diff --git a/tests/FunctionalServerTest.php b/tests/FunctionalServerTest.php
@@ -6,6 +6,8 @@
 use React\SocketClient\TcpConnector;
 use React\Socket\Server;
 use Clue\React\Block;
+use React\Socket\ConnectionException;
+use React\Socket\ConnectionInterface;
 
 class FunctionalServerTest extends TestCase
 {
@@ -26,6 +28,76 @@ public function testEmitsConnectionForNewConnection()
         Block\sleep(0.1, $loop);
     }
 
+    public function testEmitsConnectionWithRemoteIp()
+    {
+        $loop = Factory::create();
+
+        $server = new Server($loop);
+        $peer = null;
+        $server->on('connection', function (ConnectionInterface $conn) use (&$peer) {
+            $peer = $conn->getRemoteAddress();
+        });
+        $server->listen(0);
+        $port = $server->getPort();
+
+        $connector = new TcpConnector($loop);
+        $promise = $connector->create('127.0.0.1', $port);
+
+        $promise->then($this->expectCallableOnce());
+
+        Block\sleep(0.1, $loop);
+
+        $this->assertEquals('127.0.0.1', $peer);
+    }
+
+    public function testEmitsConnectionWithRemoteIpAfterConnectionIsClosedByPeer()
+    {
+        $loop = Factory::create();
+
+        $server = new Server($loop);
+        $peer = null;
+        $server->on('connection', function (ConnectionInterface $conn) use (&$peer) {
+            $conn->on('close', function () use ($conn, &$peer) {
+                $peer = $conn->getRemoteAddress();
+            });
+        });
+        $server->listen(0);
+        $port = $server->getPort();
+
+        $connector = new TcpConnector($loop);
+        $promise = $connector->create('127.0.0.1', $port);
+
+        $client = Block\await($promise, $loop, 0.1);
+        $client->end();
+
+        Block\sleep(0.1, $loop);
+
+        $this->assertEquals('127.0.0.1', $peer);
+    }
+
+    public function testEmitsConnectionWithRemoteNullAddressAfterConnectionIsClosedLocally()
+    {
+        $loop = Factory::create();
+
+        $server = new Server($loop);
+        $peer = null;
+        $server->on('connection', function (ConnectionInterface $conn) use (&$peer) {
+            $conn->close();
+            $peer = $conn->getRemoteAddress();
+        });
+        $server->listen(0);
+        $port = $server->getPort();
+
+        $connector = new TcpConnector($loop);
+        $promise = $connector->create('127.0.0.1', $port);
+
+        $promise->then($this->expectCallableOnce());
+
+        Block\sleep(0.1, $loop);
+
+        $this->assertNull($peer);
+    }
+
     public function testEmitsConnectionEvenIfConnectionIsCancelled()
     {
         $loop = Factory::create();
@@ -43,4 +115,51 @@ public function testEmitsConnectionEvenIfConnectionIsCancelled()
 
         Block\sleep(0.1, $loop);
     }
+
+    public function testEmitsConnectionForNewIpv6Connection()
+    {
+        $loop = Factory::create();
+
+        $server = new Server($loop);
+        $server->on('connection', $this->expectCallableOnce());
+        try {
+            $server->listen(0, '::1');
+        } catch (ConnectionException $e) {
+            $this->markTestSkipped('Unable to start IPv6 server socket (not available on your platform?)');
+        }
+        $port = $server->getPort();
+
+        $connector = new TcpConnector($loop);
+        $promise = $connector->create('::1', $port);
+
+        $promise->then($this->expectCallableOnce());
+
+        Block\sleep(0.1, $loop);
+    }
+
+    public function testEmitsConnectionWithRemoteIpv6()
+    {
+        $loop = Factory::create();
+
+        $server = new Server($loop);
+        $peer = null;
+        $server->on('connection', function (ConnectionInterface $conn) use (&$peer) {
+            $peer = $conn->getRemoteAddress();
+        });
+        try {
+            $server->listen(0, '::1');
+        } catch (ConnectionException $e) {
+            $this->markTestSkipped('Unable to start IPv6 server socket (not available on your platform?)');
+        }
+        $port = $server->getPort();
+
+        $connector = new TcpConnector($loop);
+        $promise = $connector->create('::1', $port);
+
+        $promise->then($this->expectCallableOnce());
+
+        Block\sleep(0.1, $loop);
+
+        $this->assertEquals('::1', $peer);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,15 @@ public function handleClose()`
`26`	`26`
`27`	`27`	`public function getRemoteAddress()`
`28`	`28`	`{`
`29`		`- return $this->parseAddress(stream_socket_get_name($this->stream, true));`
	`29`	`+ return $this->parseAddress(@stream_socket_get_name($this->stream, true));`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`private function parseAddress($address)`
`33`	`33`	`{`
	`34`	`+ if ($address === false) {`
	`35`	`+ return null;`
	`36`	`+ }`
	`37`	`+`
`34`	`38`	`return trim(substr($address, 0, strrpos($address, ':')), '[]');`
`35`	`39`	`}`
`36`	`40`	`}`