Merge branch 'feature/vuejs' into feature/vue-serverview

Author: DaneEveritt

CHANGELOG.md

@@ -3,6 +3,18 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## v0.7.8 (Derelict Dermodactylus)
+### Added
+* Nodes can now be put into maintenance mode to deny access to servers temporarily.
+* Basic statistics about your panel are now available in the Admin CP.
+
+### Fixed
+* Hitting Ctrl+Z when editing a file on the web now works as expected.
+* Logo now links to the correct location on all pages.
+
+### Changed
+* Attempting to upload a folder via the web file manager will now display a warning telling the user to use SFTP.
+
 ## v0.7.7 (Derelict Dermodactylus)
 ### Fixed
 * Fixes an issue with the sidebar logo not working correctly in some browsers due to the CSS being assigned.

app/Contracts/Repository/NodeRepositoryInterface.php

@@ -21,6 +21,14 @@ interface NodeRepositoryInterface extends RepositoryInterface, SearchableInterfa
      */
     public function getUsageStats(Node $node): array;
 
+    /**
+     * Return the usage stats for a single node.
+     *
+     * @param \Pterodactyl\Models\Node $node
+     * @return array
+     */
+    public function getUsageStatsRaw(Node $node): array;
+
     /**
      * Return all available nodes with a searchable interface.
      *

app/Contracts/Repository/RepositoryInterface.php

@@ -200,4 +200,11 @@ public function insert(array $data): bool;
      * @return bool
      */
     public function insertIgnore(array $values): bool;
+
+    /**
+     * Get the amount of entries in the database
+     *
+     * @return int
+     */
+    public function count(): int;
 }

app/Contracts/Repository/ServerRepositoryInterface.php

@@ -145,4 +145,11 @@ public function getServersForPowerActionCount(array $servers = [], array $nodes
      * @return bool
      */
     public function isUniqueUuidCombo(string $uuid, string $short): bool;
+
+    /**
+     * Get the amount of servers that are suspended
+     *
+     * @return int
+     */
+    public function getSuspendedServersCount(): int;
 }

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,
+        ]);
+    }
+
+}

app/Http/Kernel.php

@@ -2,6 +2,7 @@
 
 namespace Pterodactyl\Http;
 
+use Pterodactyl\Http\Middleware\MaintenanceMiddleware;
 use Pterodactyl\Models\ApiKey;
 use Illuminate\Auth\Middleware\Authorize;
 use Illuminate\Auth\Middleware\Authenticate;
@@ -108,6 +109,7 @@ class Kernel extends HttpKernel
         'can' => Authorize::class,
         'bindings' => SubstituteBindings::class,
         'recaptcha' => VerifyReCaptcha::class,
+        'node.maintenance' => MaintenanceMiddleware::class,
 
         // Server specific middleware (used for authenticating access to resources)
         //

app/Http/Middleware/MaintenanceMiddleware.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Pterodactyl\Http\Middleware;
+
+use Closure;
+use Illuminate\Contracts\Routing\ResponseFactory;
+
+class MaintenanceMiddleware
+{
+    /**
+     * @var \Illuminate\Contracts\Routing\ResponseFactory
+     */
+    private $response;
+
+    /**
+     * MaintenanceMiddleware constructor.
+     *
+     * @param \Illuminate\Contracts\Routing\ResponseFactory $response
+     */
+    public function __construct(ResponseFactory $response)
+    {
+        $this->response = $response;
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        /** @var \Pterodactyl\Models\Server $server */
+        $server = $request->attributes->get('server');
+        $node = $server->getRelation('node');
+
+        if ($node->maintenance_mode) {
+            return $this->response->view('errors.maintenance');
+        }
+
+        return $next($request);
+    }
+}

app/Models/Node.php

@@ -48,6 +48,7 @@ class Node extends Model implements CleansAttributes, ValidableContract
         'daemonSFTP' => 'integer',
         'behind_proxy' => 'boolean',
         'public' => 'boolean',
+        'maintenance_mode' => 'boolean',
     ];
 
     /**
@@ -62,7 +63,7 @@ class Node extends Model implements CleansAttributes, ValidableContract
         'disk_overallocate', 'upload_size',
         'daemonSecret', 'daemonBase',
         'daemonSFTP', 'daemonListen',
-        'description',
+        'description', 'maintenance_mode',
     ];
 
     /**
@@ -111,6 +112,7 @@ class Node extends Model implements CleansAttributes, ValidableContract
         'daemonBase' => 'regex:/^([\/][\d\w.\-\/]+)$/',
         'daemonSFTP' => 'numeric|between:1024,65535',
         'daemonListen' => 'numeric|between:1024,65535',
+        'maintenance_mode' => 'boolean',
     ];
 
     /**
@@ -126,6 +128,7 @@ class Node extends Model implements CleansAttributes, ValidableContract
         'daemonBase' => '/srv/daemon-data',
         'daemonSFTP' => 2022,
         'daemonListen' => 8080,
+        'maintenance_mode' => false,
     ];
 
     /**

app/Providers/RouteServiceProvider.php

@@ -33,7 +33,7 @@ public function map()
              ->namespace($this->namespace . '\Auth')
              ->group(base_path('routes/auth.php'));
 
-        Route::middleware(['web', 'csrf', 'auth', 'server', 'subuser.auth'])->prefix('/server/{server}')
+        Route::middleware(['web', 'csrf', 'auth', 'server', 'subuser.auth', 'node.maintenance'])->prefix('/server/{server}')
              ->namespace($this->namespace . '\Server')
              ->group(base_path('routes/server.php'));
 

app/Repositories/Eloquent/EloquentRepository.php

@@ -296,4 +296,14 @@ public function insertIgnore(array $values): bool
 
         return $this->getBuilder()->getConnection()->statement($statement, $bindings);
     }
+
+    /**
+     * Get the amount of entries in the database
+     *
+     * @return int
+     */
+    public function count(): int
+    {
+        return $this->getBuilder()->count();
+    }
 }