Merge branch 'develop' of https://github.com/stanjg/panel into feature/user-specific-language

2018-06-01 15:58:09 +02:00 · 2018-06-01 15:58:09 +02:00 · 3bb9e5e8a8
commit 3bb9e5e8a8
parent 28e34f77b6 d7ab24a8ce
199 changed files with 2390 additions and 1179 deletions
--- a/app/Http/Controllers/API/Remote/EggRetrievalController.php
+++ b/app/Http/Controllers/API/Remote/EggRetrievalController.php
@ -41,7 +41,7 @@ class EggRetrievalController extends Controller
    }

    /**
-     * Return a JSON array of Eggs and the SHA1 hash of thier configuration file.
+     * Return a JSON array of Eggs and the SHA1 hash of their configuration file.
     *
     * @return \Illuminate\Http\JsonResponse
     */
--- a/app/Http/Controllers/Admin/ApiController.php
+++ b/app/Http/Controllers/Admin/ApiController.php
@ -65,6 +65,7 @@ class ApiController extends Controller
     * Render view allowing an admin to create a new application API key.
     *
     * @return \Illuminate\View\View
+     * @throws \ReflectionException
     */
    public function create(): View
    {
--- a/app/Http/Controllers/Admin/LocationController.php
+++ b/app/Http/Controllers/Admin/LocationController.php
@ -103,7 +103,6 @@ class LocationController extends Controller
     * @return \Illuminate\Http\RedirectResponse
     *
     * @throws \Throwable
-     * @throws \Watson\Validating\ValidationException
     */
    public function create(LocationFormRequest $request)
    {
@ -121,7 +120,6 @@ class LocationController extends Controller
     * @return \Illuminate\Http\RedirectResponse
     *
     * @throws \Throwable
-     * @throws \Watson\Validating\ValidationException
     */
    public function update(LocationFormRequest $request, Location $location)
    {
--- a/app/Http/Controllers/Admin/Nests/EggVariableController.php
+++ b/app/Http/Controllers/Admin/Nests/EggVariableController.php
@ -90,10 +90,11 @@ class EggVariableController extends Controller
     * Handle a request to create a new Egg variable.
     *
     * @param \Pterodactyl\Http\Requests\Admin\Egg\EggVariableFormRequest $request
-     * @param \Pterodactyl\Models\Egg                                     $egg
+     * @param \Pterodactyl\Models\Egg $egg
     *
     * @return \Illuminate\Http\RedirectResponse
     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\Variable\BadValidationRuleException
     * @throws \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
     */
    public function store(EggVariableFormRequest $request, Egg $egg): RedirectResponse
--- a/app/Http/Controllers/Admin/ServersController.php
+++ b/app/Http/Controllers/Admin/ServersController.php
@ -35,6 +35,7 @@ use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
 use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
 use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
+use Pterodactyl\Http\Requests\Admin\Servers\Databases\StoreServerDatabaseRequest;

 class ServersController extends Controller
 {
@ -375,9 +376,15 @@ class ServersController extends Controller
     *
     * @param \Pterodactyl\Models\Server $server
     * @return \Illuminate\View\View
+     *
+     * @throws \Pterodactyl\Exceptions\DisplayException
     */
    public function viewManage(Server $server)
    {
+        if ($server->installed > 1) {
+            throw new DisplayException('This server is in a failed installation state and must be deleted and recreated.');
+        }
+
        return view('admin.servers.view.manage', ['server' => $server]);
    }

@ -462,6 +469,7 @@ class ServersController extends Controller
     *
     * @param \Pterodactyl\Models\Server $server
     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
     */
    public function rebuildContainer(Server $server)
    {
@ -540,7 +548,8 @@ class ServersController extends Controller
     * @param \Pterodactyl\Models\Server $server
     * @return \Illuminate\Http\RedirectResponse
     *
-     * @throws \Pterodactyl\Exceptions\DisplayException
+     * @throws \Illuminate\Validation\ValidationException
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
     */
@ -556,15 +565,13 @@ class ServersController extends Controller
    /**
     * Creates a new database assigned to a specific server.
     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $server
+     * @param \Pterodactyl\Http\Requests\Admin\Servers\Databases\StoreServerDatabaseRequest $request
+     * @param int                                                                           $server
     * @return \Illuminate\Http\RedirectResponse
     *
     * @throws \Exception
-     * @throws \Pterodactyl\Exceptions\DisplayException
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
     */
-    public function newDatabase(Request $request, $server)
+    public function newDatabase(StoreServerDatabaseRequest $request, $server)
    {
        $this->databaseManagementService->create($server, [
            'database' => $request->input('database'),
--- a/app/Http/Controllers/Admin/Settings/AdvancedController.php
+++ b/app/Http/Controllers/Admin/Settings/AdvancedController.php
@ -76,6 +76,8 @@ class AdvancedController extends Controller
    /**
     * @param \Pterodactyl\Http\Requests\Admin\Settings\AdvancedSettingsFormRequest $request
     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
     */
    public function update(AdvancedSettingsFormRequest $request): RedirectResponse
    {
--- a/app/Http/Controllers/Admin/Settings/IndexController.php
+++ b/app/Http/Controllers/Admin/Settings/IndexController.php
@ -74,6 +74,8 @@ class IndexController extends Controller
     *
     * @param \Pterodactyl\Http\Requests\Admin\Settings\BaseSettingsFormRequest $request
     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
     */
    public function update(BaseSettingsFormRequest $request): RedirectResponse
    {
--- a/app/Http/Controllers/Admin/Settings/MailController.php
+++ b/app/Http/Controllers/Admin/Settings/MailController.php
@ -83,7 +83,9 @@ class MailController extends Controller
     * @param \Pterodactyl\Http\Requests\Admin\Settings\MailSettingsFormRequest $request
     * @return \Illuminate\Http\RedirectResponse
     *
-     * @throws \Pterodactyl\Exceptions\DisplayException
+     * @throws DisplayException
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
     */
    public function update(MailSettingsFormRequest $request): RedirectResponse
    {
--- a/app/Http/Controllers/Admin/StatisticsController.php
+++ b/app/Http/Controllers/Admin/StatisticsController.php
@ -0,0 +1,101 @@
+<?php
+
+namespace Pterodactyl\Http\Controllers\Admin;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
+use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
+use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
+use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Traits\Controllers\PlainJavascriptInjection;
+
+class StatisticsController extends Controller
+{
+    use PlainJavascriptInjection;
+
+    private $allocationRepository;
+
+    private $databaseRepository;
+
+    private $eggRepository;
+
+    private $nodeRepository;
+
+    private $serverRepository;
+
+    private $userRepository;
+
+    function __construct(
+        AllocationRepositoryInterface $allocationRepository,
+        DatabaseRepositoryInterface $databaseRepository,
+        EggRepositoryInterface $eggRepository,
+        NodeRepositoryInterface $nodeRepository,
+        ServerRepositoryInterface $serverRepository,
+        UserRepositoryInterface $userRepository
+    )
+    {
+        $this->allocationRepository = $allocationRepository;
+        $this->databaseRepository = $databaseRepository;
+        $this->eggRepository = $eggRepository;
+        $this->nodeRepository = $nodeRepository;
+        $this->serverRepository = $serverRepository;
+        $this->userRepository = $userRepository;
+    }
+
+    public function index()
+    {
+        $servers = $this->serverRepository->all();
+        $nodes = $this->nodeRepository->all();
+        $usersCount = $this->userRepository->count();
+        $eggsCount = $this->eggRepository->count();
+        $databasesCount = $this->databaseRepository->count();
+        $totalAllocations = $this->allocationRepository->count();
+        $suspendedServersCount = $this->serverRepository->getSuspendedServersCount();
+
+        $totalServerRam = 0;
+        $totalNodeRam = 0;
+        $totalServerDisk = 0;
+        $totalNodeDisk = 0;
+        foreach ($nodes as $node) {
+            $stats = $this->nodeRepository->getUsageStatsRaw($node);
+            $totalServerRam += $stats['memory']['value'];
+            $totalNodeRam += $stats['memory']['max'];
+            $totalServerDisk += $stats['disk']['value'];
+            $totalNodeDisk += $stats['disk']['max'];
+        }
+
+        $tokens = [];
+        foreach ($nodes as $node) {
+            $tokens[$node->id] = $node->daemonSecret;
+        }
+
+        $this->injectJavascript([
+            'servers' => $servers,
+            'suspendedServers' => $suspendedServersCount,
+            'totalServerRam' => $totalServerRam,
+            'totalNodeRam' => $totalNodeRam,
+            'totalServerDisk' => $totalServerDisk,
+            'totalNodeDisk' => $totalNodeDisk,
+            'nodes' => $nodes,
+            'tokens' => $tokens,
+        ]);
+        
+        return view('admin.statistics', [
+            'servers' => $servers,
+            'nodes' => $nodes,
+            'usersCount' => $usersCount,
+            'eggsCount' => $eggsCount,
+            'totalServerRam' => $totalServerRam,
+            'databasesCount' => $databasesCount,
+            'totalNodeRam' => $totalNodeRam,
+            'totalNodeDisk' => $totalNodeDisk,
+            'totalServerDisk' => $totalServerDisk,
+            'totalAllocations' => $totalAllocations,
+        ]);
+    }
+
+}
--- a/app/Http/Controllers/Api/Application/Servers/DatabaseController.php
+++ b/app/Http/Controllers/Api/Application/Servers/DatabaseController.php
@ -104,8 +104,6 @@ class DatabaseController extends ApplicationApiController
     * @return \Illuminate\Http\JsonResponse
     *
     * @throws \Exception
-     * @throws \Pterodactyl\Exceptions\DisplayException
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
     */
    public function store(StoreServerDatabaseRequest $request): JsonResponse
    {
--- a/app/Http/Controllers/Base/SecurityController.php
+++ b/app/Http/Controllers/Base/SecurityController.php
@ -96,7 +96,7 @@ class SecurityController extends Controller
    }

    /**
-     * Verifies that 2FA token recieved is valid and will work on the account.
+     * Verifies that 2FA token received is valid and will work on the account.
     *
     * @param \Illuminate\Http\Request $request
     * @return \Illuminate\Http\Response
--- a/app/Http/Controllers/Server/Files/FileActionsController.php
+++ b/app/Http/Controllers/Server/Files/FileActionsController.php
@ -101,7 +101,7 @@ class FileActionsController extends Controller
    {
        $server = $request->attributes->get('server');

-        $dirname = pathinfo($file, PATHINFO_DIRNAME);
+        $dirname = str_replace('\\', '/', pathinfo($file, PATHINFO_DIRNAME));
        try {
            $content = $this->repository->setServer($server)->setToken($request->attributes->get('server_token'))->getContent($file);
        } catch (RequestException $exception) {