Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PostgreSQL Support (#4486)

Browse source 
Co-authored-by: Matthew Penner <matthew@pterodactyl.io>
This commit is contained in:
Lance Pioch 2022-11-25 15:29:04 -05:00 • committed by GitHub
parent 21613fa602
commit 3bf5a71802
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
223 changed files with 912 additions and 1052 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/Integration/Api/Application/Location/LocationControllerTest.php
View file

@ -249,7 +249,7 @@ class LocationControllerTest extends ApplicationApiIntegrationTestCase
*/
public function testGetMissingLocation()
{
$response = $this->getJson('/api/application/locations/nil');
$response = $this->getJson('/api/application/locations/0');
$this->assertNotFoundJson($response);
}

2
tests/Integration/Api/Application/Nests/EggControllerTest.php
View file

@ -104,7 +104,7 @@ class EggControllerTest extends ApplicationApiIntegrationTestCase
{
$egg = Egg::query()->findOrFail(1);
$response = $this->getJson('/api/application/nests/' . $egg->nest_id . '/eggs/nil');
$response = $this->getJson('/api/application/nests/' . $egg->nest_id . '/eggs/0');
$this->assertNotFoundJson($response);
}

2
tests/Integration/Api/Application/Nests/NestControllerTest.php
View file

@ -108,7 +108,7 @@ class NestControllerTest extends ApplicationApiIntegrationTestCase
*/
public function testGetMissingNest()
{
$response = $this->getJson('/api/application/nests/nil');
$response = $this->getJson('/api/application/nests/0');
$this->assertNotFoundJson($response);
}

2
tests/Integration/Api/Application/Users/ExternalUserControllerTest.php
View file

@ -51,7 +51,7 @@ class ExternalUserControllerTest extends ApplicationApiIntegrationTestCase
*/
public function testGetMissingUser()
{
$response = $this->getJson('/api/application/users/external/nil');
$response = $this->getJson('/api/application/users/external/0');
$this->assertNotFoundJson($response);
}

2
tests/Integration/Api/Application/Users/UserControllerTest.php
View file

@ -184,7 +184,7 @@ class UserControllerTest extends ApplicationApiIntegrationTestCase
*/
public function testGetMissingUser()
{
$response = $this->getJson('/api/application/users/nil');
$response = $this->getJson('/api/application/users/0');
$this->assertNotFoundJson($response);
}

26
tests/Integration/Api/Client/ClientControllerTest.php
View file

@ -18,10 +18,10 @@ class ClientControllerTest extends ClientApiIntegrationTestCase
*/
public function testOnlyLoggedInUsersServersAreReturned()
{
/** @var \Pterodactyl\Models\User[] $users */
/** @var User[] $users */
$users = User::factory()->times(3)->create();
/** @var \Pterodactyl\Models\Server[] $servers */
/** @var Server[] $servers */
$servers = [
$this->createServerModel(['user_id' => $users[0]->id]),
$this->createServerModel(['user_id' => $users[1]->id]),
@ -45,11 +45,11 @@ class ClientControllerTest extends ClientApiIntegrationTestCase
*/
public function testServersAreFilteredUsingNameAndUuidInformation()
{
/** @var \Pterodactyl\Models\User[] $users */
/** @var User[] $users */
$users = User::factory()->times(2)->create();
$users[0]->update(['root_admin' => true]);
/** @var \Pterodactyl\Models\Server[] $servers */
/** @var Server[] $servers */
$servers = [
$this->createServerModel(['user_id' => $users[0]->id, 'name' => 'Julia']),
$this->createServerModel(['user_id' => $users[1]->id, 'uuidShort' => '12121212', 'name' => 'Janice']),
@ -101,8 +101,8 @@ class ClientControllerTest extends ClientApiIntegrationTestCase
*/
public function testServersAreFilteredUsingAllocationInformation()
{
/** @var \Pterodactyl\Models\User $user */
/** @var \Pterodactyl\Models\Server $server */
/** @var User $user */
/** @var Server $server */
[$user, $server] = $this->generateTestAccount();
$server2 = $this->createServerModel(['user_id' => $user->id, 'node_id' => $server->node_id]);
@ -143,7 +143,7 @@ class ClientControllerTest extends ClientApiIntegrationTestCase
*/
public function testServersUserIsASubuserOfAreReturned()
{
/** @var \Pterodactyl\Models\User[] $users */
/** @var User[] $users */
$users = User::factory()->times(3)->create();
$servers = [
$this->createServerModel(['user_id' => $users[0]->id]),
@ -174,7 +174,7 @@ class ClientControllerTest extends ClientApiIntegrationTestCase
*/
public function testFilterOnlyOwnerServers()
{
/** @var \Pterodactyl\Models\User[] $users */
/** @var User[] $users */
$users = User::factory()->times(3)->create();
$servers = [
$this->createServerModel(['user_id' => $users[0]->id]),
@ -203,7 +203,7 @@ class ClientControllerTest extends ClientApiIntegrationTestCase
*/
public function testPermissionsAreReturned()
{
/** @var \Pterodactyl\Models\User $user */
/** @var User $user */
$user = User::factory()->create();
$this->actingAs($user)
@ -223,7 +223,7 @@ class ClientControllerTest extends ClientApiIntegrationTestCase
*/
public function testOnlyAdminLevelServersAreReturned()
{
/** @var \Pterodactyl\Models\User[] $users */
/** @var User[] $users */
$users = User::factory()->times(4)->create();
$users[0]->update(['root_admin' => true]);
@ -258,7 +258,7 @@ class ClientControllerTest extends ClientApiIntegrationTestCase
*/
public function testAllServersAreReturnedToAdmin()
{
/** @var \Pterodactyl\Models\User[] $users */
/** @var User[] $users */
$users = User::factory()->times(4)->create();
$users[0]->update(['root_admin' => true]);
@ -290,7 +290,7 @@ class ClientControllerTest extends ClientApiIntegrationTestCase
*/
public function testNoServersAreReturnedIfAdminFilterIsPassedByRegularUser(string $type)
{
/** @var \Pterodactyl\Models\User[] $users */
/** @var User[] $users */
$users = User::factory()->times(3)->create();
$this->createServerModel(['user_id' => $users[0]->id]);
@ -309,7 +309,7 @@ class ClientControllerTest extends ClientApiIntegrationTestCase
*/
public function testOnlyPrimaryAllocationIsReturnedToSubuser()
{
/** @var \Pterodactyl\Models\Server $server */
/** @var Server $server */
[$user, $server] = $this->generateTestAccount([Permission::ACTION_WEBSOCKET_CONNECT]);
$server->allocation->notes = 'Test notes';
$server->allocation->save();

2
tests/Integration/Api/Client/Server/Startup/GetStartupAndVariablesTest.php
View file

@ -42,7 +42,7 @@ class GetStartupAndVariablesTest extends ClientApiIntegrationTestCase
$response->assertJsonPath('object', 'list');
$response->assertJsonCount(1, 'data');
$response->assertJsonPath('data.0.object', EggVariable::RESOURCE_NAME);
$this->assertJsonTransformedWith($response->json('data.0.attributes'), $egg->variables[1]);
$this->assertJsonTransformedWith($response->json('data.0.attributes'), $egg->variables()->orderBy('id', 'desc')->first());
}
/**

2
tests/Integration/IntegrationTestCase.php
View file

@ -16,7 +16,7 @@ abstract class IntegrationTestCase extends TestCase
use CreatesTestModels;
use AssertsActivityLogged;
protected array $connectionsToTransact = ['mysql'];
// protected array $connectionsToTransact = ['pgsql'];
protected $defaultHeaders = [
'Accept' => 'application/json',

7
tests/Integration/Services/Servers/ServerCreationServiceTest.php
View file

@ -127,9 +127,10 @@ class ServerCreationServiceTest extends IntegrationTestCase
$this->assertNotNull($response->uuid);
$this->assertSame($response->uuidShort, substr($response->uuid, 0, 8));
$this->assertSame($egg->id, $response->egg_id);
$this->assertCount(2, $response->variables);
$this->assertSame('123', $response->variables[0]->server_value);
$this->assertSame('server2.jar', $response->variables[1]->server_value);
$variables = $response->variables->sortBy('server_value')->values();
$this->assertCount(2, $variables);
$this->assertSame('123', $variables->get(0)->server_value);
$this->assertSame('server2.jar', $variables->get(1)->server_value);
foreach ($data as $key => $value) {
if (in_array($key, ['allocation_additional', 'environment', 'start_on_completion'])) {

19
tests/Integration/Services/Servers/StartupModificationServiceTest.php
View file

@ -109,7 +109,7 @@ class StartupModificationServiceTest extends IntegrationTestCase
$clone = $this->cloneEggAndVariables($server->egg);
// This makes the BUNGEE_VERSION variable not user editable.
$clone->variables()->first()->update([
$clone->variables()->orderBy('id')->first()->update([
'user_editable' => false,
]);
@ -118,7 +118,7 @@ class StartupModificationServiceTest extends IntegrationTestCase
ServerVariable::query()->updateOrCreate([
'server_id' => $server->id,
'variable_id' => $server->variables[0]->id,
'variable_id' => $server->variables()->orderBy('id')->first()->id,
], ['variable_value' => 'EXIST']);
$response = $this->getService()->handle($server, [
@ -128,9 +128,10 @@ class StartupModificationServiceTest extends IntegrationTestCase
],
]);
$this->assertCount(2, $response->variables);
$this->assertSame('EXIST', $response->variables[0]->server_value);
$this->assertSame('test.jar', $response->variables[1]->server_value);
$variables = $response->variables->sortBy('server_value')->values();
$this->assertCount(2, $variables);
$this->assertSame('EXIST', $variables->get(0)->server_value);
$this->assertSame('test.jar', $variables->get(1)->server_value);
$response = $this->getService()
->setUserLevel(User::USER_LEVEL_ADMIN)
@ -141,9 +142,11 @@ class StartupModificationServiceTest extends IntegrationTestCase
],
]);
$this->assertCount(2, $response->variables);
$this->assertSame('1234', $response->variables[0]->server_value);
$this->assertSame('test.jar', $response->variables[1]->server_value);
$variables = $response->variables->sortBy('server_value')->values();
$this->assertCount(2, $variables);
$this->assertSame('1234', $variables->get(0)->server_value);
$this->assertSame('test.jar', $variables->get(1)->server_value);
}
/**

11
tests/Integration/Services/Servers/VariableValidatorServiceTest.php
View file

@ -108,11 +108,12 @@ class VariableValidatorServiceTest extends IntegrationTestCase
]);
$this->assertInstanceOf(Collection::class, $response);
$this->assertCount(2, $response);
$this->assertSame('BUNGEE_VERSION', $response->get(0)->key);
$this->assertSame('123', $response->get(0)->value);
$this->assertSame('SERVER_JARFILE', $response->get(1)->key);
$this->assertSame('server.jar', $response->get(1)->value);
$variables = $response->sortBy('key')->values();
$this->assertCount(2, $variables);
$this->assertSame('BUNGEE_VERSION', $variables->get(0)->key);
$this->assertSame('123', $variables->get(0)->value);
$this->assertSame('SERVER_JARFILE', $variables->get(1)->key);
$this->assertSame('server.jar', $variables->get(1)->value);
}
public function testNullableEnvironmentVariablesCanBeUsedCorrectly()

48
tests/Traits/MocksPdoConnection.php
View file

@ -1,48 +0,0 @@
<?php
namespace Pterodactyl\Tests\Traits;
use PDO;
use Mockery;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\MySqlConnection;
use Illuminate\Database\ConnectionResolver;
use Illuminate\Database\ConnectionResolverInterface;
trait MocksPdoConnection
{
private static ?ConnectionResolverInterface $initialResolver;
/**
* Generates a mock PDO connection and injects it into the models so that any actual
* DB call can be properly intercepted.
*/
protected function mockPdoConnection(): Mockery\MockInterface
{
self::$initialResolver = Model::getConnectionResolver();
Model::unsetConnectionResolver();
$connection = new MySqlConnection($mock = Mockery::mock(PDO::class), 'testing_mock');
$resolver = new ConnectionResolver(['mocked' => $connection]);
$resolver->setDefaultConnection('mocked');
Model::setConnectionResolver($resolver);
return $mock;
}
/**
* Resets the mock state.
*/
protected function tearDownPdoMock(): void
{
if (!self::$initialResolver) {
return;
}
Model::setConnectionResolver(self::$initialResolver);
self::$initialResolver = null;
}
}