Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

Author: DaneEveritt

CHANGELOG.md

@@ -28,6 +28,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 * Server creation page now only asks for a node to deploy to, rather than requiring a location and then a node.
 * Database passwords are now hidden by default and will only show if clicked on. In addition, database view in ACP now indicates that passwords must be viewed on the front-end.
 * Localhost cannot be used as a connection address in the environment configuration script. `127.0.0.1` is allowed.
+* Application locale can now be quickly set using an environment variable `APP_LOCALE` rather than having to edit core files.
 
 ### Fixed
 * Unable to change the daemon secret for a server via the Admin CP.

app/Contracts/Repository/ScheduleRepositoryInterface.php

@@ -9,23 +9,28 @@
 
 namespace Pterodactyl\Contracts\Repository;
 
+use Pterodactyl\Models\Schedule;
+use Illuminate\Support\Collection;
+
 interface ScheduleRepositoryInterface extends RepositoryInterface
 {
     /**
      * Return all of the schedules for a given server.
      *
      * @param int $server
-     * @return \Illuminate\Database\Eloquent\Collection
+     * @return \Illuminate\Support\Collection
      */
-    public function getServerSchedules($server);
+    public function findServerSchedules(int $server): Collection;
 
     /**
      * Return a schedule model with all of the associated tasks as a relationship.
      *
      * @param int $schedule
-     * @return \Illuminate\Support\Collection
+     * @return \Pterodactyl\Models\Schedule
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getScheduleWithTasks($schedule);
+    public function getScheduleWithTasks(int $schedule): Schedule;
 
     /**
      * Return all of the schedules that should be processed.

app/Contracts/Repository/SubuserRepositoryInterface.php

@@ -1,35 +1,28 @@
 <?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\Contracts\Repository;
 
+use Pterodactyl\Models\Subuser;
+
 interface SubuserRepositoryInterface extends RepositoryInterface
 {
     /**
      * Return a subuser with the associated server relationship.
      *
-     * @param int $id
+     * @param \Pterodactyl\Models\Subuser $subuser
+     * @param bool                        $refresh
      * @return \Pterodactyl\Models\Subuser
-     *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithServer($id);
+    public function getWithServer(Subuser $subuser, bool $refresh = false): Subuser;
 
     /**
      * Return a subuser with the associated permissions relationship.
      *
-     * @param int $id
-     * @return \Illuminate\Database\Eloquent\Collection
-     *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @param \Pterodactyl\Models\Subuser $subuser
+     * @param bool                        $refresh
+     * @return \Pterodactyl\Models\Subuser
      */
-    public function getWithPermissions($id);
+    public function getWithPermissions(Subuser $subuser, bool $refresh = false): Subuser;
 
     /**
      * Return a subuser and associated permissions given a user_id and server_id.

app/Http/Controllers/Server/ConsoleController.php

@@ -1,15 +1,9 @@
 <?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\Server;
 
-use Illuminate\Contracts\Session\Session;
+use Illuminate\View\View;
+use Illuminate\Http\Request;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Traits\Controllers\JavascriptInjection;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
@@ -23,35 +17,27 @@ class ConsoleController extends Controller
      */
     protected $config;
 
-    /**
-     * @var \Illuminate\Contracts\Session\Session
-     */
-    protected $session;
-
     /**
      * ConsoleController constructor.
      *
      * @param \Illuminate\Contracts\Config\Repository $config
-     * @param \Illuminate\Contracts\Session\Session   $session
      */
-    public function __construct(
-        ConfigRepository $config,
-        Session $session
-    ) {
+    public function __construct(ConfigRepository $config)
+    {
         $this->config = $config;
-        $this->session = $session;
     }
 
     /**
      * Render server index page with the console and power options.
      *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @param \Illuminate\Http\Request $request
+     * @return \Illuminate\View\View
      */
-    public function index()
+    public function index(Request $request): View
     {
-        $server = $this->session->get('server_data.model');
+        $server = $request->attributes->get('server');
 
-        $this->injectJavascript([
+        $this->setRequest($request)->injectJavascript([
             'meta' => [
                 'saveFile' => route('server.files.save', $server->uuidShort),
                 'csrfToken' => csrf_token(),
@@ -68,11 +54,12 @@ public function index()
     /**
      * Render a stand-alone console in the browser.
      *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @param \Illuminate\Http\Request $request
+     * @return \Illuminate\View\View
      */
-    public function console()
+    public function console(Request $request): View
     {
-        $this->injectJavascript(['config' => [
+        $this->setRequest($request)->injectJavascript(['config' => [
             'console_count' => $this->config->get('pterodactyl.console.count'),
             'console_freq' => $this->config->get('pterodactyl.console.frequency'),
         ]]);

app/Http/Controllers/Server/Files/DownloadController.php

@@ -9,8 +9,9 @@
 
 namespace Pterodactyl\Http\Controllers\Server\Files;
 
+use Illuminate\Http\Request;
 use Illuminate\Cache\Repository;
-use Illuminate\Contracts\Session\Session;
+use Illuminate\Http\RedirectResponse;
 use Pterodactyl\Http\Controllers\Controller;
 
 class DownloadController extends Controller
@@ -20,42 +21,35 @@ class DownloadController extends Controller
      */
     protected $cache;
 
-    /**
-     * @var \Illuminate\Contracts\Session\Session
-     */
-    protected $session;
-
     /**
      * DownloadController constructor.
      *
-     * @param \Illuminate\Cache\Repository          $cache
-     * @param \Illuminate\Contracts\Session\Session $session
+     * @param \Illuminate\Cache\Repository $cache
      */
-    public function __construct(Repository $cache, Session $session)
+    public function __construct(Repository $cache)
     {
         $this->cache = $cache;
-        $this->session = $session;
     }
 
     /**
      * Setup a unique download link for a user to download a file from.
      *
-     * @param string $uuid
-     * @param string $file
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @param \Illuminate\Http\Request $request
+     * @param string                   $uuid
+     * @param string                   $file
+     * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function index($uuid, $file)
+    public function index(Request $request, string $uuid, string $file): RedirectResponse
     {
-        $server = $this->session->get('server_data.model');
+        $server = $request->attributes->get('server');
         $this->authorize('download-files', $server);
 
         $token = str_random(40);
+        $node = $server->getRelation('node');
         $this->cache->tags(['Server:Downloads'])->put($token, ['server' => $server->uuid, 'path' => $file], 5);
 
-        return redirect(sprintf(
-            '%s://%s:%s/v1/server/file/download/%s', $server->node->scheme, $server->node->fqdn, $server->node->daemonListen, $token
-        ));
+        return redirect(sprintf('%s://%s:%s/v1/server/file/download/%s', $node->scheme, $node->fqdn, $node->daemonListen, $token));
     }
 }

app/Http/Controllers/Server/Files/FileActionsController.php

@@ -9,15 +9,14 @@
 
 namespace Pterodactyl\Http\Controllers\Server\Files;
 
-use Illuminate\Log\Writer;
+use Illuminate\View\View;
 use Illuminate\Http\Request;
-use Illuminate\Contracts\Session\Session;
 use GuzzleHttp\Exception\RequestException;
-use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Traits\Controllers\JavascriptInjection;
 use Pterodactyl\Http\Requests\Server\UpdateFileContentsFormRequest;
 use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
+use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
 
 class FileActionsController extends Controller
 {
@@ -26,30 +25,16 @@ class FileActionsController extends Controller
     /**
      * @var \Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface
      */
-    protected $fileRepository;
-
-    /**
-     * @var \Illuminate\Contracts\Session\Session
-     */
-    protected $session;
-
-    /**
-     * @var \Illuminate\Log\Writer
-     */
-    protected $writer;
+    protected $repository;
 
     /**
      * FileActionsController constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface $fileRepository
-     * @param \Illuminate\Contracts\Session\Session                            $session
-     * @param \Illuminate\Log\Writer                                           $writer
+     * @param \Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface $repository
      */
-    public function __construct(FileRepositoryInterface $fileRepository, Session $session, Writer $writer)
+    public function __construct(FileRepositoryInterface $repository)
     {
-        $this->fileRepository = $fileRepository;
-        $this->session = $session;
-        $this->writer = $writer;
+        $this->repository = $repository;
     }
 
     /**
@@ -60,12 +45,12 @@ public function __construct(FileRepositoryInterface $fileRepository, Session $se
      *
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function index(Request $request)
+    public function index(Request $request): View
     {
-        $server = $this->session->get('server_data.model');
+        $server = $request->attributes->get('server');
         $this->authorize('list-files', $server);
 
-        $this->injectJavascript([
+        $this->setRequest($request)->injectJavascript([
             'meta' => [
                 'directoryList' => route('server.files.directory-list', $server->uuidShort),
                 'csrftoken' => csrf_token(),
@@ -92,10 +77,10 @@ public function index(Request $request)
      *
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create(Request $request)
+    public function create(Request $request): View
     {
-        $this->authorize('create-files', $this->session->get('server_data.model'));
-        $this->injectJavascript();
+        $this->authorize('create-files', $request->attributes->get('server'));
+        $this->setRequest($request)->injectJavascript();
 
         return view('server.files.add', [
             'directory' => (in_array($request->get('dir'), [null, '/', ''])) ? '' : trim($request->get('dir'), '/') . '/',
@@ -114,31 +99,24 @@ public function create(Request $request)
      * @throws \Pterodactyl\Exceptions\DisplayException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function update(UpdateFileContentsFormRequest $request, $uuid, $file)
+    public function update(UpdateFileContentsFormRequest $request, string $uuid, string $file): View
     {
-        $server = $this->session->get('server_data.model');
-        $this->authorize('edit-files', $server);
+        $server = $request->attributes->get('server');
 
         $dirname = pathinfo($file, PATHINFO_DIRNAME);
         try {
-            $content = $this->fileRepository->setNode($server->node_id)
-                ->setAccessServer($server->uuid)
-                ->setAccessToken($this->session->get('server_data.token'))
+            $content = $this->repository->setNode($server->node_id)->setAccessServer($server->uuid)
+                ->setAccessToken($request->attributes->get('server_token'))
                 ->getContent($file);
         } catch (RequestException $exception) {
-            $response = $exception->getResponse();
-            $this->writer->warning($exception);
-
-            throw new DisplayException(trans('exceptions.daemon_connection_failed', [
-                'code' => is_null($response) ? 'E_CONN_REFUSED' : $response->getStatusCode(),
-            ]));
+            throw new DaemonConnectionException($exception);
         }
 
-        $this->injectJavascript(['stat' => $request->getStats()]);
+        $this->setRequest($request)->injectJavascript(['stat' => $request->attributes->get('file_stats')]);
 
         return view('server.files.edit', [
             'file' => $file,
-            'stat' => $request->getStats(),
+            'stat' => $request->attributes->get('file_stats'),
             'contents' => $content,
             'directory' => (in_array($dirname, ['.', './', '/'])) ? '/' : trim($dirname, '/') . '/',
         ]);