Ensure errors from daemon are wrapped correctly

Author: DaneEveritt

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

@@ -5,7 +5,6 @@
 use Illuminate\Http\Response;
 use Pterodactyl\Models\Server;
 use Psr\Http\Message\ResponseInterface;
-use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Exception\BadResponseException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Pterodactyl\Repositories\Wings\DaemonCommandRepository;
@@ -45,19 +44,21 @@ public function index(SendCommandRequest $request, Server $server): Response
     {
         try {
             $this->repository->setServer($server)->send($request->input('command'));
-        } catch (RequestException $exception) {
-            if ($exception instanceof BadResponseException) {
+        } catch (DaemonConnectionException $exception) {
+            $previous = $exception->getPrevious();
+
+            if ($previous instanceof BadResponseException) {
                 if (
-                    $exception->getResponse() instanceof ResponseInterface
-                    && $exception->getResponse()->getStatusCode() === Response::HTTP_BAD_GATEWAY
+                    $previous->getResponse() instanceof ResponseInterface
+                    && $previous->getResponse()->getStatusCode() === Response::HTTP_BAD_GATEWAY
                 ) {
                     throw new HttpException(
                         Response::HTTP_BAD_GATEWAY, 'Server must be online in order to send commands.', $exception
                     );
                 }
             }
 
-            throw new DaemonConnectionException($exception);
+            throw $exception;
         }
 
         return $this->returnNoContent();

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

@@ -19,6 +19,7 @@
 use Pterodactyl\Http\Requests\Api\Client\Servers\Files\RenameFileRequest;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Files\CreateFolderRequest;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Files\CompressFilesRequest;
+use Pterodactyl\Http\Requests\Api\Client\Servers\Files\DecompressFilesRequest;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Files\GetFileContentsRequest;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Files\WriteFileContentRequest;
 
@@ -88,7 +89,9 @@ public function directory(ListFilesRequest $request, Server $server): array
      * @param \Pterodactyl\Http\Requests\Api\Client\Servers\Files\GetFileContentsRequest $request
      * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\Response
+     *
      * @throws \Pterodactyl\Exceptions\Http\Server\FileSizeTooLargeException
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      */
     public function contents(GetFileContentsRequest $request, Server $server): Response
     {
@@ -139,6 +142,8 @@ public function download(GetFileContentsRequest $request, Server $server)
      * @param \Pterodactyl\Http\Requests\Api\Client\Servers\Files\WriteFileContentRequest $request
      * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      */
     public function write(WriteFileContentRequest $request, Server $server): JsonResponse
     {
@@ -156,6 +161,8 @@ public function write(WriteFileContentRequest $request, Server $server): JsonRes
      * @param \Pterodactyl\Http\Requests\Api\Client\Servers\Files\CreateFolderRequest $request
      * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      */
     public function create(CreateFolderRequest $request, Server $server): JsonResponse
     {
@@ -172,6 +179,8 @@ public function create(CreateFolderRequest $request, Server $server): JsonRespon
      * @param \Pterodactyl\Http\Requests\Api\Client\Servers\Files\RenameFileRequest $request
      * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      */
     public function rename(RenameFileRequest $request, Server $server): JsonResponse
     {
@@ -188,6 +197,8 @@ public function rename(RenameFileRequest $request, Server $server): JsonResponse
      * @param \Pterodactyl\Http\Requests\Api\Client\Servers\Files\CopyFileRequest $request
      * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      */
     public function copy(CopyFileRequest $request, Server $server): JsonResponse
     {
@@ -202,9 +213,14 @@ public function copy(CopyFileRequest $request, Server $server): JsonResponse
      * @param \Pterodactyl\Http\Requests\Api\Client\Servers\Files\CompressFilesRequest $request
      * @param \Pterodactyl\Models\Server $server
      * @return array
+     *
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      */
     public function compress(CompressFilesRequest $request, Server $server): array
     {
+        // Allow up to five minutes for this request to process before timing out.
+        set_time_limit(300);
+
         $file = $this->fileRepository->setServer($server)
             ->compressFiles(
                 $request->input('root'), $request->input('files')
@@ -221,6 +237,8 @@ public function compress(CompressFilesRequest $request, Server $server): array
      * @param \Pterodactyl\Http\Requests\Api\Client\Servers\Files\DeleteFileRequest $request
      * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      */
     public function delete(DeleteFileRequest $request, Server $server): JsonResponse
     {

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

@@ -33,6 +33,8 @@ public function __construct(DaemonPowerRepository $repository)
      * @param \Pterodactyl\Http\Requests\Api\Client\Servers\SendPowerRequest $request
      * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\Response
+     *
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      */
     public function index(SendPowerRequest $request, Server $server): Response
     {

app/Repositories/Wings/DaemonCommandRepository.php

@@ -5,6 +5,8 @@
 use Webmozart\Assert\Assert;
 use Pterodactyl\Models\Server;
 use Psr\Http\Message\ResponseInterface;
+use GuzzleHttp\Exception\TransferException;
+use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
 
 class DaemonCommandRepository extends DaemonRepository
 {
@@ -13,16 +15,22 @@ class DaemonCommandRepository extends DaemonRepository
      *
      * @param string|string[] $command
      * @return \Psr\Http\Message\ResponseInterface
+     *
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      */
     public function send($command): ResponseInterface
     {
         Assert::isInstanceOf($this->server, Server::class);
 
-        return $this->getHttpClient()->post(
-            sprintf('/api/servers/%s/commands', $this->server->uuid),
-            [
-                'json' => ['commands' => is_array($command) ? $command : [$command]],
-            ]
-        );
+        try {
+            return $this->getHttpClient()->post(
+                sprintf('/api/servers/%s/commands', $this->server->uuid),
+                [
+                    'json' => ['commands' => is_array($command) ? $command : [$command]],
+                ]
+            );
+        } catch (TransferException $exception) {
+            throw new DaemonConnectionException($exception);
+        }
     }
 }