bitinflow/expose
1
0
Fork 0
mirror of https://github.com/bitinflow/expose.git synced 2026-03-14 22:15:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move port range to config. Throw exception if no free port is available within the range

Browse Source
This commit is contained in:
Marcel Pociot
2020-09-08 08:27:55 +02:00
parent cfc0ad92a5
commit f9339c0049
4 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Server/Connections/ConnectionManager.php
View File

@@ -5,6 +5,7 @@ namespace App\Server\Connections;
use App\Contracts\ConnectionManager as ConnectionManagerContract;
use App\Contracts\SubdomainGenerator;
use App\Http\QueryParameters;
use App\Server\Exceptions\NoFreePortAvailable;
use Ratchet\ConnectionInterface;
use React\EventLoop\LoopInterface;
use React\Socket\Server;
@@ -82,8 +83,10 @@ class ConnectionManager implements ConnectionManagerContract
protected function getSharedTcpServer(): Server
{
$portRange = [50000, 62000];
$port = $portRange[0];
$portRange = config('expose.admin.tcp_port_range');
$port = $portRange['from'] ?? 50000;
$maxPort = $portRange['to'] ?? 60000;
do {
try {
@@ -92,6 +95,10 @@ class ConnectionManager implements ConnectionManagerContract
} catch (\RuntimeException $exception) {
$portFound = false;
$port++;
if ($port > $maxPort) {
throw new NoFreePortAvailable();
}
}
} while (! $portFound);

8
app/Server/Exceptions/NoFreePortAvailable.php Normal file
View File

@@ -0,0 +1,8 @@
<?php
namespace App\Server\Exceptions;
class NoFreePortAvailable extends \Exception
{
}

14
app/Server/Http/Controllers/ControlMessageController.php
View File

@@ -5,6 +5,7 @@ namespace App\Server\Http\Controllers;
use App\Contracts\ConnectionManager;
use App\Contracts\UserRepository;
use App\Http\QueryParameters;
use App\Server\Exceptions\NoFreePortAvailable;
use Ratchet\ConnectionInterface;
use Ratchet\WebSocket\MessageComponentInterface;
use React\Promise\Deferred;
@@ -119,7 +120,18 @@ class ControlMessageController implements MessageComponentInterface
protected function handleTcpConnection(ConnectionInterface $connection, $data, $user = null)
{
$connectionInfo = $this->connectionManager->storeTcpConnection($data->port, $connection);
try {
$connectionInfo = $this->connectionManager->storeTcpConnection($data->port, $connection);
} catch (NoFreePortAvailable $exception) {
$connection->send(json_encode([
'event' => 'authenticationFailed',
'data' => [
'message' => config('expose.admin.messages.no_free_tcp_port_available'),
],
]));
$connection->close();
return;
}
$connection->send(json_encode([
'event' => 'authenticated',