Final adjustments to Daemon <-> Panel communication change

app/Services/DaemonKeys/DaemonKeyCreationService.php

@@ -0,0 +1,91 @@
+<?php
+/*
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Pterodactyl\Services\DaemonKeys;
+
+use Carbon\Carbon;
+use Webmozart\Assert\Assert;
+use Illuminate\Contracts\Config\Repository as ConfigRepository;
+use Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface;
+
+class DaemonKeyCreationService
+{
+    /**
+     * @var \Carbon\Carbon
+     */
+    protected $carbon;
+
+    /**
+     * @var \Illuminate\Contracts\Config\Repository
+     */
+    protected $config;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * DaemonKeyCreationService constructor.
+     *
+     * @param \Carbon\Carbon                                                 $carbon
+     * @param \Illuminate\Contracts\Config\Repository                        $config
+     * @param \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface $repository
+     */
+    public function __construct(
+        Carbon $carbon,
+        ConfigRepository $config,
+        DaemonKeyRepositoryInterface $repository
+    ) {
+        $this->carbon = $carbon;
+        $this->config = $config;
+        $this->repository = $repository;
+    }
+
+    /**
+     * Create a new daemon key to be used when connecting to a daemon.
+     *
+     * @param int $server
+     * @param int $user
+     * @return string
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     */
+    public function handle($server, $user)
+    {
+        Assert::integerish($server, 'First argument passed to handle must be an integer, received %s.');
+        Assert::integerish($user, 'Second argument passed to handle must be an integer, received %s.');
+
+        $secret = DaemonKeyRepositoryInterface::INTERNAL_KEY_IDENTIFIER . str_random(40);
+
+        $this->repository->withoutFresh()->create([
+            'user_id' => $user,
+            'server_id' => $server,
+            'secret' => $secret,
+            'expires_at' => $this->carbon->now()->addMinutes($this->config->get('pterodactyl.api.key_expire_time'))->toDateTimeString(),
+        ]);
+
+        return $secret;
+    }
+}

app/Services/DaemonKeys/DaemonKeyDeletionService.php

@@ -0,0 +1,124 @@
+<?php
+/*
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Pterodactyl\Services\DaemonKeys;
+
+use Illuminate\Log\Writer;
+use Webmozart\Assert\Assert;
+use Pterodactyl\Models\Server;
+use GuzzleHttp\Exception\RequestException;
+use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Exceptions\DisplayException;
+use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
+use Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface;
+use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
+
+class DaemonKeyDeletionService
+{
+    /**
+     * @var \Illuminate\Database\ConnectionInterface
+     */
+    protected $connection;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
+     */
+    protected $daemonRepository;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
+     */
+    protected $serverRepository;
+
+    /**
+     * @var \Illuminate\Log\Writer
+     */
+    protected $writer;
+
+    /**
+     * DaemonKeyDeletionService constructor.
+     *
+     * @param \Illuminate\Database\ConnectionInterface                           $connection
+     * @param \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface     $repository
+     * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonRepository
+     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface        $serverRepository
+     * @param \Illuminate\Log\Writer                                             $writer
+     */
+    public function __construct(
+        ConnectionInterface $connection,
+        DaemonKeyRepositoryInterface $repository,
+        DaemonServerRepositoryInterface $daemonRepository,
+        ServerRepositoryInterface $serverRepository,
+        Writer $writer
+    ) {
+        $this->connection = $connection;
+        $this->daemonRepository = $daemonRepository;
+        $this->repository = $repository;
+        $this->serverRepository = $serverRepository;
+        $this->writer = $writer;
+    }
+
+    /**
+     * @param \Pterodactyl\Models\Server|int $server
+     * @param int                            $user
+     *
+     * @throws \Pterodactyl\Exceptions\DisplayException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function handle($server, $user)
+    {
+        Assert::integerish($user, 'Second argument passed to handle must be an integer, received %s.');
+
+        if (! $server instanceof Server) {
+            $server = $this->serverRepository->find($server);
+        }
+
+        $this->connection->beginTransaction();
+        $key = $this->repository->findFirstWhere([
+            ['user_id', '=', $user],
+            ['server_id', '=', $server->id],
+        ]);
+
+        $this->repository->delete($key->id);
+
+        try {
+            $this->daemonRepository->setNode($server->node_id)->revokeAccessKey($key->secret);
+        } catch (RequestException $exception) {
+            $response = $exception->getResponse();
+            $this->connection->rollBack();
+            $this->writer->warning($exception);
+
+            throw new DisplayException(trans('admin/server.exceptions.daemon_exception', [
+                'code' => is_null($response) ? 'E_CONN_REFUSED' : $response->getStatusCode(),
+            ]));
+        }
+
+        $this->connection->commit();
+    }
+}

app/Services/DaemonKeys/DaemonKeyProviderService.php

@@ -0,0 +1,92 @@
+<?php
+/*
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Pterodactyl\Services\DaemonKeys;
+
+use Carbon\Carbon;
+use Webmozart\Assert\Assert;
+use Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface;
+
+class DaemonKeyProviderService
+{
+    /**
+     * @var \Carbon\Carbon
+     */
+    protected $carbon;
+
+    /**
+     * @var \Pterodactyl\Services\DaemonKeys\DaemonKeyUpdateService
+     */
+    protected $keyUpdateService;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * GetDaemonKeyService constructor.
+     *
+     * @param \Carbon\Carbon                                                 $carbon
+     * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyUpdateService        $keyUpdateService
+     * @param \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface $repository
+     */
+    public function __construct(
+        Carbon $carbon,
+        DaemonKeyUpdateService $keyUpdateService,
+        DaemonKeyRepositoryInterface $repository
+    ) {
+        $this->carbon = $carbon;
+        $this->keyUpdateService = $keyUpdateService;
+        $this->repository = $repository;
+    }
+
+    /**
+     * Get the access key for a user on a specific server.
+     *
+     * @param int  $server
+     * @param int  $user
+     * @param bool $updateIfExpired
+     * @return string
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function handle($server, $user, $updateIfExpired = true)
+    {
+        Assert::integerish($server, 'First argument passed to handle must be an integer, received %s.');
+        Assert::integerish($user, 'Second argument passed to handle must be an integer, received %s.');
+
+        $key = $this->repository->findFirstWhere([
+            ['user_id', '=', $user],
+            ['server_id', '=', $server],
+        ]);
+
+        if (! $updateIfExpired || max($this->carbon->now()->diffInSeconds($key->expires_at, false), 0) > 0) {
+            return $key->secret;
+        }
+
+        return $this->keyUpdateService->handle($key->id);
+    }
+}

app/Services/DaemonKeys/DaemonKeyUpdateService.php

@@ -25,21 +25,19 @@
 namespace Pterodactyl\Services\DaemonKeys;
 
 use Carbon\Carbon;
-use Pterodactyl\Models\DaemonKey;
+use Webmozart\Assert\Assert;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
 use Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface;
 
 class DaemonKeyUpdateService
 {
-    const INTERNAL_TOKEN_IDENTIFIER = 'i_';
-
     /**
      * @var \Carbon\Carbon
      */
     protected $carbon;
 
     /**
-     * @var
+     * @var \Illuminate\Contracts\Config\Repository
      */
     protected $config;
 
@@ -68,7 +66,7 @@ class DaemonKeyUpdateService
     /**
      * Update a daemon key to expire the previous one.
      *
-     * @param \Pterodactyl\Models\DaemonKey|int $key
+     * @param int $key
      * @return string
      *
      * @throws \RuntimeException
@@ -77,15 +75,12 @@ class DaemonKeyUpdateService
      */
     public function handle($key)
     {
-        if ($key instanceof DaemonKey) {
-            $key = $key->id;
-        }
-
-        $secret = self::INTERNAL_TOKEN_IDENTIFIER . str_random(40);
+        Assert::integerish($key, 'First argument passed to handle must be an integer, received %s.');
 
+        $secret = DaemonKeyRepositoryInterface::INTERNAL_KEY_IDENTIFIER . str_random(40);
         $this->repository->withoutFresh()->update($key, [
             'secret' => $secret,
-            'expires_at' => $this->carbon->now()->addMinutes($this->config->get('pterodactyl.api.key_expire_time')),
+            'expires_at' => $this->carbon->now()->addMinutes($this->config->get('pterodactyl.api.key_expire_time'))->toDateTimeString(),
         ]);
 
         return $secret;