Skip to content

Avoid unneeded shutdown timer on already closed connection #125

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
clue merged 1 commit into from
Apr 14, 2026
Merged

Avoid unneeded shutdown timer on already closed connection #125

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: 4 additions & 2 deletions src/Server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,10 @@ public function onConnection(ConnectionInterface $connection)
{
$that = $this;
$handling = $this->handleSocks($connection)->then(null, function () use ($connection, $that) {
// SOCKS failed => close connection
$that->endConnection($connection);
// SOCKS failed => close connection (unless already closed)
if ($connection->isWritable()) {
$that->endConnection($connection);
}
});

$connection->on('close', function () use ($handling) {
Expand Down
34 changes: 29 additions & 5 deletions tests/ServerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,10 @@ public function testConnectWillReturnMappedSocks5ErrorCodeFromConnector($error,

public function testHandleSocksConnectionWillEndOnInvalidData()
{
$connection = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('pause', 'end'))->getMock();
$connection = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('pause', 'end', 'isWritable'))->getMock();
$connection->expects($this->once())->method('pause');
$connection->expects($this->once())->method('end');
$connection->expects($this->once())->method('isWritable')->willReturn(true);

$this->server->onConnection($connection);

Expand Down Expand Up @@ -290,7 +291,8 @@ public function testHandleSocks4aConnectionWithSecureTlsSourceAddressWillEstabli

public function testHandleSocks4aConnectionWithInvalidHostnameWillNotEstablishOutgoingConnection()
{
$connection = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('pause', 'end'))->getMock();
$connection = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('pause', 'end', 'isWritable'))->getMock();
$connection->expects($this->once())->method('isWritable')->willReturn(true);

$this->connector->expects($this->never())->method('connect');

Expand Down Expand Up @@ -368,7 +370,8 @@ public function testHandleSocks5ConnectionWithHostnameWillEstablishOutgoingConne

public function testHandleSocks5ConnectionWithConnectorRefusedWillReturnReturnRefusedError()
{
$connection = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('pause', 'end', 'write'))->getMock();
$connection = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('pause', 'end', 'write', 'isWritable'))->getMock();
$connection->expects($this->once())->method('isWritable')->willReturn(true);

$promise = \React\Promise\reject(new \RuntimeException('Connection refused'));

Expand All @@ -383,7 +386,8 @@ public function testHandleSocks5ConnectionWithConnectorRefusedWillReturnReturnRe

public function testHandleSocks5UdpCommandWillNotEstablishOutgoingConnectionAndReturnCommandError()
{
$connection = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('pause', 'end', 'write'))->getMock();
$connection = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('pause', 'end', 'write', 'isWritable'))->getMock();
$connection->expects($this->once())->method('isWritable')->willReturn(true);

$this->connector->expects($this->never())->method('connect');

Expand All @@ -396,7 +400,8 @@ public function testHandleSocks5UdpCommandWillNotEstablishOutgoingConnectionAndR

public function testHandleSocks5ConnectionWithInvalidHostnameWillNotEstablishOutgoingConnectionAndReturnGeneralError()
{
$connection = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('pause', 'end', 'write'))->getMock();
$connection = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('pause', 'end', 'write', 'isWritable'))->getMock();
$connection->expects($this->once())->method('isWritable')->willReturn(true);

$this->connector->expects($this->never())->method('connect');

Expand All @@ -420,4 +425,23 @@ public function testHandleSocksConnectionWillCancelOutputConnectionIfIncomingClo
$connection->emit('data', array("\x04\x01" . "\x00\x50" . pack('N', ip2long('127.0.0.1')) . "\x00"));
$connection->emit('close');
}
Comment thread
clue marked this conversation as resolved.

public function testHandleSocksConnectionWillNotCallEndConnectionIfAlreadyClosed()
{
$connection = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('pause', 'end', 'isWritable'))->getMock();
$connection->expects($this->never())->method('pause');
$connection->expects($this->once())->method('end');
$connection->expects($this->once())->method('isWritable')->willReturn(false);

$promise = new Promise(function () { }, function () {
throw new \RuntimeException();
});

$this->connector->expects($this->once())->method('connect')->with('127.0.0.1:80')->willReturn($promise);

$this->server->onConnection($connection);

$connection->emit('data', array("\x04\x01" . "\x00\x50" . pack('N', ip2long('127.0.0.1')) . "\x00"));
$connection->emit('close');
}
}