Add database management back to front-end and begin some refactoring

Here we go again boys...

app/Http/Controllers/Admin/DatabaseController.php

@@ -9,11 +9,15 @@
 
 namespace Pterodactyl\Http\Controllers\Admin;
 
-use Pterodactyl\Models\DatabaseHost;
+use PDOException;
+use Illuminate\View\View;
+use Illuminate\Http\RedirectResponse;
 use Prologue\Alerts\AlertsMessageBag;
 use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Services\Database\DatabaseHostService;
+use Pterodactyl\Services\Databases\Hosts\HostUpdateService;
 use Pterodactyl\Http\Requests\Admin\DatabaseHostFormRequest;
+use Pterodactyl\Services\Databases\Hosts\HostCreationService;
+use Pterodactyl\Services\Databases\Hosts\HostDeletionService;
 use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
 use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
 
@@ -22,41 +26,57 @@ class DatabaseController extends Controller
     /**
      * @var \Prologue\Alerts\AlertsMessageBag
      */
-    protected $alert;
+    private $alert;
+
+    /**
+     * @var \Pterodactyl\Services\Databases\Hosts\HostCreationService
+     */
+    private $creationService;
+
+    /**
+     * @var \Pterodactyl\Services\Databases\Hosts\HostDeletionService
+     */
+    private $deletionService;
 
     /**
      * @var \Pterodactyl\Contracts\Repository\LocationRepositoryInterface
      */
-    protected $locationRepository;
+    private $locationRepository;
 
     /**
      * @var \Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface
      */
-    protected $repository;
+    private $repository;
 
     /**
-     * @var \Pterodactyl\Services\Database\DatabaseHostService
+     * @var \Pterodactyl\Services\Databases\Hosts\HostUpdateService
      */
-    protected $service;
+    private $updateService;
 
     /**
      * DatabaseController constructor.
      *
      * @param \Prologue\Alerts\AlertsMessageBag                                 $alert
      * @param \Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface $repository
-     * @param \Pterodactyl\Services\Database\DatabaseHostService                $service
+     * @param \Pterodactyl\Services\Databases\Hosts\HostCreationService         $creationService
+     * @param \Pterodactyl\Services\Databases\Hosts\HostDeletionService         $deletionService
+     * @param \Pterodactyl\Services\Databases\Hosts\HostUpdateService           $updateService
      * @param \Pterodactyl\Contracts\Repository\LocationRepositoryInterface     $locationRepository
      */
     public function __construct(
         AlertsMessageBag $alert,
         DatabaseHostRepositoryInterface $repository,
-        DatabaseHostService $service,
+        HostCreationService $creationService,
+        HostDeletionService $deletionService,
+        HostUpdateService $updateService,
         LocationRepositoryInterface $locationRepository
     ) {
         $this->alert = $alert;
+        $this->creationService = $creationService;
+        $this->deletionService = $deletionService;
         $this->repository = $repository;
-        $this->service = $service;
         $this->locationRepository = $locationRepository;
+        $this->updateService = $updateService;
     }
 
     /**
@@ -64,7 +84,7 @@ class DatabaseController extends Controller
      *
      * @return \Illuminate\View\View
      */
-    public function index()
+    public function index(): View
     {
         return view('admin.databases.index', [
             'locations' => $this->locationRepository->getAllWithNodes(),
@@ -80,7 +100,7 @@ class DatabaseController extends Controller
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function view($host)
+    public function view($host): View
     {
         return view('admin.databases.view', [
             'locations' => $this->locationRepository->getAllWithNodes(),
@@ -94,42 +114,41 @@ class DatabaseController extends Controller
      * @param \Pterodactyl\Http\Requests\Admin\DatabaseHostFormRequest $request
      * @return \Illuminate\Http\RedirectResponse
      *
-     * @throws \Throwable
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function create(DatabaseHostFormRequest $request)
+    public function create(DatabaseHostFormRequest $request): RedirectResponse
     {
         try {
-            $host = $this->service->create($request->normalize());
-            $this->alert->success('Successfully created a new database host on the system.')->flash();
-
-            return redirect()->route('admin.databases.view', $host->id);
-        } catch (\PDOException $ex) {
+            $host = $this->creationService->handle($request->normalize());
+        } catch (PDOException $ex) {
             $this->alert->danger($ex->getMessage())->flash();
+
+            return redirect()->route('admin.databases');
         }
 
-        return redirect()->route('admin.databases');
+        $this->alert->success('Successfully created a new database host on the system.')->flash();
+
+        return redirect()->route('admin.databases.view', $host->id);
     }
 
     /**
      * Handle updating database host.
      *
      * @param \Pterodactyl\Http\Requests\Admin\DatabaseHostFormRequest $request
-     * @param \Pterodactyl\Models\DatabaseHost                         $host
+     * @param int                                                      $host
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\DisplayException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function update(DatabaseHostFormRequest $request, DatabaseHost $host)
+    public function update(DatabaseHostFormRequest $request, int $host): RedirectResponse
     {
-        if ($request->input('action') === 'delete') {
-            return $this->delete($host);
-        }
-
         try {
-            $host = $this->service->update($host->id, $request->normalize());
+            $host = $this->updateService->handle($host, $request->normalize());
             $this->alert->success('Database host was updated successfully.')->flash();
-        } catch (\PDOException $ex) {
+        } catch (PDOException $ex) {
             $this->alert->danger($ex->getMessage())->flash();
         }
 
@@ -139,14 +158,14 @@ class DatabaseController extends Controller
     /**
      * Handle request to delete a database host.
      *
-     * @param \Pterodactyl\Models\DatabaseHost $host
+     * @param int $host
      * @return \Illuminate\Http\RedirectResponse
      *
-     * @throws \Pterodactyl\Exceptions\DisplayException
+     * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
      */
-    public function delete(DatabaseHost $host)
+    public function delete(int $host): RedirectResponse
     {
-        $this->service->delete($host->id);
+        $this->deletionService->handle($host);
         $this->alert->success('The requested database host has been deleted from the system.')->flash();
 
         return redirect()->route('admin.databases');

app/Http/Controllers/Admin/ServersController.php

@@ -22,12 +22,13 @@ use Pterodactyl\Services\Servers\ServerDeletionService;
 use Pterodactyl\Services\Servers\ReinstallServerService;
 use Pterodactyl\Services\Servers\ContainerRebuildService;
 use Pterodactyl\Services\Servers\BuildModificationService;
-use Pterodactyl\Services\Database\DatabaseManagementService;
+use Pterodactyl\Services\Databases\DatabasePasswordService;
 use Pterodactyl\Services\Servers\DetailsModificationService;
 use Pterodactyl\Services\Servers\StartupModificationService;
 use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
 use Pterodactyl\Repositories\Eloquent\DatabaseHostRepository;
+use Pterodactyl\Services\Databases\DatabaseManagementService;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
@@ -67,10 +68,15 @@ class ServersController extends Controller
     protected $databaseRepository;
 
     /**
-     * @var \Pterodactyl\Services\Database\DatabaseManagementService
+     * @var \Pterodactyl\Services\Databases\DatabaseManagementService
      */
     protected $databaseManagementService;
 
+    /**
+     * @var \Pterodactyl\Services\Databases\DatabasePasswordService
+     */
+    protected $databasePasswordService;
+
     /**
      * @var \Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface
      */
@@ -135,7 +141,8 @@ class ServersController extends Controller
      * @param \Illuminate\Contracts\Config\Repository                         $config
      * @param \Pterodactyl\Services\Servers\ContainerRebuildService           $containerRebuildService
      * @param \Pterodactyl\Services\Servers\ServerCreationService             $service
-     * @param \Pterodactyl\Services\Database\DatabaseManagementService        $databaseManagementService
+     * @param \Pterodactyl\Services\Databases\DatabaseManagementService       $databaseManagementService
+     * @param \Pterodactyl\Services\Databases\DatabasePasswordService         $databasePasswordService
      * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface   $databaseRepository
      * @param \Pterodactyl\Repositories\Eloquent\DatabaseHostRepository       $databaseHostRepository
      * @param \Pterodactyl\Services\Servers\ServerDeletionService             $deletionService
@@ -156,6 +163,7 @@ class ServersController extends Controller
         ContainerRebuildService $containerRebuildService,
         ServerCreationService $service,
         DatabaseManagementService $databaseManagementService,
+        DatabasePasswordService $databasePasswordService,
         DatabaseRepositoryInterface $databaseRepository,
         DatabaseHostRepository $databaseHostRepository,
         ServerDeletionService $deletionService,
@@ -173,9 +181,10 @@ class ServersController extends Controller
         $this->buildModificationService = $buildModificationService;
         $this->config = $config;
         $this->containerRebuildService = $containerRebuildService;
-        $this->databaseManagementService = $databaseManagementService;
-        $this->databaseRepository = $databaseRepository;
         $this->databaseHostRepository = $databaseHostRepository;
+        $this->databaseManagementService = $databaseManagementService;
+        $this->databasePasswordService = $databasePasswordService;
+        $this->databaseRepository = $databaseRepository;
         $this->detailsModificationService = $detailsModificationService;
         $this->deletionService = $deletionService;
         $this->locationRepository = $locationRepository;
@@ -609,7 +618,7 @@ class ServersController extends Controller
             ['id', '=', $request->input('database')],
         ]);
 
-        $this->databaseManagementService->changePassword($database->id, str_random(20));
+        $this->databasePasswordService->handle($database, str_random(20));
 
         return response('', 204);
     }

app/Http/Controllers/Server/DatabaseController.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace Pterodactyl\Http\Controllers\Server;
+
+use Illuminate\View\View;
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Traits\Controllers\JavascriptInjection;
+use Pterodactyl\Services\Databases\DatabasePasswordService;
+use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
+
+class DatabaseController extends Controller
+{
+    use JavascriptInjection;
+
+    /**
+     * @var \Pterodactyl\Services\Databases\DatabasePasswordService
+     */
+    protected $passwordService;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * DatabaseController constructor.
+     *
+     * @param \Pterodactyl\Services\Databases\DatabasePasswordService       $passwordService
+     * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $repository
+     */
+    public function __construct(DatabasePasswordService $passwordService, DatabaseRepositoryInterface $repository)
+    {
+        $this->passwordService = $passwordService;
+        $this->repository = $repository;
+    }
+
+    /**
+     * Render the database listing for a server.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return \Illuminate\View\View
+     */
+    public function index(Request $request): View
+    {
+        $server = $request->attributes->get('server');
+        $this->injectJavascript();
+
+        return view('server.databases.index', [
+            'databases' => $this->repository->getDatabasesForServer($server->id),
+        ]);
+    }
+
+    /**
+     * Handle a request to update the password for a specific database.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function update(Request $request): JsonResponse
+    {
+        $password = str_random(20);
+        $this->passwordService->handle($request->attributes->get('database'), $password);
+
+        return response()->json(['password' => $password]);
+    }
+}

app/Http/Kernel.php

@@ -5,6 +5,9 @@ namespace Pterodactyl\Http;
 use Pterodactyl\Http\Middleware\DaemonAuthenticate;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 use Illuminate\Routing\Middleware\SubstituteBindings;
+use Pterodactyl\Http\Middleware\Server\SubuserBelongsToServer;
+use Pterodactyl\Http\Middleware\Server\DatabaseBelongsToServer;
+use Pterodactyl\Http\Middleware\Server\ScheduleBelongsToServer;
 
 class Kernel extends HttpKernel
 {
@@ -63,7 +66,6 @@ class Kernel extends HttpKernel
         'guest' => \Pterodactyl\Http\Middleware\RedirectIfAuthenticated::class,
         'server' => \Pterodactyl\Http\Middleware\ServerAuthenticate::class,
         'subuser.auth' => \Pterodactyl\Http\Middleware\SubuserAccessAuthenticate::class,
-        'subuser' => \Pterodactyl\Http\Middleware\Server\SubuserAccess::class,
         'admin' => \Pterodactyl\Http\Middleware\AdminAuthenticate::class,
         'daemon-old' => DaemonAuthenticate::class,
         'csrf' => \Pterodactyl\Http\Middleware\VerifyCsrfToken::class,
@@ -71,6 +73,13 @@ class Kernel extends HttpKernel
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'recaptcha' => \Pterodactyl\Http\Middleware\VerifyReCaptcha::class,
-        'schedule' => \Pterodactyl\Http\Middleware\Server\ScheduleAccess::class,
+
+        // Server specific middleware (used for authenticating access to resources)
+        //
+        // These are only used for individual server authentication, and not gloabl
+        // actions from other resources. They are defined in the route files.
+        'server..database' => DatabaseBelongsToServer::class,
+        'server..subuser' => SubuserBelongsToServer::class,
+        'server..schedule' => ScheduleBelongsToServer::class,
     ];
 }

app/Http/Middleware/Server/DatabaseBelongsToServer.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Pterodactyl\Http\Middleware\Server;
+
+use Closure;
+use Illuminate\Http\Request;
+use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+class DatabaseBelongsToServer
+{
+    /**
+     * @var \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * DatabaseAccess constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $repository
+     */
+    public function __construct(DatabaseRepositoryInterface $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * Check if a database being requested belongs to the currently loaded server.
+     * If it does not, throw a 404 error, otherwise continue on with the request
+     * and set an attribute with the database.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     * @return mixed
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        $server = $request->attributes->get('server');
+
+        $database = $this->repository->find($request->input('database'));
+        if ($database->server_id !== $server->id) {
+            throw new NotFoundHttpException;
+        }
+
+        $request->attributes->set('database', $database);
+
+        return $next($request);
+    }
+}

app/Http/Middleware/Server/ScheduleBelongsToServer.php

@@ -14,7 +14,7 @@ use Illuminate\Contracts\Session\Session;
 use Pterodactyl\Contracts\Extensions\HashidsInterface;
 use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface;
 
-class ScheduleAccess
+class ScheduleBelongsToServer
 {
     /**
      * @var \Pterodactyl\Contracts\Extensions\HashidsInterface

app/Http/Middleware/Server/SubuserBelongsToServer.php

@@ -15,7 +15,7 @@ use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-class SubuserAccess
+class SubuserBelongsToServer
 {
     /**
      * @var \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface

app/Http/Middleware/ServerAuthenticate.php

@@ -105,8 +105,13 @@ class ServerAuthenticate
         }
 
         // Store the server in the session.
+        // @todo remove from session. use request attributes.
         $this->session->now('server_data.model', $server);
 
+        // Add server to the request attributes. This will replace sessions
+        // as files are updated.
+        $request->attributes->set('server', $server);
+
         return $next($request);
     }
 }

app/Http/Middleware/SubuserAccessAuthenticate.php

@@ -60,6 +60,7 @@ class SubuserAccessAuthenticate
         try {
             $token = $this->keyProviderService->handle($server->id, $request->user()->id);
             $this->session->now('server_data.token', $token);
+            $request->attributes->set('server_token', $token);
         } catch (RecordNotFoundException $exception) {
             throw new AuthenticationException('This account does not have permission to access this server.');
         }

app/Http/ViewComposers/Server/ServerDataComposer.php

@@ -1,32 +1,25 @@
 <?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\ViewComposers\Server;
 
 use Illuminate\View\View;
-use Illuminate\Contracts\Session\Session;
+use Illuminate\Http\Request;
 
 class ServerDataComposer
 {
     /**
-     * @var \Illuminate\Contracts\Session\Session
+     * @var \Illuminate\Http\Request
      */
-    protected $session;
+    protected $request;
 
     /**
      * ServerDataComposer constructor.
      *
-     * @param \Illuminate\Contracts\Session\Session $session
+     * @param \Illuminate\Http\Request $request
      */
-    public function __construct(Session $session)
+    public function __construct(Request $request)
     {
-        $this->session = $session;
+        $this->request = $request;
     }
 
     /**
@@ -36,10 +29,10 @@ class ServerDataComposer
      */
     public function compose(View $view)
     {
-        $data = $this->session->get('server_data');
+        $server = $this->request->get('server');
 
-        $view->with('server', array_get($data, 'model'));
-        $view->with('node', object_get($data['model'], 'node'));
-        $view->with('daemon_token', array_get($data, 'token'));
+        $view->with('server', $server);
+        $view->with('node', object_get($server, 'node'));
+        $view->with('daemon_token', $this->request->get('server_token'));
     }
 }