Complete base implementation of services for administrative server creation

Author: DaneEveritt

app/Contracts/Repository/Daemon/ServerRepositoryInterface.php

@@ -47,9 +47,10 @@ public function update(array $data);
     /**
      * Mark a server to be reinstalled on the system.
      *
+     * @param  array|null $data
      * @return \Psr\Http\Message\ResponseInterface
      */
-    public function reinstall();
+    public function reinstall($data = null);
 
     /**
      * Mark a server as needing a container rebuild the next time the server is booted.
@@ -71,4 +72,11 @@ public function suspend();
      * @return \Psr\Http\Message\ResponseInterface
      */
     public function unsuspend();
+
+    /**
+     * Delete a server on the daemon.
+     *
+     * @return \Psr\Http\Message\ResponseInterface
+     */
+    public function delete();
 }

app/Contracts/Repository/RepositoryInterface.php

@@ -141,6 +141,19 @@ public function update($id, array $fields, $validate = true, $force = false);
      */
     public function updateWhereIn($column, array $values, array $fields);
 
+    /**
+     * Update a record if it exists in the database, otherwise create it.
+     *
+     * @param  array $where
+     * @param  array $fields
+     * @param  bool  $validate
+     * @param  bool  $force
+     * @return mixed
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     */
+    public function updateOrCreate(array $where, array $fields, $validate = true, $force = false);
+
     /**
      * Update multiple records matching the passed clauses.
      *

app/Contracts/Repository/ServerRepositoryInterface.php

@@ -77,4 +77,14 @@ public function getDataForCreation($id);
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getWithDatabases($id);
+
+    /**
+     * Return data about the daemon service in a consumable format.
+     *
+     * @param  int $id
+     * @return array
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getDaemonServiceData($id);
 }

app/Http/Controllers/Admin/ServersController.php

@@ -25,7 +25,6 @@
 namespace Pterodactyl\Http\Controllers\Admin;
 
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
-use Log;
 use Alert;
 use Javascript;
 use Prologue\Alerts\AlertsMessageBag;
@@ -38,17 +37,17 @@
 use Pterodactyl\Http\Requests\Admin\ServerFormRequest;
 use Pterodactyl\Models\Server;
 use Illuminate\Http\Request;
-use GuzzleHttp\Exception\TransferException;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Repositories\Eloquent\DatabaseHostRepository;
-use Pterodactyl\Exceptions\DisplayValidationException;
-use Pterodactyl\Services\Database\CreationService as DatabaseCreationService;
+use Pterodactyl\Services\Database\DatabaseManagementService;
 use Pterodactyl\Services\Servers\BuildModificationService;
 use Pterodactyl\Services\Servers\ContainerRebuildService;
 use Pterodactyl\Services\Servers\CreationService;
+use Pterodactyl\Services\Servers\DeletionService;
 use Pterodactyl\Services\Servers\DetailsModificationService;
 use Pterodactyl\Services\Servers\ReinstallService;
+use Pterodactyl\Services\Servers\StartupModificationService;
 use Pterodactyl\Services\Servers\SuspensionService;
 
 class ServersController extends Controller
@@ -84,15 +83,20 @@ class ServersController extends Controller
     protected $databaseRepository;
 
     /**
-     * @var \Pterodactyl\Services\Database\CreationService
+     * @var \Pterodactyl\Services\Database\DatabaseManagementService
      */
-    protected $databaseCreationService;
+    protected $databaseManagementService;
 
     /**
      * @var \Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface
      */
     protected $databaseHostRepository;
 
+    /**
+     * @var \Pterodactyl\Services\Servers\DeletionService
+     */
+    protected $deletionService;
+
     /**
      * @var \Pterodactyl\Services\Servers\DetailsModificationService
      */
@@ -128,6 +132,11 @@ class ServersController extends Controller
      */
     protected $serviceRepository;
 
+    /**
+     * @var \Pterodactyl\Services\Servers\StartupModificationService
+     */
+    private $startupModificationService;
+
     /**
      * @var \Pterodactyl\Services\Servers\SuspensionService
      */
@@ -142,15 +151,17 @@ class ServersController extends Controller
      * @param \Illuminate\Contracts\Config\Repository                         $config
      * @param \Pterodactyl\Services\Servers\ContainerRebuildService           $containerRebuildService
      * @param \Pterodactyl\Services\Servers\CreationService                   $service
-     * @param \Pterodactyl\Services\Database\CreationService                  $databaseCreationService
+     * @param \Pterodactyl\Services\Database\DatabaseManagementService        $databaseManagementService
      * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface   $databaseRepository
      * @param \Pterodactyl\Repositories\Eloquent\DatabaseHostRepository       $databaseHostRepository
+     * @param \Pterodactyl\Services\Servers\DeletionService                   $deletionService
      * @param \Pterodactyl\Services\Servers\DetailsModificationService        $detailsModificationService
      * @param \Pterodactyl\Contracts\Repository\LocationRepositoryInterface   $locationRepository
      * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface       $nodeRepository
      * @param \Pterodactyl\Services\Servers\ReinstallService                  $reinstallService
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface     $repository
      * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface    $serviceRepository
+     * @param \Pterodactyl\Services\Servers\StartupModificationService        $startupModificationService
      * @param \Pterodactyl\Services\Servers\SuspensionService                 $suspensionService
      */
     public function __construct(
@@ -160,32 +171,36 @@ public function __construct(
         ConfigRepository $config,
         ContainerRebuildService $containerRebuildService,
         CreationService $service,
-        DatabaseCreationService $databaseCreationService,
+        DatabaseManagementService $databaseManagementService,
         DatabaseRepositoryInterface $databaseRepository,
         DatabaseHostRepository $databaseHostRepository,
+        DeletionService $deletionService,
         DetailsModificationService $detailsModificationService,
         LocationRepositoryInterface $locationRepository,
         NodeRepositoryInterface $nodeRepository,
         ReinstallService $reinstallService,
         ServerRepositoryInterface $repository,
         ServiceRepositoryInterface $serviceRepository,
+        StartupModificationService $startupModificationService,
         SuspensionService $suspensionService
     ) {
         $this->alert = $alert;
         $this->allocationRepository = $allocationRepository;
         $this->buildModificationService = $buildModificationService;
         $this->config = $config;
         $this->containerRebuildService = $containerRebuildService;
-        $this->databaseCreationService = $databaseCreationService;
+        $this->databaseManagementService = $databaseManagementService;
         $this->databaseRepository = $databaseRepository;
         $this->databaseHostRepository = $databaseHostRepository;
         $this->detailsModificationService = $detailsModificationService;
+        $this->deletionService = $deletionService;
         $this->locationRepository = $locationRepository;
         $this->nodeRepository = $nodeRepository;
         $this->reinstallService = $reinstallService;
         $this->repository = $repository;
         $this->service = $service;
         $this->serviceRepository = $serviceRepository;
+        $this->startupModificationService = $startupModificationService;
         $this->suspensionService = $suspensionService;
     }
 
@@ -234,21 +249,15 @@ public function create()
      * @param  \Pterodactyl\Http\Requests\Admin\ServerFormRequest $request
      * @return \Illuminate\Http\RedirectResponse
      *
+     * @throws \Pterodactyl\Exceptions\DisplayException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      */
     public function store(ServerFormRequest $request)
     {
-        try {
-            $server = $this->service->create($request->except('_token'));
-
-            return redirect()->route('admin.servers.view', $server->id);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-            Alert::danger('A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.')
-                ->flash();
-        }
+        $server = $this->service->create($request->except('_token'));
+        $this->alert->success(trans('admin/server.alerts.server_created'))->flash();
 
-        return redirect()->route('admin.servers.new')->withInput();
+        return redirect()->route('admin.servers.view', $server->id);
     }
 
     /**
@@ -508,9 +517,9 @@ public function manageSuspension(Request $request, Server $server)
      */
     public function updateBuild(Request $request, Server $server)
     {
-        $this->buildModificationService->handle($server, $request->intersect([
-                'allocation_id', 'add_allocations', 'remove_allocations',
-                'memory', 'swap', 'io', 'cpu', 'disk',
+        $this->buildModificationService->handle($server, $request->only([
+            'allocation_id', 'add_allocations', 'remove_allocations',
+            'memory', 'swap', 'io', 'cpu', 'disk',
         ]));
         $this->alert->success(trans('admin/server.alerts.build_updated'))->flash();
 
@@ -520,69 +529,38 @@ public function updateBuild(Request $request, Server $server)
     /**
      * Start the server deletion process.
      *
-     * @param  \Illuminate\Http\Request $request
-     * @param  int                      $id
+     * @param  \Illuminate\Http\Request   $request
+     * @param  \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\DisplayException
      */
-    public function delete(Request $request, $id)
+    public function delete(Request $request, Server $server)
     {
-        $repo = new ServerRepository;
-
-        try {
-            $repo->delete($id, $request->has('force_delete'));
-            Alert::success('Server was successfully deleted from the system.')->flash();
-
-            return redirect()->route('admin.servers');
-        } catch (DisplayException $ex) {
-            Alert::danger($ex->getMessage())->flash();
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-            Alert::danger('A TransferException occurred while attempting to delete this server from the daemon, please ensure it is running. This error has been logged.')
-                ->flash();
-        } catch (\Exception $ex) {
-            Log::error($ex);
-            Alert::danger('An unhandled exception occured while attemping to delete this server. This error has been logged.')
-                ->flash();
-        }
+        $this->deletionService->withForce($request->has('force_delete'))->handle($server);
+        $this->alert->success(trans('admin/server.alerts.server_deleted'))->flash();
 
-        return redirect()->route('admin.servers.view.delete', $id);
+        return redirect()->route('admin.servers');
     }
 
     /**
      * Update the startup command as well as variables.
      *
-     * @param  \Illuminate\Http\Request $request
-     * @param  int                      $id
+     * @param  \Illuminate\Http\Request  $request
+     * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\DisplayException
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      */
-    public function saveStartup(Request $request, $id)
+    public function saveStartup(Request $request, Server $server)
     {
-        $repo = new ServerRepository;
-
-        try {
-            if ($repo->updateStartup($id, $request->except('_token'), true)) {
-                Alert::success('Service configuration successfully modfied for this server, reinstalling now.')
-                    ->flash();
-
-                return redirect()->route('admin.servers.view', $id);
-            } else {
-                Alert::success('Startup variables were successfully modified and assigned for this server.')->flash();
-            }
-        } catch (DisplayValidationException $ex) {
-            return redirect()->route('admin.servers.view.startup', $id)->withErrors(json_decode($ex->getMessage()));
-        } catch (DisplayException $ex) {
-            Alert::danger($ex->getMessage())->flash();
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-            Alert::danger('A TransferException occurred while attempting to update the startup for this server, please ensure the daemon is running. This error has been logged.')
-                ->flash();
-        } catch (\Exception $ex) {
-            Log::error($ex);
-            Alert::danger('An unhandled exception occured while attemping to update startup variables for this server. This error has been logged.')
-                ->flash();
-        }
+        $this->startupModificationService->isAdmin()->handle(
+            $server, $request->except('_token')
+        );
+        $this->alert->success(trans('admin/server.alerts.startup_changed'))->flash();
 
-        return redirect()->route('admin.servers.view.startup', $id);
+        return redirect()->route('admin.servers.view.startup', $server->id);
     }
 
     /**
@@ -598,7 +576,7 @@ public function saveStartup(Request $request, $id)
      */
     public function newDatabase(Request $request, $server)
     {
-        $this->databaseCreationService->create($server, [
+        $this->databaseManagementService->create($server, [
             'database' => $request->input('database'),
             'remote' => $request->input('remote'),
             'database_host_id' => $request->input('database_host_id'),
@@ -624,7 +602,7 @@ public function resetDatabasePassword(Request $request, $server)
             ['id', '=', $request->input('database')],
         ]);
 
-        $this->databaseCreationService->changePassword($database->id, str_random(20));
+        $this->databaseManagementService->changePassword($database->id, str_random(20));
 
         return response('', 204);
     }
@@ -646,7 +624,7 @@ public function deleteDatabase($server, $database)
             ['id', '=', $database],
         ]);
 
-        $this->databaseCreationService->delete($database->id);
+        $this->databaseManagementService->delete($database->id);
 
         return response('', 204);
     }

app/Http/Requests/Admin/ServerFormRequest.php

@@ -75,14 +75,14 @@ public function withValidator($validator)
                 return ! ($input->auto_deploy);
             });
 
-            if ($this->input('pack_id') !== 0) {
-                $validator->sometimes('pack_id', [
-                    Rule::exists('packs', 'id')->where(function ($query) {
-                        $query->where('selectable', 1);
-                        $query->where('option_id', $this->input('option_id'));
-                    }),
-                ]);
-            }
+            $validator->sometimes('pack_id', [
+                Rule::exists('packs', 'id')->where(function ($query) {
+                    $query->where('selectable', 1);
+                    $query->where('option_id', $this->input('option_id'));
+                }),
+            ], function ($input) {
+                return $input->pack_id !== 0 && $input->pack_id !== null;
+            });
         });
     }
 }

app/Repositories/Daemon/ServerRepository.php

@@ -59,7 +59,7 @@ public function create($id, $overrides = [], $start = false)
                 'io' => (int) $server->io,
                 'cpu' => (int) $server->cpu,
                 'disk' => (int) $server->disk,
-                'image' => (int) $server->image,
+                'image' => $server->image,
             ],
             'service' => [
                 'type' => $server->option->service->folder,
@@ -97,9 +97,15 @@ public function update(array $data)
     /**
      * {@inheritdoc}
      */
-    public function reinstall()
+    public function reinstall($data = null)
     {
-        return $this->getHttpClient()->request('POST', '/server/reinstall');
+        if (is_null($data)) {
+            return $this->getHttpClient()->request('POST', '/server/reinstall');
+        }
+
+        return $this->getHttpClient()->request('POST', '/server/reinstall', [
+            'json' => $data,
+        ]);
     }
 
     /**
@@ -125,4 +131,12 @@ public function unsuspend()
     {
         return $this->getHttpClient()->request('POST', '/server/unsuspend');
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete()
+    {
+        return $this->getHttpClient()->request('DELETE', '/servers');
+    }
 }