Merge pull request pterodactyl#2883 from pterodactyl/matthewpi/transfer-improvements

Add Transfer Logs

Author: DaneEveritt

app/Exceptions/Http/Server/ServerTransferringException.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Pterodactyl\Exceptions\Http\Server;
+
+use Illuminate\Http\Response;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+class ServerTransferringException extends HttpException
+{
+    /**
+     * ServerTransferringException constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct(Response::HTTP_CONFLICT, 'This server is currently being transferred to a new machine, please try again laster.');
+    }
+}

app/Http/Controllers/Admin/Servers/ServerTransferController.php

@@ -8,7 +8,6 @@
 use Pterodactyl\Models\ServerTransfer;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Services\Servers\TransferService;
-use Pterodactyl\Services\Servers\SuspensionService;
 use Pterodactyl\Repositories\Eloquent\NodeRepository;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
 use Pterodactyl\Repositories\Eloquent\LocationRepository;
@@ -42,11 +41,6 @@ class ServerTransferController extends Controller
      */
     private $nodeRepository;
 
-    /**
-     * @var \Pterodactyl\Services\Servers\SuspensionService
-     */
-    private $suspensionService;
-
     /**
      * @var \Pterodactyl\Services\Servers\TransferService
      */
@@ -65,7 +59,6 @@ class ServerTransferController extends Controller
      * @param \Pterodactyl\Repositories\Eloquent\ServerRepository $repository
      * @param \Pterodactyl\Repositories\Eloquent\LocationRepository $locationRepository
      * @param \Pterodactyl\Repositories\Eloquent\NodeRepository $nodeRepository
-     * @param \Pterodactyl\Services\Servers\SuspensionService $suspensionService
      * @param \Pterodactyl\Services\Servers\TransferService $transferService
      * @param \Pterodactyl\Repositories\Wings\DaemonConfigurationRepository $daemonConfigurationRepository
      */
@@ -75,7 +68,6 @@ public function __construct(
         ServerRepository $repository,
         LocationRepository $locationRepository,
         NodeRepository $nodeRepository,
-        SuspensionService $suspensionService,
         TransferService $transferService,
         DaemonConfigurationRepository $daemonConfigurationRepository
     ) {
@@ -84,7 +76,6 @@ public function __construct(
         $this->repository = $repository;
         $this->locationRepository = $locationRepository;
         $this->nodeRepository = $nodeRepository;
-        $this->suspensionService = $suspensionService;
         $this->transferService = $transferService;
         $this->daemonConfigurationRepository = $daemonConfigurationRepository;
     }
@@ -98,8 +89,7 @@ public function __construct(
      *
      * @throws \Throwable
      */
-    public function transfer(Request $request, Server $server)
-    {
+    public function transfer(Request $request, Server $server) {
         $validatedData = $request->validate([
             'node_id' => 'required|exists:nodes,id',
             'allocation_id' => 'required|bail|unique:servers|exists:allocations,id',
@@ -116,9 +106,6 @@ public function transfer(Request $request, Server $server)
             // Check if the selected daemon is online.
             $this->daemonConfigurationRepository->setNode($node)->getSystemInformation();
 
-            // Suspend the server and request an archive to be created.
-            $this->suspensionService->toggle($server, 'suspend');
-
             // Create a new ServerTransfer entry.
             $transfer = new ServerTransfer;
 
@@ -127,8 +114,8 @@ public function transfer(Request $request, Server $server)
             $transfer->new_node = $node_id;
             $transfer->old_allocation = $server->allocation_id;
             $transfer->new_allocation = $allocation_id;
-            $transfer->old_additional_allocations = json_encode($server->allocations->where('id', '!=', $server->allocation_id)->pluck('id'));
-            $transfer->new_additional_allocations = json_encode($additional_allocations);
+            $transfer->old_additional_allocations = $server->allocations->where('id', '!=', $server->allocation_id)->pluck('id');
+            $transfer->new_additional_allocations = $additional_allocations;
 
             $transfer->save();
 

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

@@ -3,12 +3,11 @@
 namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
 
 use Carbon\CarbonImmutable;
-use Illuminate\Http\Response;
 use Pterodactyl\Models\Server;
 use Illuminate\Http\JsonResponse;
 use Pterodactyl\Models\Permission;
 use Pterodactyl\Services\Nodes\NodeJWTService;
-use Symfony\Component\HttpKernel\Exception\HttpException;
+use Pterodactyl\Exceptions\Http\HttpForbiddenException;
 use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
 use Pterodactyl\Services\Servers\GetUserPermissionsService;
 use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
@@ -55,19 +54,34 @@ public function __invoke(ClientApiRequest $request, Server $server)
     {
         $user = $request->user();
         if ($user->cannot(Permission::ACTION_WEBSOCKET_CONNECT, $server)) {
-            throw new HttpException(Response::HTTP_FORBIDDEN, 'You do not have permission to connect to this server\'s websocket.');
+            throw new HttpForbiddenException('You do not have permission to connect to this server\'s websocket.');
+        }
+
+        $permissions = $this->permissionsService->handle($server, $user);
+
+        $node = $server->node;
+        if (! is_null($server->transfer)) {
+            // Check if the user has permissions to receive transfer logs.
+            if (! in_array('admin.websocket.transfer', $permissions)) {
+                throw new HttpForbiddenException('You do not have permission to view server transfer logs.');
+            }
+
+            // Redirect the websocket request to the new node if the server has been archived.
+            if ($server->transfer->archived) {
+                $node = $server->transfer->newNode;
+            }
         }
 
         $token = $this->jwtService
             ->setExpiresAt(CarbonImmutable::now()->addMinutes(10))
             ->setClaims([
                 'user_id' => $request->user()->id,
                 'server_uuid' => $server->uuid,
-                'permissions' => $this->permissionsService->handle($server, $user),
+                'permissions' => $permissions,
             ])
-            ->handle($server->node, $user->id . $server->uuid);
+            ->handle($node, $user->id . $server->uuid);
 
-        $socket = str_replace(['https://', 'http://'], ['wss://', 'ws://'], $server->node->getConnectionAddress());
+        $socket = str_replace(['https://', 'http://'], ['wss://', 'ws://'], $node->getConnectionAddress());
 
         return new JsonResponse([
             'data' => [