Skip to content

Properly return null for unknown addresses #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 25, 2017
Merged

Properly return null for unknown addresses #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, ':')), '[]');
}
}
119 changes: 119 additions & 0 deletions tests/FunctionalServerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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();
Expand All @@ -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);
}
}
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy