Merge branch 'develop' into update/paper

Author: DaneEveritt

.env.example

@@ -19,8 +19,8 @@ HASHIDS_SALT=
 HASHIDS_LENGTH=8
 
 MAIL_DRIVER=smtp
-MAIL_HOST=mailtrap.io
-MAIL_PORT=2525
+MAIL_HOST=smtp.example.com
+MAIL_PORT=25
 MAIL_USERNAME=
 MAIL_PASSWORD=
 MAIL_ENCRYPTION=tls

.github/ISSUE_TEMPLATE/---bug-report.md

@@ -6,7 +6,7 @@ about: For reporting code or design bugs with the software. DO NOT REPORT APACHE
 
 DO NOT REPORT ISSUES CONFIGURING: SSL, PHP, APACHE, NGINX, YOUR MACHINE, SSH, SFTP, ETC. ON THIS GITHUB TRACKER.
 
-For assistance installating this software, as well as debugging issues with dependencies, please use our discord server: https://discord.gg/pterodactyl
+For assistance installing this software, as well as debugging issues with dependencies, please use our discord server: https://discord.gg/pterodactyl
 
 You MUST complete all of the below information when reporting a bug, failure to do so will result in closure of your issue. PLEASE stop spamming our tracker with "bugs" that are not related to this project.
 

app/Console/Kernel.php

@@ -25,11 +25,13 @@ protected function schedule(Schedule $schedule)
         // Execute scheduled commands for servers every minute, as if there was a normal cron running.
         $schedule->command('p:schedule:process')->everyMinute()->withoutOverlapping();
 
-        // Every 30 minutes, run the backup pruning command so that any abandoned backups can be removed
-        // from the UI view for the server.
-        $schedule->command('p:maintenance:prune-backups', [
-            '--since-minutes' => '30',
-        ])->everyThirtyMinutes();
+        // Every 30 minutes, run the backup pruning command so that any abandoned backups can be deleted.
+        $pruneAge = config('backups.prune_age', 360); // Defaults to 6 hours (time is in minuteS)
+        if ($pruneAge > 0) {
+            $schedule->command('p:maintenance:prune-backups', [
+                '--since-minutes' => $pruneAge,
+            ])->everyThirtyMinutes();
+        }
 
         // Every day cleanup any internal backups of service files.
         $schedule->command('p:maintenance:clean-service-backups')->daily();

app/Http/Controllers/Admin/Nests/EggController.php

@@ -78,7 +78,14 @@ public function create(): View
      */
     public function store(EggFormRequest $request): RedirectResponse
     {
-        $egg = $this->creationService->handle($request->normalize());
+        $data = $request->normalize();
+        if (!empty($data['docker_images']) && !is_array($data['docker_images'])) {
+            $data['docker_images'] = array_map(function ($value) {
+                return trim($value);
+            }, explode("\n", $data['docker_images']));
+        }
+
+        $egg = $this->creationService->handle($data);
         $this->alert->success(trans('admin/nests.eggs.notices.egg_created'))->flash();
 
         return redirect()->route('admin.nests.egg.view', $egg->id);
@@ -108,7 +115,14 @@ public function view(Egg $egg): View
      */
     public function update(EggFormRequest $request, Egg $egg): RedirectResponse
     {
-        $this->updateService->handle($egg, $request->normalize());
+        $data = $request->normalize();
+        if (!empty($data['docker_images']) && !is_array($data['docker_images'])) {
+            $data['docker_images'] = array_map(function ($value) {
+                return trim($value);
+            }, explode("\n", $data['docker_images']));
+        }
+
+        $this->updateService->handle($egg, $data);
         $this->alert->success(trans('admin/nests.eggs.notices.updated'))->flash();
 
         return redirect()->route('admin.nests.egg.view', $egg->id);

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

@@ -111,17 +111,19 @@ public function index()
      *
      * @throws \Illuminate\Validation\ValidationException
      * @throws \Pterodactyl\Exceptions\DisplayException
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\Deployment\NoViableAllocationException
      * @throws \Pterodactyl\Exceptions\Service\Deployment\NoViableNodeException
      * @throws \Throwable
      */
     public function store(ServerFormRequest $request)
     {
-        $server = $this->creationService->handle(
-            $request->except(['_token'])
-        );
+        $data = $request->except(['_token']);
+        if (!empty($data['custom_image'])) {
+            $data['image'] = $data['custom_image'];
+            unset($data['custom_image']);
+        }
+
+        $server = $this->creationService->handle($data);
 
         $this->alert->success(
             trans('admin/server.alerts.server_created')

app/Http/Controllers/Admin/ServersController.php

@@ -334,14 +334,19 @@ public function delete(Request $request, Server $server)
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Illuminate\Validation\ValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function saveStartup(Request $request, Server $server)
     {
+        $data = $request->except('_token');
+        if (!empty($data['custom_docker_image'])) {
+            $data['docker_image'] = $data['custom_docker_image'];
+            unset($data['custom_docker_image']);
+        }
+
         try {
             $this->startupModificationService
                 ->setUserLevel(User::USER_LEVEL_ADMIN)
-                ->handle($server, $request->except('_token'));
+                ->handle($server, $data);
         } catch (DataValidationException $exception) {
             throw new ValidationException($exception->validator);
         }

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

@@ -13,6 +13,7 @@
 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;
@@ -72,7 +73,7 @@ public function directory(ListFilesRequest $request, Server $server): array
     {
         $contents = $this->fileRepository
             ->setServer($server)
-            ->getDirectory($this->encode($request->get('directory') ?? '/'));
+            ->getDirectory($request->get('directory') ?? '/');
 
         return $this->fractal->collection($contents)
             ->transformWith($this->getTransformer(FileObjectTransformer::class))
@@ -93,7 +94,7 @@ public function contents(GetFileContentsRequest $request, Server $server): Respo
     {
         return new Response(
             $this->fileRepository->setServer($server)->getContent(
-                $this->encode($request->get('file')), config('pterodactyl.files.max_edit_size')
+                $request->get('file'), config('pterodactyl.files.max_edit_size')
             ),
             Response::HTTP_OK,
             ['Content-Type' => 'text/plain']
@@ -143,10 +144,7 @@ public function download(GetFileContentsRequest $request, Server $server)
      */
     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 @@ public function chmod(ChmodFilesRequest $request, Server $server): JsonResponse
     }
 
     /**
-     * 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 $request
+     * @param \Pterodactyl\Models\Server $server
+     * @return \Illuminate\Http\JsonResponse
      *
-     * @param string $path
-     * @return string
+     * @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/Client/Servers/SettingsController.php

@@ -2,13 +2,16 @@
 
 namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
 
+use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Pterodactyl\Models\Server;
 use Illuminate\Http\JsonResponse;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
 use Pterodactyl\Services\Servers\ReinstallServerService;
 use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Settings\RenameServerRequest;
+use Pterodactyl\Http\Requests\Api\Client\Servers\Settings\SetDockerImageRequest;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Settings\ReinstallServerRequest;
 
 class SettingsController extends ClientApiController
@@ -73,4 +76,26 @@ public function reinstall(ReinstallServerRequest $request, Server $server)
 
         return new JsonResponse([], Response::HTTP_ACCEPTED);
     }
+
+    /**
+     * Changes the Docker image in use by the server.
+     *
+     * @param \Pterodactyl\Http\Requests\Api\Client\Servers\Settings\SetDockerImageRequest $request
+     * @param \Pterodactyl\Models\Server $server
+     * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Throwable
+     */
+    public function dockerImage(SetDockerImageRequest $request, Server $server)
+    {
+        if (!in_array($server->image, $server->egg->docker_images)) {
+            throw new BadRequestHttpException(
+                'This server\'s Docker image has been manually set by an administrator and cannot be updated.'
+            );
+        }
+
+        $server->forceFill(['image' => $request->input('docker_image')])->saveOrFail();
+
+        return new JsonResponse([], Response::HTTP_NO_CONTENT);
+    }
 }

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

@@ -62,6 +62,7 @@ public function index(GetStartupRequest $request, Server $server)
             ->transformWith($this->getTransformer(EggVariableTransformer::class))
             ->addMeta([
                 'startup_command' => $startup,
+                'docker_images' => $server->egg->docker_images,
                 'raw_startup_command' => $server->startup,
             ])
             ->toArray();

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

@@ -52,7 +52,7 @@ public function __construct(BackupRepository $repository, BackupManager $backupM
     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.');
         }