Skip to content

Commit 6c61577

Browse files
committed
Simplify logic in websocket control
1 parent bb55942 commit 6c61577

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

app/Http/Controllers/Api/Client/Servers/WebsocketController.php

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
44

55
use Carbon\CarbonImmutable;
6-
use Illuminate\Http\Response;
76
use Pterodactyl\Models\Server;
87
use Illuminate\Http\JsonResponse;
98
use Pterodactyl\Models\Permission;
109
use Pterodactyl\Services\Nodes\NodeJWTService;
11-
use Symfony\Component\HttpKernel\Exception\HttpException;
10+
use Pterodactyl\Exceptions\Http\HttpForbiddenException;
1211
use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
1312
use Pterodactyl\Services\Servers\GetUserPermissionsService;
1413
use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
@@ -55,26 +54,22 @@ public function __invoke(ClientApiRequest $request, Server $server)
5554
{
5655
$user = $request->user();
5756
if ($user->cannot(Permission::ACTION_WEBSOCKET_CONNECT, $server)) {
58-
throw new HttpException(Response::HTTP_FORBIDDEN, 'You do not have permission to connect to this server\'s websocket.');
57+
throw new HttpForbiddenException('You do not have permission to connect to this server\'s websocket.');
5958
}
6059

6160
$permissions = $this->permissionsService->handle($server, $user);
6261

63-
$node = null;
62+
$node = $server->node;
6463
if (! is_null($server->transfer)) {
6564
// Check if the user has permissions to receive transfer logs.
6665
if (! in_array('admin.websocket.transfer', $permissions)) {
67-
throw new HttpException(Response::HTTP_FORBIDDEN, 'You do not have permission to view transfer logs');
66+
throw new HttpForbiddenException('You do not have permission to view server transfer logs.');
6867
}
6968

7069
// Redirect the websocket request to the new node if the server has been archived.
7170
if ($server->transfer->archived) {
7271
$node = $server->transfer->newNode;
73-
} else {
74-
$node = $server->node;
7572
}
76-
} else {
77-
$node = $server->node;
7873
}
7974

8075
$token = $this->jwtService

0 commit comments

Comments
 (0)