Insane number of changes required to get the build to post

2019-11-24 20:19:31 -08:00 · 2019-11-24 20:19:31 -08:00 · 2af653733c
commit 2af653733c
parent 547e8840e2
12 changed files with 111 additions and 649 deletions
--- a/app/Services/Servers/ContainerRebuildService.php
+++ b/app/Services/Servers/ContainerRebuildService.php
@ -4,28 +4,30 @@ namespace Pterodactyl\Services\Servers;

 use Pterodactyl\Models\Server;
 use GuzzleHttp\Exception\RequestException;
+use Pterodactyl\Repositories\Wings\DaemonServerRepository;
 use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
-use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface;

 class ContainerRebuildService
 {
    /**
-     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
+     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
     */
    private $repository;

    /**
     * ContainerRebuildService constructor.
     *
-     * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $repository
+     * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $repository
     */
-    public function __construct(ServerRepositoryInterface $repository)
+    public function __construct(DaemonServerRepository $repository)
    {
        $this->repository = $repository;
    }

    /**
-     * Mark a server for rebuild on next boot cycle.
+     * Mark a server for rebuild on next boot cycle. This just makes an empty patch
+     * request to Wings which will automatically mark the container as requiring a rebuild
+     * on the next boot as a result.
     *
     * @param \Pterodactyl\Models\Server $server
     *
@ -34,7 +36,7 @@ class ContainerRebuildService
    public function handle(Server $server)
    {
        try {
-            $this->repository->setServer($server)->rebuild();
+            $this->repository->setServer($server)->update([]);
        } catch (RequestException $exception) {
            throw new DaemonConnectionException($exception);
        }
--- a/app/Services/Servers/DetailsModificationService.php
+++ b/app/Services/Servers/DetailsModificationService.php
@ -6,8 +6,6 @@ use Pterodactyl\Models\Server;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Traits\Services\ReturnsUpdatedModels;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
-use Pterodactyl\Services\DaemonKeys\DaemonKeyCreationService;
-use Pterodactyl\Services\DaemonKeys\DaemonKeyDeletionService;

 class DetailsModificationService
 {
@ -18,16 +16,6 @@ class DetailsModificationService
     */
    private $connection;

-    /**
-     * @var \Pterodactyl\Services\DaemonKeys\DaemonKeyCreationService
-     */
-    private $keyCreationService;
-
-    /**
-     * @var \Pterodactyl\Services\DaemonKeys\DaemonKeyDeletionService
-     */
-    private $keyDeletionService;
-
    /**
     * @var \Pterodactyl\Repositories\Eloquent\ServerRepository
     */
@ -37,19 +25,13 @@ class DetailsModificationService
     * DetailsModificationService constructor.
     *
     * @param \Illuminate\Database\ConnectionInterface $connection
-     * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyCreationService $keyCreationService
-     * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyDeletionService $keyDeletionService
     * @param \Pterodactyl\Repositories\Eloquent\ServerRepository $repository
     */
    public function __construct(
        ConnectionInterface $connection,
-        DaemonKeyCreationService $keyCreationService,
-        DaemonKeyDeletionService $keyDeletionService,
        ServerRepository $repository
    ) {
        $this->connection = $connection;
-        $this->keyCreationService = $keyCreationService;
-        $this->keyDeletionService = $keyDeletionService;
        $this->repository = $repository;
    }

@ -60,7 +42,6 @@ class DetailsModificationService
     * @param array $data
     * @return bool|\Pterodactyl\Models\Server
     *
-     * @throws \Pterodactyl\Exceptions\DisplayException
     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
     */
@ -75,11 +56,6 @@ class DetailsModificationService
            'description' => array_get($data, 'description') ?? '',
        ], true, true);

-        if ((int) array_get($data, 'owner_id', 0) !== (int) $server->owner_id) {
-            $this->keyDeletionService->handle($server, $server->owner_id);
-            $this->keyCreationService->handle($server->id, array_get($data, 'owner_id'));
-        }
-
        $this->connection->commit();

        return $response;
--- a/app/Services/Servers/ReinstallServerService.php
+++ b/app/Services/Servers/ReinstallServerService.php
@ -1,48 +1,41 @@
 <?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\Services\Servers;

 use Pterodactyl\Models\Server;
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Repositories\Wings\DaemonServerRepository;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
-use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;

 class ReinstallServerService
 {
    /**
-     * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
+     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
     */
-    protected $daemonServerRepository;
+    private $daemonServerRepository;

    /**
     * @var \Illuminate\Database\ConnectionInterface
     */
-    protected $database;
+    private $database;

    /**
     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
     */
-    protected $repository;
+    private $repository;

    /**
     * ReinstallService constructor.
     *
     * @param \Illuminate\Database\ConnectionInterface $database
-     * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonServerRepository
+     * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonServerRepository
     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
     */
    public function __construct(
        ConnectionInterface $database,
-        DaemonServerRepositoryInterface $daemonServerRepository,
+        DaemonServerRepository $daemonServerRepository,
        ServerRepositoryInterface $repository
    ) {
        $this->daemonServerRepository = $daemonServerRepository;
--- a/app/Services/Servers/ServerDeletionService.php
+++ b/app/Services/Servers/ServerDeletionService.php
@ -1,82 +1,76 @@
 <?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\Services\Servers;

-use Psr\Log\LoggerInterface as Writer;
+use Psr\Log\LoggerInterface;
+use Pterodactyl\Models\Server;
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Repositories\Eloquent\ServerRepository;
+use Pterodactyl\Repositories\Eloquent\DatabaseRepository;
+use Pterodactyl\Repositories\Wings\DaemonServerRepository;
 use Pterodactyl\Services\Databases\DatabaseManagementService;
-use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
 use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
-use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;

 class ServerDeletionService
 {
-    /**
-     * @var \Illuminate\Database\ConnectionInterface
-     */
-    protected $connection;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
-     */
-    protected $daemonServerRepository;
-
-    /**
-     * @var \Pterodactyl\Services\Databases\DatabaseManagementService
-     */
-    protected $databaseManagementService;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface
-     */
-    protected $databaseRepository;
-
    /**
     * @var bool
     */
    protected $force = false;

    /**
-     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
+     * @var \Illuminate\Database\ConnectionInterface
     */
-    protected $repository;
+    private $connection;
+
+    /**
+     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
+     */
+    private $daemonServerRepository;
+
+    /**
+     * @var \Pterodactyl\Repositories\Eloquent\DatabaseRepository
+     */
+    private $databaseRepository;
+
+    /**
+     * @var \Pterodactyl\Services\Databases\DatabaseManagementService
+     */
+    private $databaseManagementService;
+
+    /**
+     * @var \Pterodactyl\Repositories\Eloquent\ServerRepository
+     */
+    private $repository;

    /**
     * @var \Psr\Log\LoggerInterface
     */
-    protected $writer;
+    private $writer;

    /**
     * DeletionService constructor.
     *
     * @param \Illuminate\Database\ConnectionInterface $connection
-     * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonServerRepository
-     * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $databaseRepository
+     * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonServerRepository
+     * @param \Pterodactyl\Repositories\Eloquent\DatabaseRepository $databaseRepository
     * @param \Pterodactyl\Services\Databases\DatabaseManagementService $databaseManagementService
-     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
+     * @param \Pterodactyl\Repositories\Eloquent\ServerRepository $repository
     * @param \Psr\Log\LoggerInterface $writer
     */
    public function __construct(
        ConnectionInterface $connection,
-        DaemonServerRepositoryInterface $daemonServerRepository,
-        DatabaseRepositoryInterface $databaseRepository,
+        DaemonServerRepository $daemonServerRepository,
+        DatabaseRepository $databaseRepository,
        DatabaseManagementService $databaseManagementService,
-        ServerRepositoryInterface $repository,
-        Writer $writer
+        ServerRepository $repository,
+        LoggerInterface $writer
    ) {
-        $this->daemonServerRepository = $daemonServerRepository;
        $this->connection = $connection;
-        $this->databaseManagementService = $databaseManagementService;
+        $this->daemonServerRepository = $daemonServerRepository;
        $this->databaseRepository = $databaseRepository;
+        $this->databaseManagementService = $databaseManagementService;
        $this->repository = $repository;
        $this->writer = $writer;
    }
@ -97,11 +91,12 @@ class ServerDeletionService
    /**
     * Delete a server from the panel and remove any associated databases from hosts.
     *
-     * @param int|\Pterodactyl\Models\Server $server
+     * @param \Pterodactyl\Models\Server $server
     *
+     * @throws \Throwable
     * @throws \Pterodactyl\Exceptions\DisplayException
     */
-    public function handle($server)
+    public function handle(Server $server)
    {
        try {
            $this->daemonServerRepository->setServer($server)->delete();
@ -119,12 +114,12 @@ class ServerDeletionService
            }
        }

-        $this->connection->beginTransaction();
-        $this->databaseRepository->setColumns('id')->findWhere([['server_id', '=', $server->id]])->each(function ($item) {
-            $this->databaseManagementService->delete($item->id);
-        });
+        $this->connection->transaction(function () use ($server) {
+            $this->databaseRepository->setColumns('id')->findWhere([['server_id', '=', $server->id]])->each(function ($item) {
+                $this->databaseManagementService->delete($item->id);
+            });

-        $this->repository->delete($server->id);
-        $this->connection->commit();
+            $this->repository->delete($server->id);
+        });
    }
 }
--- a/app/Services/Servers/StartupModificationService.php
+++ b/app/Services/Servers/StartupModificationService.php
@ -7,21 +7,16 @@ use Pterodactyl\Models\Server;
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Traits\Services\HasUserLevels;
+use Pterodactyl\Repositories\Wings\DaemonServerRepository;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
 use Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface;
-use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;

 class StartupModificationService
 {
    use HasUserLevels;

-    /**
-     * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
-     */
-    private $daemonServerRepository;
-
    /**
     * @var \Illuminate\Database\ConnectionInterface
     */
@ -52,11 +47,16 @@ class StartupModificationService
     */
    private $validatorService;

+    /**
+     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
+     */
+    private $daemonServerRepository;
+
    /**
     * StartupModificationService constructor.
     *
     * @param \Illuminate\Database\ConnectionInterface $connection
-     * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonServerRepository
+     * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonServerRepository
     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $eggRepository
     * @param \Pterodactyl\Services\Servers\EnvironmentService $environmentService
     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
@ -65,20 +65,20 @@ class StartupModificationService
     */
    public function __construct(
        ConnectionInterface $connection,
-        DaemonServerRepositoryInterface $daemonServerRepository,
+        DaemonServerRepository $daemonServerRepository,
        EggRepositoryInterface $eggRepository,
        EnvironmentService $environmentService,
        ServerRepositoryInterface $repository,
        ServerVariableRepositoryInterface $serverVariableRepository,
        VariableValidatorService $validatorService
    ) {
-        $this->daemonServerRepository = $daemonServerRepository;
        $this->connection = $connection;
        $this->eggRepository = $eggRepository;
        $this->environmentService = $environmentService;
        $this->repository = $repository;
        $this->serverVariableRepository = $serverVariableRepository;
        $this->validatorService = $validatorService;
+        $this->daemonServerRepository = $daemonServerRepository;
    }

    /**
--- a/app/Services/Servers/SuspensionService.php
+++ b/app/Services/Servers/SuspensionService.php
@ -1,66 +1,59 @@
 <?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\Services\Servers;

+use Psr\Log\LoggerInterface;
 use InvalidArgumentException;
 use Pterodactyl\Models\Server;
-use Psr\Log\LoggerInterface as Writer;
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Exceptions\DisplayException;
+use Pterodactyl\Repositories\Wings\DaemonServerRepository;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;

 class SuspensionService
 {
    const ACTION_SUSPEND = 'suspend';
    const ACTION_UNSUSPEND = 'unsuspend';

-    /**
-     * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
-     */
-    protected $daemonServerRepository;
-
    /**
     * @var \Illuminate\Database\ConnectionInterface
     */
-    protected $database;
+    private $database;

    /**
     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
     */
-    protected $repository;
+    private $repository;

    /**
     * @var \Psr\Log\LoggerInterface
     */
-    protected $writer;
+    private $writer;
+
+    /**
+     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
+     */
+    private $daemonServerRepository;

    /**
     * SuspensionService constructor.
     *
     * @param \Illuminate\Database\ConnectionInterface $database
-     * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonServerRepository
+     * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonServerRepository
     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
     * @param \Psr\Log\LoggerInterface $writer
     */
    public function __construct(
        ConnectionInterface $database,
-        DaemonServerRepositoryInterface $daemonServerRepository,
+        DaemonServerRepository $daemonServerRepository,
        ServerRepositoryInterface $repository,
-        Writer $writer
+        LoggerInterface $writer
    ) {
-        $this->daemonServerRepository = $daemonServerRepository;
        $this->database = $database;
        $this->repository = $repository;
        $this->writer = $writer;
+        $this->daemonServerRepository = $daemonServerRepository;
    }

    /**