Merge branch 'release/v0.7.2'

Author: DaneEveritt

CHANGELOG.md

@@ -3,6 +3,19 @@ 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.2 (Derelict Dermodactylus)
+### Fixed
+* Fixes an exception thrown when trying to access the `/nests/:id/eggs/:id` API endpoint.
+* Fixes search on server listing page.
+* Schedules with no names are now clickable to allow editing.
+* Fixes broken permissions check that would deny access to API keys that did in fact have permission.
+
+### Added
+* Adds ability to include egg variables on an API request.
+* Added `external_id` column to servers that allows for easier linking with external services such as WHMCS.
+* Added back the sidebar when viewing servers that allows for quick-switching to a different server.
+* Added API endpoint to get a server by external ID.
+
 ## v0.7.1 (Derelict Dermodactylus)
 ### Fixed
 * Fixes an exception when no token is entered on the 2-Factor enable/disable page and the form is submitted.

CONTRIBUTING.md

@@ -41,4 +41,4 @@ If you've found what you believe is a security issue please email us at `support
 ### Where to find Us
 You can find us in a couple places online. First and foremost, we're active right here on Github. If you encounter a bug or other problem open an issue on here for us to take a look at it. We also accept feature requests here as well.
 
-You can also find us on [Discord](https://pterodactyl.io/discord). In the event that you need to get in contact with us privately feel free to contact us at `support@pterodactyl.io`. Try not to email us with requests for support regarding the panel, we'll probably just direct you to our forums or Discord.
+You can also find us on [Discord](https://pterodactyl.io/discord). In the event that you need to get in contact with us privately feel free to contact us at `support@pterodactyl.io`. Try not to email us with requests for support regarding the panel, we'll probably just direct you to our Discord.

README.md

@@ -6,7 +6,7 @@
 Pterodactyl Panel is the free, open-source, game agnostic, self-hosted control panel for users, networks, and game service providers. Pterodactyl supports games and servers such as Minecraft (including Spigot, Bungeecord, and Sponge), ARK: Evolution Evolved, CS:GO, Team Fortress 2, Insurgency, Teamspeak 3, Mumble, and many more. Control all of your games from one unified interface.
 
 ## Support & Documentation
-Support for using Pterodactyl can be found on our [Documentation Website](https://docs.pterodactyl.io), our [Discord Chat](https://discord.gg/QRDZvVm), or via our [Forums](https://forums.pterodactyl.io).
+Support for using Pterodactyl can be found on our [Documentation Website](https://docs.pterodactyl.io) or via our [Discord Chat](https://discord.gg/QRDZvVm).
 
 ## License
 ```

app/Contracts/Repository/ServerRepositoryInterface.php

@@ -103,9 +103,10 @@ public function getDaemonServiceData(Server $server, bool $refresh = false): arr
      *
      * @param \Pterodactyl\Models\User $user
      * @param int                      $level
-     * @return \Illuminate\Pagination\LengthAwarePaginator
+     * @param bool                     $paginate
+     * @return \Illuminate\Pagination\LengthAwarePaginator|\Illuminate\Database\Eloquent\Collection
      */
-    public function filterUserAccessServers(User $user, int $level): LengthAwarePaginator;
+    public function filterUserAccessServers(User $user, int $level, bool $paginate = true);
 
     /**
      * Return a server by UUID.

app/Http/Controllers/Admin/ServersController.php

@@ -201,12 +201,13 @@ public function __construct(
     /**
      * Display the index page with all servers currently on the system.
      *
+     * @param \Illuminate\Http\Request $request
      * @return \Illuminate\View\View
      */
-    public function index()
+    public function index(Request $request)
     {
         return view('admin.servers.index', [
-            'servers' => $this->repository->getAllServers(
+            'servers' => $this->repository->setSearchTerm($request->input('query'))->getAllServers(
                 $this->config->get('pterodactyl.paginate.admin.servers')
             ),
         ]);
@@ -405,7 +406,7 @@ public function viewDelete(Server $server)
     public function setDetails(Request $request, Server $server)
     {
         $this->detailsModificationService->handle($server, $request->only([
-            'owner_id', 'name', 'description',
+            'owner_id', 'external_id', 'name', 'description',
         ]));
 
         $this->alert->success(trans('admin/server.alerts.details_updated'))->flash();

app/Http/Controllers/Api/Application/Servers/ExternalServerController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Pterodactyl\Http\Controllers\Api\Application\Servers;
+
+use Pterodactyl\Transformers\Api\Application\ServerTransformer;
+use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
+use Pterodactyl\Http\Requests\Api\Application\Servers\GetExternalServerRequest;
+
+class ExternalServerController extends ApplicationApiController
+{
+    /**
+     * Retrieve a specific server from the database using its external ID.
+     *
+     * @param \Pterodactyl\Http\Requests\Api\Application\Servers\GetExternalServerRequest $request
+     * @return array
+     */
+    public function index(GetExternalServerRequest $request): array
+    {
+        return $this->fractal->item($request->getServerModel())
+            ->transformWith($this->getTransformer(ServerTransformer::class))
+            ->toArray();
+    }
+}

app/Http/Controllers/Api/Application/Servers/ServerController.php

@@ -9,6 +9,7 @@
 use Pterodactyl\Services\Servers\ServerDeletionService;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Transformers\Api\Application\ServerTransformer;
+use Pterodactyl\Http\Requests\Api\Application\Servers\GetServerRequest;
 use Pterodactyl\Http\Requests\Api\Application\Servers\GetServersRequest;
 use Pterodactyl\Http\Requests\Api\Application\Servers\ServerWriteRequest;
 use Pterodactyl\Http\Requests\Api\Application\Servers\StoreServerRequest;
@@ -91,10 +92,10 @@ public function store(StoreServerRequest $request): JsonResponse
     /**
      * Show a single server transformed for the application API.
      *
-     * @param \Pterodactyl\Http\Requests\Api\Application\Servers\ServerWriteRequest $request
+     * @param \Pterodactyl\Http\Requests\Api\Application\Servers\GetServerRequest $request
      * @return array
      */
-    public function view(ServerWriteRequest $request): array
+    public function view(GetServerRequest $request): array
     {
         return $this->fractal->item($request->getModel(Server::class))
             ->transformWith($this->getTransformer(ServerTransformer::class))

app/Http/Middleware/Api/Application/AuthenticateUser.php

@@ -19,7 +19,7 @@ class AuthenticateUser
     public function handle(Request $request, Closure $next)
     {
         if (is_null($request->user()) || ! $request->user()->root_admin) {
-            throw new AccessDeniedHttpException;
+            throw new AccessDeniedHttpException('This account does not have permission to access the API.');
         }
 
         return $next($request);

app/Http/Requests/Api/Application/ApplicationApiRequest.php

@@ -9,6 +9,7 @@
 use Pterodactyl\Exceptions\PterodactylException;
 use Pterodactyl\Http\Middleware\Api\ApiSubstituteBindings;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Routing\Exception\InvalidParameterException;
 
 abstract class ApplicationApiRequest extends FormRequest
 {
@@ -76,22 +77,23 @@ public function key(): ApiKey
     }
 
     /**
-     * Grab a model from the route parameters. If no model exists under
-     * the specified key a default response is returned.
+     * Grab a model from the route parameters. If no model is found in the
+     * binding mappings an exception will be thrown.
      *
      * @param string $model
-     * @param mixed  $default
      * @return mixed
+     *
+     * @throws \Symfony\Component\Routing\Exception\InvalidParameterException
      */
-    public function getModel(string $model, $default = null)
+    public function getModel(string $model)
     {
         $parameterKey = array_get(array_flip(ApiSubstituteBindings::getMappings()), $model);
 
-        if (! is_null($parameterKey)) {
-            $model = $this->route()->parameter($parameterKey);
+        if (is_null($parameterKey)) {
+            throw new InvalidParameterException;
         }
 
-        return $model ?? $default;
+        return $this->route()->parameter($parameterKey);
     }
 
     /*

app/Http/Requests/Api/Application/Nests/Eggs/GetEggRequest.php

@@ -2,6 +2,8 @@
 
 namespace Pterodactyl\Http\Requests\Api\Application\Nests\Eggs;
 
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Models\Nest;
 use Pterodactyl\Services\Acl\Api\AdminAcl;
 use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
 
@@ -24,6 +26,6 @@ class GetEggRequest extends ApplicationApiRequest
      */
     public function resourceExists(): bool
     {
-        return $this->getModel('nest')->id === $this->getModel('egg')->nest_id;
+        return $this->getModel(Nest::class)->id === $this->getModel(Egg::class)->nest_id;
     }
 }