Merge branch 'develop' into matthewpi/transfer-improvements

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

@@ -13,6 +13,7 @@ use Pterodactyl\Repositories\Wings\DaemonFileRepository;
 use Pterodactyl\Transformers\Daemon\FileObjectTransformer;
 use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Files\CopyFileRequest;
+use Pterodactyl\Http\Requests\Api\Client\Servers\Files\PullFileRequest;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Files\ListFilesRequest;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Files\DeleteFileRequest;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Files\RenameFileRequest;
@@ -143,10 +144,7 @@ class FileController extends ClientApiController
      */
     public function write(WriteFileContentRequest $request, Server $server): JsonResponse
     {
-        $this->fileRepository->setServer($server)->putContent(
-            $this->encode($request->get('file')),
-            $request->getContent()
-        );
+        $this->fileRepository->setServer($server)->putContent($request->get('file'), $request->getContent());
 
         return new JsonResponse([], Response::HTTP_NO_CONTENT);
     }
@@ -284,16 +282,18 @@ class FileController extends ClientApiController
     }
 
     /**
-     * Encodes a given file name & path in a format that should work for a good majority
-     * of file names without too much confusing logic.
+     * Requests that a file be downloaded from a remote location by Wings.
      *
-     * @param string $path
-     * @return string
+     * @param $request
+     * @param \Pterodactyl\Models\Server $server
+     * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      */
-    private function encode(string $path): string
+    public function pull(PullFileRequest $request, Server $server): JsonResponse
     {
-        return Collection::make(explode('/', rawurldecode($path)))->map(function ($value) {
-            return rawurlencode($value);
-        })->join('/');
+        $this->fileRepository->setServer($server)->pull($request->input('url'), $request->input('directory'));
+
+        return new JsonResponse([], Response::HTTP_NO_CONTENT);
     }
 }

app/Http/Controllers/Api/Remote/Backups/BackupRemoteUploadController.php

@@ -52,7 +52,7 @@ class BackupRemoteUploadController extends Controller
     public function __invoke(Request $request, string $backup)
     {
         // Get the size query parameter.
-        $size = (int)$request->query('size');
+        $size = (int) $request->query('size');
         if (empty($size)) {
             throw new BadRequestHttpException('A non-empty "size" query parameter must be provided.');
         }

app/Http/Requests/Api/Client/Servers/Files/PullFileRequest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Pterodactyl\Http\Requests\Api\Client\Servers\Files;
+
+use Pterodactyl\Models\Permission;
+use Pterodactyl\Contracts\Http\ClientPermissionsRequest;
+use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
+
+class PullFileRequest extends ClientApiRequest implements ClientPermissionsRequest
+{
+    /**
+     * @return string
+     */
+    public function permission(): string
+    {
+        return Permission::ACTION_FILE_CREATE;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function rules(): array
+    {
+        return [
+            'url' => 'required|string|url',
+            'directory' => 'sometimes|nullable|string',
+        ];
+    }
+}