Add server build management to API

Author: DaneEveritt

app/Contracts/Repository/AllocationRepositoryInterface.php

@@ -40,4 +40,21 @@ public function getPaginatedAllocationsForNode(int $node, int $perPage = 100): L
      * @return \Illuminate\Support\Collection
      */
     public function getUniqueAllocationIpsForNode(int $node): Collection;
+
+    /**
+     * Return all of the allocations that exist for a node that are not currently
+     * allocated.
+     *
+     * @param int $node
+     * @return array
+     */
+    public function getUnassignedAllocationIds(int $node): array;
+
+    /**
+     * Get an array of all allocations that are currently assigned to a given server.
+     *
+     * @param int $server
+     * @return array
+     */
+    public function getAssignedAllocationIds(int $server): array;
 }

app/Exceptions/DisplayException.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Exceptions;
 
@@ -66,7 +59,7 @@ public function render($request)
         if ($request->expectsJson()) {
             return response()->json(Handler::convertToArray($this, [
                 'detail' => $this->getMessage(),
-            ]), method_exists($this, 'getStatusCode') ? $this->getStatusCode() : Response::HTTP_INTERNAL_SERVER_ERROR);
+            ]), method_exists($this, 'getStatusCode') ? $this->getStatusCode() : Response::HTTP_BAD_REQUEST);
         }
 
         app()->make(AlertsMessageBag::class)->danger($this->getMessage())->flash();

app/Exceptions/Handler.php

@@ -36,6 +36,8 @@ class Handler extends ExceptionHandler
      * @var array
      */
     protected $dontFlash = [
+        'token',
+        'secret',
         'password',
         'password_confirmation',
     ];

app/Http/Controllers/Api/Application/Servers/ServerDetailsController.php

@@ -3,31 +3,42 @@
 namespace Pterodactyl\Http\Controllers\Api\Application\Servers;
 
 use Pterodactyl\Models\Server;
+use Pterodactyl\Services\Servers\BuildModificationService;
 use Pterodactyl\Services\Servers\DetailsModificationService;
 use Pterodactyl\Transformers\Api\Application\ServerTransformer;
 use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
 use Pterodactyl\Http\Requests\Api\Application\Servers\UpdateServerDetailsRequest;
+use Pterodactyl\Http\Requests\Api\Application\Servers\UpdateServerBuildConfigurationRequest;
 
 class ServerDetailsController extends ApplicationApiController
 {
+    /**
+     * @var \Pterodactyl\Services\Servers\BuildModificationService
+     */
+    private $buildModificationService;
+
     /**
      * @var \Pterodactyl\Services\Servers\DetailsModificationService
      */
-    private $modificationService;
+    private $detailsModificationService;
 
     /**
      * ServerDetailsController constructor.
      *
-     * @param \Pterodactyl\Services\Servers\DetailsModificationService $modificationService
+     * @param \Pterodactyl\Services\Servers\BuildModificationService   $buildModificationService
+     * @param \Pterodactyl\Services\Servers\DetailsModificationService $detailsModificationService
      */
-    public function __construct(DetailsModificationService $modificationService)
+    public function __construct(BuildModificationService $buildModificationService, DetailsModificationService $detailsModificationService)
     {
         parent::__construct();
 
-        $this->modificationService = $modificationService;
+        $this->buildModificationService = $buildModificationService;
+        $this->detailsModificationService = $detailsModificationService;
     }
 
     /**
+     * Update the details for a specific server.
+     *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\UpdateServerDetailsRequest $request
      * @param \Pterodactyl\Models\Server                                                    $server
      * @return array
@@ -38,7 +49,27 @@ public function __construct(DetailsModificationService $modificationService)
      */
     public function details(UpdateServerDetailsRequest $request, Server $server): array
     {
-        $server = $this->modificationService->returnUpdatedModel()->handle($server, $request->validated());
+        $server = $this->detailsModificationService->returnUpdatedModel()->handle($server, $request->validated());
+
+        return $this->fractal->item($server)
+            ->transformWith($this->getTransformer(ServerTransformer::class))
+            ->toArray();
+    }
+
+    /**
+     * Update the build details for a specific server.
+     *
+     * @param \Pterodactyl\Http\Requests\Api\Application\Servers\UpdateServerBuildConfigurationRequest $request
+     * @param \Pterodactyl\Models\Server                                                               $server
+     * @return array
+     *
+     * @throws \Pterodactyl\Exceptions\DisplayException
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function build(UpdateServerBuildConfigurationRequest $request, Server $server): array
+    {
+        $server = $this->buildModificationService->handle($server, $request->validated());
 
         return $this->fractal->item($server)
             ->transformWith($this->getTransformer(ServerTransformer::class))

app/Http/Requests/Api/Application/Servers/UpdateServerBuildConfigurationRequest.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Pterodactyl\Http\Requests\Api\Application\Servers;
+
+use Pterodactyl\Models\Server;
+
+class UpdateServerBuildConfigurationRequest extends ServerWriteRequest
+{
+    /**
+     * Return the rules to validate this request aganist.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $rules = Server::getUpdateRulesForId($this->route()->parameter('server')->id);
+
+        return [
+            'allocation' => $rules['allocation_id'],
+            'memory' => $rules['memory'],
+            'swap' => $rules['swap'],
+            'io' => $rules['io'],
+            'cpu' => $rules['cpu'],
+            'disk' => $rules['disk'],
+            'add_allocations' => 'bail|array',
+            'add_allocations.*' => 'integer',
+            'remove_allocations' => 'bail|array',
+            'remove_allocations.*' => 'integer',
+        ];
+    }
+
+    /**
+     * Convert the allocation field into the expected format for the service handler.
+     *
+     * @return array
+     */
+    public function validated()
+    {
+        $data = parent::validated();
+
+        $data['allocation_id'] = $data['allocation'];
+        unset($data['allocation']);
+
+        return $data;
+    }
+
+    /**
+     * Custom attributes to use in error message responses.
+     *
+     * @return array
+     */
+    public function attributes()
+    {
+        return [
+            'add_allocations' => 'allocations to add',
+            'remove_allocations' => 'allocations to remove',
+            'add_allocations.*' => 'allocation to add',
+            'remove_allocations.*' => 'allocation to remove',
+        ];
+    }
+}

app/Repositories/Eloquent/AllocationRepository.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Repositories\Eloquent;
 
-use Pterodactyl\Models\Node;
 use Illuminate\Support\Collection;
 use Pterodactyl\Models\Allocation;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
@@ -68,4 +67,31 @@ public function getUniqueAllocationIpsForNode(int $node): Collection
             ->orderByRaw('INET_ATON(ip) ASC')
             ->get($this->getColumns());
     }
+
+    /**
+     * Return all of the allocations that exist for a node that are not currently
+     * allocated.
+     *
+     * @param int $node
+     * @return array
+     */
+    public function getUnassignedAllocationIds(int $node): array
+    {
+        $results = $this->getBuilder()->select('id')->whereNull('server_id')->where('node_id', $node)->get();
+
+        return $results->pluck('id')->toArray();
+    }
+
+    /**
+     * Get an array of all allocations that are currently assigned to a given server.
+     *
+     * @param int $server
+     * @return array
+     */
+    public function getAssignedAllocationIds(int $server): array
+    {
+        $results = $this->getBuilder()->select('id')->where('server_id', $server)->get();
+
+        return $results->pluck('id')->toArray();
+    }
 }