Merge branch 'feature/api-v1' into develop

Author: DaneEveritt

app/Console/Commands/Migration/CleanOrphanedApiKeysCommand.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Pterodactyl\Console\Commands\Migration;
+
+use Pterodactyl\Models\ApiKey;
+use Illuminate\Console\Command;
+use Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface;
+
+class CleanOrphanedApiKeysCommand extends Command
+{
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface
+     */
+    private $repository;
+
+    /**
+     * @var string
+     */
+    protected $signature = 'p:migration:clean-orphaned-keys';
+
+    /**
+     * @var string
+     */
+    protected $description = 'Cleans API keys from the database that are not assigned a specific role.';
+
+    /**
+     * CleanOrphanedApiKeysCommand constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface $repository
+     */
+    public function __construct(ApiKeyRepositoryInterface $repository)
+    {
+        parent::__construct();
+
+        $this->repository = $repository;
+    }
+
+    /**
+     * Delete all orphaned API keys from the database when upgrading from 0.6 to 0.7.
+     *
+     * @return null|void
+     */
+    public function handle()
+    {
+        $count = $this->repository->findCountWhere([['key_type', '=', ApiKey::TYPE_NONE]]);
+        $continue = $this->confirm(
+            'This action will remove ' . $count . ' keys from the database. Are you sure you wish to continue?', false
+        );
+
+        if (! $continue) {
+            return null;
+        }
+
+        $this->info('Deleting keys...');
+        $this->repository->deleteWhere([['key_type', '=', ApiKey::TYPE_NONE]]);
+        $this->info('Keys were successfully deleted.');
+    }
+}

app/Contracts/Repository/AllocationRepositoryInterface.php

@@ -3,6 +3,7 @@
 namespace Pterodactyl\Contracts\Repository;
 
 use Illuminate\Support\Collection;
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 
 interface AllocationRepositoryInterface extends RepositoryInterface
 {
@@ -23,11 +24,60 @@ public function assignAllocationsToServer(int $server = null, array $ids): int;
      */
     public function getAllocationsForNode(int $node): Collection;
 
+    /**
+     * Return all of the allocations for a node in a paginated format.
+     *
+     * @param int $node
+     * @param int $perPage
+     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
+     */
+    public function getPaginatedAllocationsForNode(int $node, int $perPage = 100): LengthAwarePaginator;
+
     /**
      * Return all of the unique IPs that exist for a given node.
      *
      * @param int $node
      * @return \Illuminate\Support\Collection
      */
     public function getUniqueAllocationIpsForNode(int $node): Collection;
+
+    /**
+     * Return all of the allocations that exist for a node that are not currently
+     * allocated.
+     *
+     * @param int $node
+     * @return array
+     */
+    public function getUnassignedAllocationIds(int $node): array;
+
+    /**
+     * Get an array of all allocations that are currently assigned to a given server.
+     *
+     * @param int $server
+     * @return array
+     */
+    public function getAssignedAllocationIds(int $server): array;
+
+    /**
+     * Return a concated result set of node ips that already have at least one
+     * server assigned to that IP. This allows for filtering out sets for
+     * dedicated allocation IPs.
+     *
+     * If an array of nodes is passed the results will be limited to allocations
+     * in those nodes.
+     *
+     * @param array $nodes
+     * @return array
+     */
+    public function getDiscardableDedicatedAllocations(array $nodes = []): array;
+
+    /**
+     * Return a single allocation from those meeting the requirements.
+     *
+     * @param array $nodes
+     * @param array $ports
+     * @param bool  $dedicated
+     * @return \Pterodactyl\Models\Allocation|null
+     */
+    public function getRandomAllocation(array $nodes, array $ports, bool $dedicated = false);
 }

app/Contracts/Repository/ApiKeyRepositoryInterface.php

@@ -1,24 +1,43 @@
 <?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\APIKey;
+use Pterodactyl\Models\User;
+use Illuminate\Support\Collection;
 
 interface ApiKeyRepositoryInterface extends RepositoryInterface
 {
     /**
-     * Load permissions for a key onto the model.
+     * Get all of the account API keys that exist for a specific user.
      *
-     * @param \Pterodactyl\Models\APIKey $model
-     * @param bool                       $refresh
-     * @return \Pterodactyl\Models\APIKey
+     * @param \Pterodactyl\Models\User $user
+     * @return \Illuminate\Support\Collection
      */
-    public function loadPermissions(APIKey $model, bool $refresh = false): APIKey;
+    public function getAccountKeys(User $user): Collection;
+
+    /**
+     * Get all of the application API keys that exist for a specific user.
+     *
+     * @param \Pterodactyl\Models\User $user
+     * @return \Illuminate\Support\Collection
+     */
+    public function getApplicationKeys(User $user): Collection;
+
+    /**
+     * Delete an account API key from the panel for a specific user.
+     *
+     * @param \Pterodactyl\Models\User $user
+     * @param string                   $identifier
+     * @return int
+     */
+    public function deleteAccountKey(User $user, string $identifier): int;
+
+    /**
+     * Delete an application API key from the panel for a specific user.
+     *
+     * @param \Pterodactyl\Models\User $user
+     * @param string                   $identifier
+     * @return int
+     */
+    public function deleteApplicationKey(User $user, string $identifier): int;
 }

app/Contracts/Repository/NodeRepositoryInterface.php

@@ -2,6 +2,7 @@
 
 namespace Pterodactyl\Contracts\Repository;
 
+use Generator;
 use Pterodactyl\Models\Node;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
@@ -62,4 +63,15 @@ public function getNodeServers(int $id): Node;
      * @return \Illuminate\Support\Collection
      */
     public function getNodesForServerCreation(): Collection;
+
+    /**
+     * Return the IDs of all nodes that exist in the provided locations and have the space
+     * available to support the additional disk and memory provided.
+     *
+     * @param array $locations
+     * @param int   $disk
+     * @param int   $memory
+     * @return \Generator
+     */
+    public function getNodesWithResourceUse(array $locations, int $disk, int $memory): Generator;
 }

app/Contracts/Repository/RepositoryInterface.php

@@ -3,6 +3,7 @@
 namespace Pterodactyl\Contracts\Repository;
 
 use Illuminate\Support\Collection;
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 
 interface RepositoryInterface
 {
@@ -175,6 +176,14 @@ public function updateOrCreate(array $where, array $fields, bool $validate = tru
      */
     public function all(): Collection;
 
+    /**
+     * Return a paginated result set using a search term if set on the repository.
+     *
+     * @param int $perPage
+     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
+     */
+    public function paginated(int $perPage): LengthAwarePaginator;
+
     /**
      * Insert a single or multiple records into the database at once skipping
      * validation and mass assignment checking.

app/Exceptions/DisplayException.php

@@ -1,19 +1,16 @@
 <?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\Exceptions;
 
 use Log;
 use Throwable;
+use Illuminate\Http\Response;
+use Prologue\Alerts\AlertsMessageBag;
 
 class DisplayException extends PterodactylException
 {
+    const LEVEL_DEBUG = 'debug';
+    const LEVEL_INFO = 'info';
     const LEVEL_WARNING = 'warning';
     const LEVEL_ERROR = 'error';
 
@@ -32,13 +29,13 @@ class DisplayException extends PterodactylException
      */
     public function __construct($message, Throwable $previous = null, $level = self::LEVEL_ERROR, $code = 0)
     {
-        $this->level = $level;
+        parent::__construct($message, $code, $previous);
 
         if (! is_null($previous)) {
             Log::{$level}($previous);
         }
 
-        parent::__construct($message, $code, $previous);
+        $this->level = $level;
     }
 
     /**
@@ -48,4 +45,33 @@ public function getErrorLevel()
     {
         return $this->level;
     }
+
+    /**
+     * @return int
+     */
+    public function getStatusCode()
+    {
+        return Response::HTTP_BAD_REQUEST;
+    }
+
+    /**
+     * Render the exception to the user by adding a flashed message to the session
+     * and then redirecting them back to the page that they came from. If the
+     * request originated from an API hit, return the error in JSONAPI spec format.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
+     */
+    public function render($request)
+    {
+        if ($request->expectsJson()) {
+            return response()->json(Handler::convertToArray($this, [
+                'detail' => $this->getMessage(),
+            ]), method_exists($this, 'getStatusCode') ? $this->getStatusCode() : Response::HTTP_BAD_REQUEST);
+        }
+
+        app()->make(AlertsMessageBag::class)->danger($this->getMessage())->flash();
+
+        return redirect()->back()->withInput();
+    }
 }