Final adjustments to Daemon <-> Panel communication change

2017-09-24 21:12:30 -05:00 · 2017-09-24 21:12:30 -05:00 · 7d1c233c49
commit 7d1c233c49
parent 8e2b77dc1e
32 changed files with 528 additions and 538 deletions
--- a/app/Services/Subusers/PermissionCreationService.php
+++ b/app/Services/Subusers/PermissionCreationService.php
@ -24,16 +24,12 @@

 namespace Pterodactyl\Services\Subusers;

+use Webmozart\Assert\Assert;
 use Pterodactyl\Models\Permission;
 use Pterodactyl\Contracts\Repository\PermissionRepositoryInterface;

 class PermissionCreationService
 {
-    const CORE_DAEMON_PERMISSIONS = [
-        's:get',
-        's:console',
-    ];
-
    /**
     * @var \Pterodactyl\Contracts\Repository\PermissionRepositoryInterface
     */
@ -54,21 +50,19 @@ class PermissionCreationService
     *
     * @param int   $subuser
     * @param array $permissions
-     * @return array
     *
     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
     */
    public function handle($subuser, array $permissions)
    {
+        Assert::integerish($subuser, 'First argument passed to handle must be an integer, received %s.');
+
        $permissionMappings = Permission::getPermissions(true);
-        $daemonPermissions = self::CORE_DAEMON_PERMISSIONS;
        $insertPermissions = [];

        foreach ($permissions as $permission) {
            if (array_key_exists($permission, $permissionMappings)) {
-                if (! is_null($permissionMappings[$permission])) {
-                    array_push($daemonPermissions, $permissionMappings[$permission]);
-                }
+                Assert::stringNotEmpty($permission, 'Permission argument provided must be a non-empty string, received %s.');

                array_push($insertPermissions, [
                    'subuser_id' => $subuser,
@ -77,8 +71,6 @@ class PermissionCreationService
            }
        }

-        $this->repository->insert($insertPermissions);
-
-        return $daemonPermissions;
+        $this->repository->withoutFresh()->insert($insertPermissions);
    }
 }
--- a/app/Services/Subusers/SubuserCreationService.php
+++ b/app/Services/Subusers/SubuserCreationService.php
@ -24,20 +24,16 @@

 namespace Pterodactyl\Services\Subusers;

-use Illuminate\Log\Writer;
 use Pterodactyl\Models\Server;
-use GuzzleHttp\Exception\RequestException;
 use Illuminate\Database\ConnectionInterface;
-use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Services\Nodes\NodeCreationService;
 use Pterodactyl\Services\Users\UserCreationService;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
+use Pterodactyl\Services\DaemonKeys\DaemonKeyCreationService;
 use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
 use Pterodactyl\Exceptions\Service\Subuser\UserIsServerOwnerException;
 use Pterodactyl\Exceptions\Service\Subuser\ServerSubuserExistsException;
-use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;

 class SubuserCreationService
 {
@ -47,9 +43,9 @@ class SubuserCreationService
    protected $connection;

    /**
-     * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
+     * @var \Pterodactyl\Services\DaemonKeys\DaemonKeyCreationService
     */
-    protected $daemonRepository;
+    protected $keyCreationService;

    /**
     * @var \Pterodactyl\Services\Subusers\PermissionCreationService
@ -76,41 +72,33 @@ class SubuserCreationService
     */
    protected $userRepository;

-    /**
-     * @var \Illuminate\Log\Writer
-     */
-    protected $writer;
-
    /**
     * SubuserCreationService constructor.
     *
-     * @param \Illuminate\Database\ConnectionInterface                           $connection
-     * @param \Pterodactyl\Services\Users\UserCreationService                    $userCreationService
-     * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonRepository
-     * @param \Pterodactyl\Services\Subusers\PermissionCreationService           $permissionService
-     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface        $serverRepository
-     * @param \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface       $subuserRepository
-     * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface          $userRepository
-     * @param \Illuminate\Log\Writer                                             $writer
+     * @param \Illuminate\Database\ConnectionInterface                     $connection
+     * @param \Pterodactyl\Services\Users\UserCreationService              $userCreationService
+     * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyCreationService    $keyCreationService
+     * @param \Pterodactyl\Services\Subusers\PermissionCreationService     $permissionService
+     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface  $serverRepository
+     * @param \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface $subuserRepository
+     * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface    $userRepository
     */
    public function __construct(
        ConnectionInterface $connection,
        UserCreationService $userCreationService,
-        DaemonServerRepositoryInterface $daemonRepository,
+        DaemonKeyCreationService $keyCreationService,
        PermissionCreationService $permissionService,
        ServerRepositoryInterface $serverRepository,
        SubuserRepositoryInterface $subuserRepository,
-        UserRepositoryInterface $userRepository,
-        Writer $writer
+        UserRepositoryInterface $userRepository
    ) {
        $this->connection = $connection;
-        $this->daemonRepository = $daemonRepository;
+        $this->keyCreationService = $keyCreationService;
        $this->permissionService = $permissionService;
        $this->subuserRepository = $subuserRepository;
        $this->serverRepository = $serverRepository;
        $this->userRepository = $userRepository;
        $this->userCreationService = $userCreationService;
-        $this->writer = $writer;
    }

    /**
@ -120,7 +108,6 @@ class SubuserCreationService
     * @return \Pterodactyl\Models\Subuser
     *
     * @throws \Exception
-     * @throws \Pterodactyl\Exceptions\DisplayException
     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
     * @throws \Pterodactyl\Exceptions\Service\Subuser\ServerSubuserExistsException
@ -154,28 +141,11 @@ class SubuserCreationService
            ]);
        }

-        $subuser = $this->subuserRepository->create([
-            'user_id' => $user->id,
-            'server_id' => $server->id,
-            'daemonSecret' => str_random(NodeCreationService::DAEMON_SECRET_LENGTH),
-        ]);
+        $subuser = $this->subuserRepository->create(['user_id' => $user->id, 'server_id' => $server->id]);
+        $this->keyCreationService->handle($server->id, $user->id);
+        $this->permissionService->handle($subuser->id, $permissions);
+        $this->connection->commit();

-        $daemonPermissions = $this->permissionService->handle($subuser->id, $permissions);
-
-        try {
-            $this->daemonRepository->setNode($server->node_id)->setAccessServer($server->uuid)
-                ->setSubuserKey($subuser->daemonSecret, $daemonPermissions);
-            $this->connection->commit();
-
-            return $subuser;
-        } catch (RequestException $exception) {
-            $this->connection->rollBack();
-            $this->writer->warning($exception);
-
-            $response = $exception->getResponse();
-            throw new DisplayException(trans('exceptions.daemon_connection_failed', [
-                'code' => is_null($response) ? 'E_CONN_REFUSED' : $response->getStatusCode(),
-            ]));
-        }
+        return $subuser;
    }
 }
--- a/app/Services/Subusers/SubuserDeletionService.php
+++ b/app/Services/Subusers/SubuserDeletionService.php
@ -24,12 +24,9 @@

 namespace Pterodactyl\Services\Subusers;

-use Illuminate\Log\Writer;
-use GuzzleHttp\Exception\RequestException;
 use Illuminate\Database\ConnectionInterface;
-use Pterodactyl\Exceptions\DisplayException;
+use Pterodactyl\Services\DaemonKeys\DaemonKeyDeletionService;
 use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
-use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;

 class SubuserDeletionService
 {
@ -39,45 +36,36 @@ class SubuserDeletionService
    protected $connection;

    /**
-     * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
+     * @var \Pterodactyl\Services\DaemonKeys\DaemonKeyDeletionService
     */
-    protected $daemonRepository;
+    protected $keyDeletionService;

    /**
     * @var \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface
     */
    protected $repository;

-    /**
-     * @var \Illuminate\Log\Writer
-     */
-    protected $writer;
-
    /**
     * SubuserDeletionService constructor.
     *
-     * @param \Illuminate\Database\ConnectionInterface                           $connection
-     * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonRepository
-     * @param \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface       $repository
-     * @param \Illuminate\Log\Writer                                             $writer
+     * @param \Illuminate\Database\ConnectionInterface                     $connection
+     * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyDeletionService    $keyDeletionService
+     * @param \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface $repository
     */
    public function __construct(
        ConnectionInterface $connection,
-        DaemonServerRepositoryInterface $daemonRepository,
-        SubuserRepositoryInterface $repository,
-        Writer $writer
+        DaemonKeyDeletionService $keyDeletionService,
+        SubuserRepositoryInterface $repository
    ) {
        $this->connection = $connection;
-        $this->daemonRepository = $daemonRepository;
+        $this->keyDeletionService = $keyDeletionService;
        $this->repository = $repository;
-        $this->writer = $writer;
    }

    /**
     * Delete a subuser and their associated permissions from the Panel and Daemon.
     *
     * @param int $subuser
-     * @return int|null
     *
     * @throws \Pterodactyl\Exceptions\DisplayException
     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
@ -87,22 +75,8 @@ class SubuserDeletionService
        $subuser = $this->repository->getWithServer($subuser);

        $this->connection->beginTransaction();
-        $response = $this->repository->delete($subuser->id);
-
-        try {
-            $this->daemonRepository->setNode($subuser->server->node_id)->setAccessServer($subuser->server->uuid)
-                ->setSubuserKey($subuser->daemonSecret, []);
-            $this->connection->commit();
-
-            return $response;
-        } catch (RequestException $exception) {
-            $this->connection->rollBack();
-            $this->writer->warning($exception);
-
-            $response = $exception->getResponse();
-            throw new DisplayException(trans('exceptions.daemon_connection_failed', [
-                'code' => is_null($response) ? 'E_CONN_REFUSED' : $response->getStatusCode(),
-            ]));
-        }
+        $this->keyDeletionService->handle($subuser->server_id, $subuser->user_id);
+        $this->repository->delete($subuser->id);
+        $this->connection->commit();
    }
 }
--- a/app/Services/Subusers/SubuserUpdateService.php
+++ b/app/Services/Subusers/SubuserUpdateService.php
@ -28,6 +28,7 @@ use Illuminate\Log\Writer;
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Exceptions\DisplayException;
+use Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService;
 use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
 use Pterodactyl\Contracts\Repository\PermissionRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
@ -44,6 +45,11 @@ class SubuserUpdateService
     */
    protected $daemonRepository;

+    /**
+     * @var \Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService
+     */
+    private $keyProviderService;
+
    /**
     * @var \Pterodactyl\Contracts\Repository\PermissionRepositoryInterface
     */
@ -68,6 +74,7 @@ class SubuserUpdateService
     * SubuserUpdateService constructor.
     *
     * @param \Illuminate\Database\ConnectionInterface                           $connection
+     * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService          $keyProviderService
     * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonRepository
     * @param \Pterodactyl\Services\Subusers\PermissionCreationService           $permissionService
     * @param \Pterodactyl\Contracts\Repository\PermissionRepositoryInterface    $permissionRepository
@ -76,6 +83,7 @@ class SubuserUpdateService
     */
    public function __construct(
        ConnectionInterface $connection,
+        DaemonKeyProviderService $keyProviderService,
        DaemonServerRepositoryInterface $daemonRepository,
        PermissionCreationService $permissionService,
        PermissionRepositoryInterface $permissionRepository,
@ -84,6 +92,7 @@ class SubuserUpdateService
    ) {
        $this->connection = $connection;
        $this->daemonRepository = $daemonRepository;
+        $this->keyProviderService = $keyProviderService;
        $this->permissionRepository = $permissionRepository;
        $this->permissionService = $permissionService;
        $this->repository = $repository;
@ -106,12 +115,11 @@ class SubuserUpdateService

        $this->connection->beginTransaction();
        $this->permissionRepository->deleteWhere([['subuser_id', '=', $subuser->id]]);
-        $daemonPermissions = $this->permissionService->handle($subuser->id, $permissions);
+        $this->permissionService->handle($subuser->id, $permissions);

        try {
-            $this->daemonRepository->setNode($subuser->server->node_id)->setAccessServer($subuser->server->uuid)
-                ->setSubuserKey($subuser->daemonSecret, $daemonPermissions);
-            $this->connection->commit();
+            $token = $this->keyProviderService->handle($subuser->server_id, $subuser->user_id, false);
+            $this->daemonRepository->setNode($subuser->server->node_id)->revokeAccessKey($token);
        } catch (RequestException $exception) {
            $this->connection->rollBack();
            $this->writer->warning($exception);
@ -121,5 +129,7 @@ class SubuserUpdateService
                'code' => is_null($response) ? 'E_CONN_REFUSED' : $response->getStatusCode(),
            ]));
        }
+
+        $this->connection->commit();
    }
 }