Merge branch 'develop' into feature/vuejs

app/Http/Controllers/Api/Application/Locations/LocationController.php

@@ -14,6 +14,7 @@ use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
 use Pterodactyl\Http\Requests\Api\Application\Locations\GetLocationRequest;
 use Pterodactyl\Http\Requests\Api\Application\Locations\GetLocationsRequest;
 use Pterodactyl\Http\Requests\Api\Application\Locations\DeleteLocationRequest;
+use Pterodactyl\Http\Requests\Api\Application\Locations\StoreLocationRequest;
 use Pterodactyl\Http\Requests\Api\Application\Locations\UpdateLocationRequest;
 
 class LocationController extends ApplicationApiController
@@ -92,7 +93,7 @@ class LocationController extends ApplicationApiController
      * Store a new location on the Panel and return a HTTP/201 response code with the
      * new location attached.
      *
-     * @param \Pterodactyl\Http\Controllers\Api\Application\Locations\StoreLocationRequest $request
+     * @param \Pterodactyl\Http\Requests\Api\Application\Locations\StoreLocationRequest $request
      * @return \Illuminate\Http\JsonResponse
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException

app/Http/Controllers/Api/Application/Nodes/AllocationController.php

@@ -71,14 +71,14 @@ class AllocationController extends ApplicationApiController
      * Store new allocations for a given node.
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Allocations\StoreAllocationRequest $request
-     * @return array
+     * @return \Illuminate\Http\Response
      *
      * @throws \Pterodactyl\Exceptions\Service\Allocation\CidrOutOfRangeException
      * @throws \Pterodactyl\Exceptions\Service\Allocation\InvalidPortMappingException
      * @throws \Pterodactyl\Exceptions\Service\Allocation\PortOutOfRangeException
      * @throws \Pterodactyl\Exceptions\Service\Allocation\TooManyPortsInRangeException
      */
-    public function store(StoreAllocationRequest $request): array
+    public function store(StoreAllocationRequest $request): Response
     {
         $this->assignmentService->handle($request->getModel(Node::class), $request->validated());
 

app/Http/Controllers/Api/Application/Nodes/NodeController.php

@@ -125,7 +125,7 @@ class NodeController extends ApplicationApiController
     public function update(UpdateNodeRequest $request): array
     {
         $node = $this->updateService->handle(
-            $request->getModel(Node::class), $request->validated()
+            $request->getModel(Node::class), $request->validated(), $request->input('reset_secret') === true
         );
 
         return $this->fractal->item($node)

app/Http/Controllers/Api/Client/Servers/CommandController.php

@@ -7,7 +7,6 @@ use Pterodactyl\Models\Server;
 use Psr\Http\Message\ResponseInterface;
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Exception\RequestException;
-use Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService;
 use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
 use Pterodactyl\Http\Requests\Api\Client\Servers\SendCommandRequest;
 use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
@@ -16,11 +15,6 @@ use Symfony\Component\HttpKernel\Exception\PreconditionFailedHttpException;
 
 class CommandController extends ClientApiController
 {
-    /**
-     * @var \Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService
-     */
-    private $keyProviderService;
-
     /**
      * @var \Pterodactyl\Contracts\Repository\Daemon\CommandRepositoryInterface
      */
@@ -30,13 +24,11 @@ class CommandController extends ClientApiController
      * CommandController constructor.
      *
      * @param \Pterodactyl\Contracts\Repository\Daemon\CommandRepositoryInterface $repository
-     * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService           $keyProviderService
      */
-    public function __construct(CommandRepositoryInterface $repository, DaemonKeyProviderService $keyProviderService)
+    public function __construct(CommandRepositoryInterface $repository)
     {
         parent::__construct();
 
-        $this->keyProviderService = $keyProviderService;
         $this->repository = $repository;
     }
 
@@ -46,14 +38,12 @@ class CommandController extends ClientApiController
      * @param \Pterodactyl\Http\Requests\Api\Client\Servers\SendCommandRequest $request
      * @return \Illuminate\Http\Response
      *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      */
     public function index(SendCommandRequest $request): Response
     {
         $server = $request->getModel(Server::class);
-        $token = $this->keyProviderService->handle($server, $request->user());
+        $token = $request->attributes->get('server_token');
 
         try {
             $this->repository->setServer($server)

app/Http/Controllers/Api/Client/Servers/PowerController.php

@@ -4,18 +4,12 @@ namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
 
 use Illuminate\Http\Response;
 use Pterodactyl\Models\Server;
-use Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService;
 use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
 use Pterodactyl\Http\Requests\Api\Client\Servers\SendPowerRequest;
 use Pterodactyl\Contracts\Repository\Daemon\PowerRepositoryInterface;
 
 class PowerController extends ClientApiController
 {
-    /**
-     * @var \Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService
-     */
-    private $keyProviderService;
-
     /**
      * @var \Pterodactyl\Contracts\Repository\Daemon\PowerRepositoryInterface
      */
@@ -24,14 +18,12 @@ class PowerController extends ClientApiController
     /**
      * PowerController constructor.
      *
-     * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService         $keyProviderService
      * @param \Pterodactyl\Contracts\Repository\Daemon\PowerRepositoryInterface $repository
      */
-    public function __construct(DaemonKeyProviderService $keyProviderService, PowerRepositoryInterface $repository)
+    public function __construct(PowerRepositoryInterface $repository)
     {
         parent::__construct();
 
-        $this->keyProviderService = $keyProviderService;
         $this->repository = $repository;
     }
 
@@ -41,14 +33,12 @@ class PowerController extends ClientApiController
      * @param \Pterodactyl\Http\Requests\Api\Client\Servers\SendPowerRequest $request
      * @return \Illuminate\Http\Response
      *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Repository\Daemon\InvalidPowerSignalException
      */
     public function index(SendPowerRequest $request): Response
     {
         $server = $request->getModel(Server::class);
-        $token = $this->keyProviderService->handle($server, $request->user());
+        $token = $request->attributes->get('server_token');
 
         $this->repository->setServer($server)->setToken($token)->sendSignal($request->input('signal'));
 

app/Http/Controllers/Api/Remote/EggInstallController.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace Pterodactyl\Http\Controllers\Api\Remote;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Services\Servers\EnvironmentService;
+use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
+
+class EggInstallController extends Controller
+{
+    /**
+     * @var \Pterodactyl\Services\Servers\EnvironmentService
+     */
+    private $environment;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
+     */
+    private $repository;
+
+    /**
+     * EggInstallController constructor.
+     *
+     * @param \Pterodactyl\Services\Servers\EnvironmentService            $environment
+     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
+     */
+    public function __construct(EnvironmentService $environment, ServerRepositoryInterface $repository)
+    {
+        $this->environment = $environment;
+        $this->repository = $repository;
+    }
+
+    /**
+     * Handle request to get script and installation information for a server
+     * that is being created on the node.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param string                   $uuid
+     * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function index(Request $request, string $uuid): JsonResponse
+    {
+        $node = $request->attributes->get('node');
+
+        /** @var \Pterodactyl\Models\Server $server */
+        $server = $this->repository->findFirstWhere([
+            ['uuid', '=', $uuid],
+            ['node_id', '=', $node->id],
+        ]);
+
+        $this->repository->loadEggRelations($server);
+        $egg = $server->getRelation('egg');
+
+        return response()->json([
+            'scripts' => [
+                'install' => ! $egg->copy_script_install ? null : str_replace(["\r\n", "\n", "\r"], "\n", $egg->copy_script_install),
+                'privileged' => $egg->script_is_privileged,
+            ],
+            'config' => [
+                'container' => $egg->copy_script_container,
+                'entry' => $egg->copy_script_entry,
+            ],
+            'env' => $this->environment->handle($server),
+        ]);
+    }
+}

app/Http/Controllers/Api/Remote/EggRetrievalController.php

@@ -0,0 +1,74 @@
+<?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\Http\Controllers\Api\Remote;
+
+use Illuminate\Http\JsonResponse;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Services\Eggs\EggConfigurationService;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+
+class EggRetrievalController extends Controller
+{
+    /**
+     * @var \Pterodactyl\Services\Eggs\EggConfigurationService
+     */
+    protected $configurationFileService;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * OptionUpdateController constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
+     * @param \Pterodactyl\Services\Eggs\EggConfigurationService       $configurationFileService
+     */
+    public function __construct(
+        EggRepositoryInterface $repository,
+        EggConfigurationService $configurationFileService
+    ) {
+        $this->configurationFileService = $configurationFileService;
+        $this->repository = $repository;
+    }
+
+    /**
+     * Return a JSON array of Eggs and the SHA1 hash of their configuration file.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function index(): JsonResponse
+    {
+        $eggs = $this->repository->getAllWithCopyAttributes();
+
+        $response = [];
+        $eggs->each(function ($egg) use (&$response) {
+            $response[$egg->uuid] = sha1(json_encode($this->configurationFileService->handle($egg)));
+        });
+
+        return response()->json($response);
+    }
+
+    /**
+     * Return the configuration file for a single Egg for the Daemon.
+     *
+     * @param string $uuid
+     * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function download(string $uuid): JsonResponse
+    {
+        $option = $this->repository->getWithCopyAttributes($uuid, 'uuid');
+
+        return response()->json($this->configurationFileService->handle($option));
+    }
+}

app/Http/Controllers/Api/Remote/SftpController.php

@@ -0,0 +1,91 @@
+<?php
+
+namespace Pterodactyl\Http\Controllers\Api\Remote;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Http\JsonResponse;
+use Pterodactyl\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\ThrottlesLogins;
+use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
+use Pterodactyl\Services\Sftp\AuthenticateUsingPasswordService;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Pterodactyl\Http\Requests\Api\Remote\SftpAuthenticationFormRequest;
+
+class SftpController extends Controller
+{
+    use ThrottlesLogins;
+
+    /**
+     * @var \Pterodactyl\Services\Sftp\AuthenticateUsingPasswordService
+     */
+    private $authenticationService;
+
+    /**
+     * SftpController constructor.
+     *
+     * @param \Pterodactyl\Services\Sftp\AuthenticateUsingPasswordService $authenticationService
+     */
+    public function __construct(AuthenticateUsingPasswordService $authenticationService)
+    {
+        $this->authenticationService = $authenticationService;
+    }
+
+    /**
+     * Authenticate a set of credentials and return the associated server details
+     * for a SFTP connection on the daemon.
+     *
+     * @param \Pterodactyl\Http\Requests\Api\Remote\SftpAuthenticationFormRequest $request
+     * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     */
+    public function index(SftpAuthenticationFormRequest $request): JsonResponse
+    {
+        $parts = explode('.', strrev($request->input('username')), 2);
+        $connection = [
+            'username' => strrev(array_get($parts, 1)),
+            'server' => strrev(array_get($parts, 0)),
+        ];
+
+        $this->incrementLoginAttempts($request);
+
+        if ($this->hasTooManyLoginAttempts($request)) {
+            return response()->json([
+                'error' => 'Logins throttled.',
+            ], Response::HTTP_TOO_MANY_REQUESTS);
+        }
+
+        try {
+            $data = $this->authenticationService->handle(
+                $connection['username'],
+                $request->input('password'),
+                object_get($request->attributes->get('node'), 'id', 0),
+                empty($connection['server']) ? null : $connection['server']
+            );
+
+            $this->clearLoginAttempts($request);
+        } catch (BadRequestHttpException $exception) {
+            return response()->json([
+                'error' => 'The server you are trying to access is not installed or is suspended.',
+            ], Response::HTTP_BAD_REQUEST);
+        } catch (RecordNotFoundException $exception) {
+            return response()->json([
+                'error' => 'Unable to locate a resource using the username and password provided.',
+            ], Response::HTTP_NOT_FOUND);
+        }
+
+        return response()->json($data);
+    }
+
+    /**
+     * Get the throttle key for the given request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return string
+     */
+    protected function throttleKey(Request $request)
+    {
+        return strtolower(array_get(explode('.', $request->input('username')), 0) . '|' . $request->ip());
+    }
+}

app/Http/Controllers/Api/Remote/ValidateKeyController.php

@@ -0,0 +1,100 @@
+<?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\Http\Controllers\Api\Remote;
+
+use Spatie\Fractal\Fractal;
+use Illuminate\Http\Response;
+use Pterodactyl\Http\Controllers\Controller;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Foundation\Testing\HttpException;
+use League\Fractal\Serializer\JsonApiSerializer;
+use Pterodactyl\Transformers\Daemon\ApiKeyTransformer;
+use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface;
+
+class ValidateKeyController extends Controller
+{
+    /**
+     * @var \Illuminate\Contracts\Foundation\Application
+     */
+    protected $app;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface
+     */
+    protected $daemonKeyRepository;
+
+    /**
+     * @var \Spatie\Fractal\Fractal
+     */
+    protected $fractal;
+
+    /**
+     * ValidateKeyController constructor.
+     *
+     * @param \Illuminate\Contracts\Foundation\Application                   $app
+     * @param \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface $daemonKeyRepository
+     * @param \Spatie\Fractal\Fractal                                        $fractal
+     */
+    public function __construct(
+        Application $app,
+        DaemonKeyRepositoryInterface $daemonKeyRepository,
+        Fractal $fractal
+    ) {
+        $this->app = $app;
+        $this->daemonKeyRepository = $daemonKeyRepository;
+        $this->fractal = $fractal;
+    }
+
+    /**
+     * Return the server(s) and permissions associated with an API key.
+     *
+     * @param string $token
+     * @return array
+     *
+     * @throws \Illuminate\Foundation\Testing\HttpException
+     */
+    public function index($token)
+    {
+        if (! starts_with($token, DaemonKeyRepositoryInterface::INTERNAL_KEY_IDENTIFIER)) {
+            throw new HttpException(Response::HTTP_NOT_IMPLEMENTED);
+        }
+
+        try {
+            $key = $this->daemonKeyRepository->getKeyWithServer($token);
+        } catch (RecordNotFoundException $exception) {
+            throw new NotFoundHttpException;
+        }
+
+        if ($key->getRelation('server')->suspended || $key->getRelation('server')->installed !== 1) {
+            throw new NotFoundHttpException;
+        }
+
+        return $this->fractal->item($key, $this->app->make(ApiKeyTransformer::class), 'server')
+            ->serializeWith(JsonApiSerializer::class)
+            ->toArray();
+    }
+}