Merge branch 'feature/user-databases' into develop

Author: DaneEveritt

CHANGELOG.md

@@ -18,6 +18,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 * Adds back client API for sending commands or power toggles to a server though the Panel API: `/api/client/servers/<identifier>`
 * Added proper transformer for Packs and re-enabled missing includes on server.
 * Added support for using Filesystem as a caching driver, although not recommended.
+* Added support for user management of server databases.
 
 ## v0.7.3 (Derelict Dermodactylus)
 ### Fixed

app/Exceptions/Service/Database/DatabaseClientFeatureNotEnabledException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Pterodactyl\Exceptions\Service\Database;
+
+use Pterodactyl\Exceptions\PterodactylException;
+
+class DatabaseClientFeatureNotEnabledException extends PterodactylException
+{
+    public function __construct()
+    {
+        parent::__construct('Client database creation is not enabled in this Panel.');
+    }
+}

app/Exceptions/Service/Database/NoSuitableDatabaseHostException.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Pterodactyl\Exceptions\Service\Database;
+
+use Pterodactyl\Exceptions\DisplayException;
+
+class NoSuitableDatabaseHostException extends DisplayException
+{
+    /**
+     * NoSuitableDatabaseHostException constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct('No database host was found that meets the requirements for this server.');
+    }
+}

app/Exceptions/Service/Database/TooManyDatabasesException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Pterodactyl\Exceptions\Service\Database;
+
+use Pterodactyl\Exceptions\DisplayException;
+
+class TooManyDatabasesException extends DisplayException
+{
+    public function __construct()
+    {
+        parent::__construct('Operation aborted: creating a new database would put this server over the defined limit.');
+    }
+}

app/Http/Controllers/Server/DatabaseController.php

@@ -4,34 +4,76 @@
 
 use Illuminate\View\View;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\RedirectResponse;
+use Prologue\Alerts\AlertsMessageBag;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Traits\Controllers\JavascriptInjection;
 use Pterodactyl\Services\Databases\DatabasePasswordService;
+use Pterodactyl\Services\Databases\DatabaseManagementService;
+use Pterodactyl\Services\Databases\DeployServerDatabaseService;
 use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
+use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
+use Pterodactyl\Http\Requests\Server\Database\StoreServerDatabaseRequest;
+use Pterodactyl\Http\Requests\Server\Database\DeleteServerDatabaseRequest;
 
 class DatabaseController extends Controller
 {
     use JavascriptInjection;
 
+    /**
+     * @var \Prologue\Alerts\AlertsMessageBag
+     */
+    private $alert;
+
+    /**
+     * @var \Pterodactyl\Services\Databases\DeployServerDatabaseService
+     */
+    private $deployServerDatabaseService;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface
+     */
+    private $databaseHostRepository;
+
+    /**
+     * @var \Pterodactyl\Services\Databases\DatabaseManagementService
+     */
+    private $managementService;
+
     /**
      * @var \Pterodactyl\Services\Databases\DatabasePasswordService
      */
-    protected $passwordService;
+    private $passwordService;
 
     /**
      * @var \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface
      */
-    protected $repository;
+    private $repository;
 
     /**
      * DatabaseController constructor.
      *
-     * @param \Pterodactyl\Services\Databases\DatabasePasswordService       $passwordService
-     * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $repository
+     * @param \Prologue\Alerts\AlertsMessageBag                                 $alert
+     * @param \Pterodactyl\Services\Databases\DeployServerDatabaseService       $deployServerDatabaseService
+     * @param \Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface $databaseHostRepository
+     * @param \Pterodactyl\Services\Databases\DatabaseManagementService         $managementService
+     * @param \Pterodactyl\Services\Databases\DatabasePasswordService           $passwordService
+     * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface     $repository
      */
-    public function __construct(DatabasePasswordService $passwordService, DatabaseRepositoryInterface $repository)
-    {
+    public function __construct(
+        AlertsMessageBag $alert,
+        DeployServerDatabaseService $deployServerDatabaseService,
+        DatabaseHostRepositoryInterface $databaseHostRepository,
+        DatabaseManagementService $managementService,
+        DatabasePasswordService $passwordService,
+        DatabaseRepositoryInterface $repository
+    ) {
+        $this->alert = $alert;
+        $this->databaseHostRepository = $databaseHostRepository;
+        $this->deployServerDatabaseService = $deployServerDatabaseService;
+        $this->managementService = $managementService;
         $this->passwordService = $passwordService;
         $this->repository = $repository;
     }
@@ -50,11 +92,42 @@ public function index(Request $request): View
         $this->authorize('view-databases', $server);
         $this->setRequest($request)->injectJavascript();
 
+        $canCreateDatabase = config('pterodactyl.client_features.databases.enabled');
+        $allowRandom = config('pterodactyl.client_features.databases.allow_random');
+
+        if ($this->databaseHostRepository->findCountWhere([['node_id', '=', $server->node_id]]) === 0) {
+            if ($canCreateDatabase && ! $allowRandom) {
+                $canCreateDatabase = false;
+            }
+        }
+
+        $databases = $this->repository->getDatabasesForServer($server->id);
+
         return view('server.databases.index', [
-            'databases' => $this->repository->getDatabasesForServer($server->id),
+            'allowCreation' => $canCreateDatabase,
+            'overLimit' => ! is_null($server->database_limit) && count($databases) >= $server->database_limit,
+            'databases' => $databases,
         ]);
     }
 
+    /**
+     * Handle a request from a user to create a new database for the server.
+     *
+     * @param \Pterodactyl\Http\Requests\Server\Database\StoreServerDatabaseRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Exception
+     * @throws \Pterodactyl\Exceptions\Service\Database\DatabaseClientFeatureNotEnabledException
+     */
+    public function store(StoreServerDatabaseRequest $request): RedirectResponse
+    {
+        $this->deployServerDatabaseService->handle($request->getServer(), $request->validated());
+
+        $this->alert->success('Successfully created a new database.')->flash();
+
+        return redirect()->route('server.databases.index', $request->getServer()->uuidShort);
+    }
+
     /**
      * Handle a request to update the password for a specific database.
      *
@@ -74,4 +147,19 @@ public function update(Request $request): JsonResponse
 
         return response()->json(['password' => $password]);
     }
+
+    /**
+     * Delete a database for this server from the SQL server and Panel database.
+     *
+     * @param \Pterodactyl\Http\Requests\Server\Database\DeleteServerDatabaseRequest $request
+     * @return \Illuminate\Http\Response
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function delete(DeleteServerDatabaseRequest $request): Response
+    {
+        $this->managementService->delete($request->attributes->get('database')->id);
+
+        return response('', Response::HTTP_NO_CONTENT);
+    }
 }

app/Http/Middleware/Server/DatabaseBelongsToServer.php

@@ -38,8 +38,13 @@ public function __construct(DatabaseRepositoryInterface $repository)
     public function handle(Request $request, Closure $next)
     {
         $server = $request->attributes->get('server');
+        $database = $request->input('database') ?? $request->route()->parameter('database');
 
-        $database = $this->repository->find($request->input('database'));
+        if (! is_digit($database)) {
+            throw new NotFoundHttpException;
+        }
+
+        $database = $this->repository->find($database);
         if (is_null($database) || $database->server_id !== $server->id) {
             throw new NotFoundHttpException;
         }

app/Http/Requests/Api/Application/Servers/UpdateServerBuildConfigurationRequest.php

@@ -13,7 +13,7 @@ class UpdateServerBuildConfigurationRequest extends ServerWriteRequest
      */
     public function rules(): array
     {
-        $rules = Server::getUpdateRulesForId($this->route()->parameter('server')->id);
+        $rules = Server::getUpdateRulesForId($this->getModel(Server::class)->id);
 
         return [
             'allocation' => $rules['allocation_id'],
@@ -26,6 +26,9 @@ public function rules(): array
             'add_allocations.*' => 'integer',
             'remove_allocations' => 'bail|array',
             'remove_allocations.*' => 'integer',
+            'feature_limits' => 'required|array',
+            'feature_limits.databases' => $rules['database_limit'],
+            'feature_limits.allocations' => $rules['allocation_limit'],
         ];
     }
 
@@ -39,7 +42,9 @@ public function validated()
         $data = parent::validated();
 
         $data['allocation_id'] = $data['allocation'];
-        unset($data['allocation']);
+        $data['database_limit'] = $data['feature_limits']['databases'];
+        $data['allocation_limit'] = $data['feature_limits']['allocations'];
+        unset($data['allocation'], $data['feature_limits']);
 
         return $data;
     }
@@ -56,6 +61,8 @@ public function attributes()
             'remove_allocations' => 'allocations to remove',
             'add_allocations.*' => 'allocation to add',
             'remove_allocations.*' => 'allocation to remove',
+            'feature_limits.databases' => 'Database Limit',
+            'feature_limits.allocations' => 'Allocation Limit',
         ];
     }
 }

app/Http/Requests/Server/Database/DeleteServerDatabaseRequest.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Pterodactyl\Http\Requests\Server\Database;
+
+use Pterodactyl\Http\Requests\Server\ServerFormRequest;
+
+class DeleteServerDatabaseRequest extends ServerFormRequest
+{
+    /**
+     * @return bool
+     */
+    public function authorize()
+    {
+        if (! parent::authorize()) {
+            return false;
+        }
+
+        return config('pterodactyl.client_features.databases.enabled');
+    }
+
+    /**
+     * Return the user permission to validate this request aganist.
+     *
+     * @return string
+     */
+    protected function permission(): string
+    {
+        return 'delete-database';
+    }
+
+    /**
+     * Rules to validate this request aganist.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [];
+    }
+}

app/Http/Requests/Server/Database/StoreServerDatabaseRequest.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Pterodactyl\Http\Requests\Server\Database;
+
+use Pterodactyl\Http\Requests\Server\ServerFormRequest;
+
+class StoreServerDatabaseRequest extends ServerFormRequest
+{
+    /**
+     * @return bool
+     */
+    public function authorize()
+    {
+        if (! parent::authorize()) {
+            return false;
+        }
+
+        return config('pterodactyl.client_features.databases.enabled');
+    }
+
+    /**
+     * Return the user permission to validate this request aganist.
+     *
+     * @return string
+     */
+    protected function permission(): string
+    {
+        return 'create-database';
+    }
+
+    /**
+     * Rules to validate this request aganist.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'database' => 'required|string|min:1',
+            'remote' => 'required|string|regex:/^[0-9%.]{1,15}$/',
+        ];
+    }
+}

app/Http/Requests/Server/ServerFormRequest.php

@@ -2,6 +2,7 @@
 
 namespace Pterodactyl\Http\Requests\Server;
 
+use Pterodactyl\Models\Server;
 use Pterodactyl\Http\Requests\FrontendUserFormRequest;
 
 abstract class ServerFormRequest extends FrontendUserFormRequest
@@ -24,6 +25,11 @@ public function authorize()
             return false;
         }
 
-        return $this->user()->can($this->permission(), $this->attributes->get('server'));
+        return $this->user()->can($this->permission(), $this->getServer());
+    }
+
+    public function getServer(): Server
+    {
+        return $this->attributes->get('server');
     }
 }