Merge branch 'release/v0.7.5'

Author: DaneEveritt

CHANGELOG.md

@@ -3,6 +3,20 @@ 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.5 (Derelict Dermodactylus)
+### Fixed
+* Fixes application API keys being created as a client API key.
+* Search term is now passed through when using paginated result sets.
+* Reduces the number of SQL queries executed when rendering the server listing to increase performance.
+* Fixes exceptions being thrown for non-existent subuser permissions.
+* Fixes exception caused when trying to revoke admin privileges from a user account due to a bad endpoint.
+
+### Changed
+* Databases are now properly paginated when viewing a database host.
+* No more loading daemon keys for every server model being loaded, some of us value our databases.
+* Changed behavior of the subuser middleware to add a daemon access key if one is missing from the database for some reason.
+* Server short-codes are now based on the UUID as they were in previous versions of Pterodactyl.
+
 ## v0.7.4-h1 (Derelict Dermodactylus)
 ### Fixed
 * Being able to create servers is kind of a core aspect of the software, pushing releases late at night is not a great idea.

README.md

@@ -22,9 +22,9 @@ Some of our core supported games include:
 * Teamspeak
 * Mumble
 * Team Fortress 2
-* Counter Strike: GO
-* Garrys Mod
-* Ark: Survival Evolved
+* Counter Strike: Global Offensive
+* Garry's Mod
+* ARK: Survival Evolved
 
 In addition to our standard nest of supported games, our community is constantly pushing the limits of this software and there are plenty more games available provided by the community. Some of these games include:
 

app/Contracts/Repository/DatabaseHostRepositoryInterface.php

@@ -3,7 +3,6 @@
 namespace Pterodactyl\Contracts\Repository;
 
 use Illuminate\Support\Collection;
-use Pterodactyl\Models\DatabaseHost;
 
 interface DatabaseHostRepositoryInterface extends RepositoryInterface
 {
@@ -14,15 +13,4 @@ interface DatabaseHostRepositoryInterface extends RepositoryInterface
      * @return \Illuminate\Support\Collection
      */
     public function getWithViewDetails(): Collection;
-
-    /**
-     * Return a database host with the databases and associated servers
-     * that are attached to said databases.
-     *
-     * @param int $id
-     * @return \Pterodactyl\Models\DatabaseHost
-     *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function getWithServers(int $id): DatabaseHost;
 }

app/Contracts/Repository/DatabaseRepositoryInterface.php

@@ -1,16 +1,10 @@
 <?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\Database;
 use Illuminate\Support\Collection;
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 
 interface DatabaseRepositoryInterface extends RepositoryInterface
 {
@@ -39,6 +33,15 @@ public function getConnection(): string;
      */
     public function getDatabasesForServer(int $server): Collection;
 
+    /**
+     * Return all of the databases for a given host with the server relationship loaded.
+     *
+     * @param int $host
+     * @param int $count
+     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
+     */
+    public function getDatabasesForHost(int $host, int $count = 25): LengthAwarePaginator;
+
     /**
      * Create a new database if it does not already exist on the host with
      * the provided details.

app/Contracts/Repository/ServerRepositoryInterface.php

@@ -136,4 +136,13 @@ public function getServersForPowerAction(array $servers = [], array $nodes = [],
      * @return int
      */
     public function getServersForPowerActionCount(array $servers = [], array $nodes = []): int;
+
+    /**
+     * Check if a given UUID and UUID-Short string are unique to a server.
+     *
+     * @param string $uuid
+     * @param string $short
+     * @return bool
+     */
+    public function isUniqueUuidCombo(string $uuid, string $short): bool;
 }

app/Http/Controllers/Admin/DatabaseController.php

@@ -1,11 +1,4 @@
 <?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\Admin;
 
@@ -19,6 +12,7 @@
 use Pterodactyl\Http\Requests\Admin\DatabaseHostFormRequest;
 use Pterodactyl\Services\Databases\Hosts\HostCreationService;
 use Pterodactyl\Services\Databases\Hosts\HostDeletionService;
+use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
 use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
 use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
 
@@ -34,6 +28,11 @@ class DatabaseController extends Controller
      */
     private $creationService;
 
+    /**
+     * @var \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface
+     */
+    private $databaseRepository;
+
     /**
      * @var \Pterodactyl\Services\Databases\Hosts\HostDeletionService
      */
@@ -59,6 +58,7 @@ class DatabaseController extends Controller
      *
      * @param \Prologue\Alerts\AlertsMessageBag                                 $alert
      * @param \Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface $repository
+     * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface     $databaseRepository
      * @param \Pterodactyl\Services\Databases\Hosts\HostCreationService         $creationService
      * @param \Pterodactyl\Services\Databases\Hosts\HostDeletionService         $deletionService
      * @param \Pterodactyl\Services\Databases\Hosts\HostUpdateService           $updateService
@@ -67,13 +67,15 @@ class DatabaseController extends Controller
     public function __construct(
         AlertsMessageBag $alert,
         DatabaseHostRepositoryInterface $repository,
+        DatabaseRepositoryInterface $databaseRepository,
         HostCreationService $creationService,
         HostDeletionService $deletionService,
         HostUpdateService $updateService,
         LocationRepositoryInterface $locationRepository
     ) {
         $this->alert = $alert;
         $this->creationService = $creationService;
+        $this->databaseRepository = $databaseRepository;
         $this->deletionService = $deletionService;
         $this->repository = $repository;
         $this->locationRepository = $locationRepository;
@@ -105,7 +107,8 @@ public function view(int $host): View
     {
         return view('admin.databases.view', [
             'locations' => $this->locationRepository->getAllWithNodes(),
-            'host' => $this->repository->getWithServers($host),
+            'host' => $this->repository->find($host),
+            'databases' => $this->databaseRepository->getDatabasesForHost($host),
         ]);
     }
 

app/Http/Middleware/Server/AuthenticateAsSubuser.php

@@ -11,7 +11,6 @@
 
 use Closure;
 use Illuminate\Http\Request;
-use Illuminate\Contracts\Session\Session;
 use Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService;
 use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@@ -23,21 +22,14 @@ class AuthenticateAsSubuser
      */
     private $keyProviderService;
 
-    /**
-     * @var \Illuminate\Contracts\Session\Session
-     */
-    private $session;
-
     /**
      * SubuserAccessAuthenticate constructor.
      *
      * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService $keyProviderService
-     * @param \Illuminate\Contracts\Session\Session                     $session
      */
-    public function __construct(DaemonKeyProviderService $keyProviderService, Session $session)
+    public function __construct(DaemonKeyProviderService $keyProviderService)
     {
         $this->keyProviderService = $keyProviderService;
-        $this->session = $session;
     }
 
     /**
@@ -60,7 +52,6 @@ public function handle(Request $request, Closure $next)
             throw new AccessDeniedHttpException('This account does not have permission to access this server.');
         }
 
-        $this->session->now('server_data.token', $token);
         $request->attributes->set('server_token', $token);
 
         return $next($request);

app/Models/Server.php

@@ -35,13 +35,6 @@ class Server extends Model implements CleansAttributes, ValidableContract
      */
     protected $dates = [self::CREATED_AT, self::UPDATED_AT, 'deleted_at'];
 
-    /**
-     * Always eager load these relationships on the model.
-     *
-     * @var array
-     */
-    protected $with = ['key'];
-
     /**
      * Fields that are not mass assignable.
      *

app/Repositories/Daemon/ServerRepository.php

@@ -115,8 +115,8 @@ public function details(): ResponseInterface
     public function revokeAccessKey($key): ResponseInterface
     {
         if (is_array($key)) {
-            return $this->getHttpClient()->request('POST', 'keys', [
-                'json' => $key,
+            return $this->getHttpClient()->request('POST', 'keys/batch-delete', [
+                'json' => ['keys' => $key],
             ]);
         }
 

app/Repositories/Eloquent/DatabaseHostRepository.php

@@ -4,8 +4,6 @@
 
 use Illuminate\Support\Collection;
 use Pterodactyl\Models\DatabaseHost;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
 use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
 
 class DatabaseHostRepository extends EloquentRepository implements DatabaseHostRepositoryInterface
@@ -30,22 +28,4 @@ public function getWithViewDetails(): Collection
     {
         return $this->getBuilder()->withCount('databases')->with('node')->get();
     }
-
-    /**
-     * Return a database host with the databases and associated servers
-     * that are attached to said databases.
-     *
-     * @param int $id
-     * @return \Pterodactyl\Models\DatabaseHost
-     *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function getWithServers(int $id): DatabaseHost
-    {
-        try {
-            return $this->getBuilder()->with('databases.server')->findOrFail($id, $this->getColumns());
-        } catch (ModelNotFoundException $exception) {
-            throw new RecordNotFoundException;
-        }
-    }
 }