Merge branch 'develop' into feature/vuejs

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -132,7 +132,7 @@ class AppSettingsCommand extends Command
         );
 
         $selected = $this->config->get('queue.default', 'redis');
-        $this->variables['QUEUE_DRIVER'] = $this->option('queue') ?? $this->choice(
+        $this->variables['QUEUE_CONNECTION'] = $this->option('queue') ?? $this->choice(
             trans('command/messages.environment.app.queue_driver'),
             self::ALLOWED_QUEUE_DRIVERS,
             array_key_exists($selected, self::ALLOWED_QUEUE_DRIVERS) ? $selected : null

app/Contracts/Repository/ServerRepositoryInterface.php

@@ -103,10 +103,10 @@ interface ServerRepositoryInterface extends RepositoryInterface, SearchableInter
      *
      * @param \Pterodactyl\Models\User $user
      * @param int                      $level
-     * @param bool                     $paginate
+     * @param bool|int                 $paginate
      * @return \Illuminate\Pagination\LengthAwarePaginator|\Illuminate\Database\Eloquent\Collection
      */
-    public function filterUserAccessServers(User $user, int $level, bool $paginate = true);
+    public function filterUserAccessServers(User $user, int $level, $paginate = 25);
 
     /**
      * Return a server by UUID.

app/Extensions/PhraseAppTranslator.php

@@ -1,31 +0,0 @@
-<?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\Extensions;
-
-use Illuminate\Translation\Translator as LaravelTranslator;
-
-class PhraseAppTranslator extends LaravelTranslator
-{
-    /**
-     * Get the translation for the given key.
-     *
-     * @param string      $key
-     * @param array       $replace
-     * @param string|null $locale
-     * @param bool        $fallback
-     * @return string
-     */
-    public function get($key, array $replace = [], $locale = null, $fallback = true)
-    {
-        $key = substr($key, strpos($key, '.') + 1);
-
-        return "{{__phrase_${key}__}}";
-    }
-}

app/Http/Controllers/Admin/NodesController.php

@@ -263,7 +263,7 @@ class NodesController extends Controller
      */
     public function updateSettings(NodeFormRequest $request, Node $node)
     {
-        $this->updateService->handle($node, $request->normalize());
+        $this->updateService->handle($node, $request->normalize(), $request->input('reset_secret') === 'on');
         $this->alert->success(trans('admin/node.notices.node_updated'))->flash();
 
         return redirect()->route('admin.nodes.view.settings', $node->id)->withInput();
@@ -289,7 +289,7 @@ class NodesController extends Controller
      * Removes multiple individual allocations from a node.
      *
      * @param \Illuminate\Http\Request $request
-     * @param int $node
+     * @param int                      $node
      * @return \Illuminate\Http\Response
      *
      * @throws \Pterodactyl\Exceptions\Service\Allocation\ServerUsingAllocationException

app/Http/Controllers/Admin/Settings/MailController.php

@@ -2,10 +2,14 @@
 
 namespace Pterodactyl\Http\Controllers\Admin\Settings;
 
+use Exception;
 use Illuminate\View\View;
-use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Prologue\Alerts\AlertsMessageBag;
 use Illuminate\Contracts\Console\Kernel;
+use Pterodactyl\Notifications\MailTested;
+use Illuminate\Support\Facades\Notification;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Http\Controllers\Controller;
 use Illuminate\Contracts\Encryption\Encrypter;
@@ -81,13 +85,13 @@ class MailController extends Controller
      * Handle request to update SMTP mail settings.
      *
      * @param \Pterodactyl\Http\Requests\Admin\Settings\MailSettingsFormRequest $request
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\Response
      *
      * @throws DisplayException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function update(MailSettingsFormRequest $request): RedirectResponse
+    public function update(MailSettingsFormRequest $request): Response
     {
         if ($this->config->get('mail.driver') !== 'smtp') {
             throw new DisplayException('This feature is only available if SMTP is the selected email driver for the Panel.');
@@ -107,8 +111,25 @@ class MailController extends Controller
         }
 
         $this->kernel->call('queue:restart');
-        $this->alert->success('Mail settings have been updated successfully and the queue worker was restarted to apply these changes.')->flash();
 
-        return redirect()->route('admin.settings.mail');
+        return response('', 204);
+    }
+
+    /**
+     * Submit a request to send a test mail message.
+     *
+     * @param Request $request
+     * @return \Illuminate\Http\Response
+     */
+    public function test(Request $request): Response
+    {
+        try {
+            Notification::route('mail', $request->user()->email)
+                ->notify(new MailTested($request->user()));
+        } catch (Exception $exception) {
+            return response($exception->getMessage(), 500);
+        }
+
+        return response('', 204);
     }
 }

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/Auth/ForgotPasswordController.php

@@ -27,7 +27,7 @@ class ForgotPasswordController extends Controller
         // exist on the system.
         event(new FailedPasswordReset($request->ip(), $request->input('email')));
 
-        return $this->sendResetLinkResponse(Password::RESET_LINK_SENT);
+        return $this->sendResetLinkResponse($request, Password::RESET_LINK_SENT);
     }
 
     /**

app/Http/Controllers/Base/IndexController.php

@@ -56,7 +56,7 @@ class IndexController extends Controller
     public function index(Request $request)
     {
         $servers = $this->repository->setSearchTerm($request->input('query'))->filterUserAccessServers(
-            $request->user(), User::FILTER_LEVEL_ALL
+            $request->user(), User::FILTER_LEVEL_ALL, config('pterodactyl.paginate.frontend.servers')
         );
 
         return view('templates/base.core', ['servers' => $servers]);

app/Http/Requests/Api/Application/Locations/StoreLocationRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Pterodactyl\Http\Controllers\Api\Application\Locations;
+namespace Pterodactyl\Http\Requests\Api\Application\Locations;
 
 use Pterodactyl\Models\Location;
 use Pterodactyl\Services\Acl\Api\AdminAcl;

app/Http/Requests/Api/Application/Locations/UpdateLocationRequest.php

@@ -3,7 +3,6 @@
 namespace Pterodactyl\Http\Requests\Api\Application\Locations;
 
 use Pterodactyl\Models\Location;
-use Pterodactyl\Http\Controllers\Api\Application\Locations\StoreLocationRequest;
 
 class UpdateLocationRequest extends StoreLocationRequest
 {

app/Http/Requests/Api/Client/Servers/GetServerRequest.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Http\Requests\Api\Client\Servers;
 
-use Pterodactyl\Models\Server;
 use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
 
 class GetServerRequest extends ClientApiRequest
@@ -18,14 +17,4 @@ class GetServerRequest extends ClientApiRequest
     {
         return true;
     }
-
-    /**
-     * Determine if the user should even know that this server exists.
-     *
-     * @return bool
-     */
-    public function resourceExists(): bool
-    {
-        return $this->user()->can('view-server', $this->getModel(Server::class));
-    }
 }

app/Notifications/MailTested.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Pterodactyl\Notifications;
+
+use Pterodactyl\Models\User;
+use Illuminate\Notifications\Notification;
+use Illuminate\Notifications\Messages\MailMessage;
+
+class MailTested extends Notification
+{
+    /**
+     * @var \Pterodactyl\Models\User
+     */
+    private $user;
+
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+
+    public function via()
+    {
+        return ['mail'];
+    }
+
+    public function toMail()
+    {
+        return (new MailMessage)
+            ->subject('Pterodactyl Test Message')
+            ->greeting('Hello ' . $this->user->name . '!')
+            ->line('This is a test of the Pterodactyl mail system. You\'re good to go!');
+    }
+}

app/Providers/PhraseAppTranslationProvider.php

@@ -1,44 +0,0 @@
-<?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\Providers;
-
-use Pterodactyl\Extensions\PhraseAppTranslator;
-use Illuminate\Translation\TranslationServiceProvider;
-use Illuminate\Translation\Translator as IlluminateTranslator;
-
-class PhraseAppTranslationProvider extends TranslationServiceProvider
-{
-    /**
-     * Register the service provider.
-     */
-    public function register()
-    {
-        $this->registerLoader();
-
-        $this->app->singleton('translator', function ($app) {
-            $loader = $app['translation.loader'];
-
-            // When registering the translator component, we'll need to set the default
-            // locale as well as the fallback locale. So, we'll grab the application
-            // configuration so we can easily get both of these values from there.
-            $locale = $app['config']['app.locale'];
-
-            if ($app['config']['pterodactyl.lang.in_context']) {
-                $trans = new PhraseAppTranslator($loader, $locale);
-            } else {
-                $trans = new IlluminateTranslator($loader, $locale);
-            }
-
-            $trans->setFallback($app['config']['app.fallback_locale']);
-
-            return $trans;
-        });
-    }
-}

app/Repositories/Eloquent/ServerRepository.php

@@ -211,10 +211,10 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
      *
      * @param \Pterodactyl\Models\User $user
      * @param int                      $level
-     * @param bool                     $paginate
+     * @param bool|int                 $paginate
      * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator|\Illuminate\Database\Eloquent\Collection
      */
-    public function filterUserAccessServers(User $user, int $level, bool $paginate = true)
+    public function filterUserAccessServers(User $user, int $level, $paginate = 25)
     {
         $instance = $this->getBuilder()->select($this->getColumns())->with(['user', 'node', 'allocation']);
 
@@ -240,7 +240,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
 
         $instance->search($this->getSearchTerm());
 
-        return $paginate ? $instance->paginate(25) : $instance->get();
+        return $paginate ? $instance->paginate($paginate) : $instance->get();
     }
 
     /**

app/Services/Nodes/NodeUpdateService.php

@@ -50,24 +50,41 @@ class NodeUpdateService
      *
      * @param \Pterodactyl\Models\Node $node
      * @param array                    $data
+     * @param bool                     $resetToken
+     *
      * @return \Pterodactyl\Models\Node
      *
-     * @throws \Pterodactyl\Exceptions\DisplayException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+     * @throws \Pterodactyl\Exceptions\Service\Node\ConfigurationNotPersistedException
      */
-    public function handle(Node $node, array $data)
+    public function handle(Node $node, array $data, bool $resetToken = false)
     {
-        if (! is_null(array_get($data, 'reset_secret'))) {
+        if ($resetToken) {
             $data['daemonSecret'] = str_random(Node::DAEMON_SECRET_LENGTH);
-            unset($data['reset_secret']);
         }
 
         $this->connection->beginTransaction();
+
+        /** @var \Pterodactyl\Models\Node $updatedModel */
         $updatedModel = $this->repository->update($node->id, $data);
 
         try {
-            $this->configRepository->setNode($updatedModel)->update();
+            if ($resetToken) {
+                // We need to clone the new model and set it's authentication token to be the
+                // old one so we can connect. Then we will pass the new token through as an
+                // override on the call.
+                $cloned = $updatedModel->replicate(['daemonSecret']);
+                $cloned->setAttribute('daemonSecret', $node->getAttribute('daemonSecret'));
+
+                $this->configRepository->setNode($cloned)->update([
+                    'keys' => [$data['daemonSecret']],
+                ]);
+            } else {
+                $this->configRepository->setNode($updatedModel)->update();
+            }
+
             $this->connection->commit();
         } catch (RequestException $exception) {
             // Failed to connect to the Daemon. Let's go ahead and save the configuration

app/Services/Sftp/AuthenticateUsingPasswordService.php

@@ -102,6 +102,7 @@ class AuthenticateUsingPasswordService
         return [
             'server' => $server->uuid,
             'token' => $this->keyProviderService->handle($server, $user),
+            'permissions' => $permissions ?? ['*'],
         ];
     }
 }