Merge branch 'develop' into feature/react-admin

This commit is contained in:
Matthew Penner 2021-07-13 15:21:16 -06:00
commit ea4bcf0b9c
23 changed files with 1073 additions and 689 deletions

View file

@ -7,6 +7,7 @@ use Pterodactyl\Models\Node;
use Pterodactyl\Models\Task;
use Pterodactyl\Models\User;
use Webmozart\Assert\Assert;
use InvalidArgumentException;
use Pterodactyl\Models\Backup;
use Pterodactyl\Models\Server;
use Pterodactyl\Models\Subuser;
@ -60,8 +61,6 @@ abstract class ClientApiIntegrationTestCase extends IntegrationTestCase
*/
protected function link($model, $append = null): string
{
Assert::isInstanceOfAny($model, [Server::class, Schedule::class, Task::class, Allocation::class]);
$link = '';
switch (get_class($model)) {
case Server::class:
@ -76,6 +75,11 @@ abstract class ClientApiIntegrationTestCase extends IntegrationTestCase
case Allocation::class:
$link = "/api/client/servers/{$model->server->uuid}/network/allocations/{$model->id}";
break;
case Backup::class:
$link = "/api/client/servers/{$model->server->uuid}/backups/{$model->uuid}";
break;
default:
throw new InvalidArgumentException(sprintf('Cannot create link for Model of type %s', class_basename($model)));
}
return $link . ($append ? '/' . ltrim($append, '/') : '');

View file

@ -0,0 +1,65 @@
<?php
namespace Pterodactyl\Tests\Integration\Api\Client\Server\Backup;
use Mockery;
use Illuminate\Http\Response;
use Pterodactyl\Models\Backup;
use Pterodactyl\Models\AuditLog;
use Pterodactyl\Models\Permission;
use Pterodactyl\Repositories\Wings\DaemonBackupRepository;
use Pterodactyl\Tests\Integration\Api\Client\ClientApiIntegrationTestCase;
class DeleteBackupTest extends ClientApiIntegrationTestCase
{
private $repository;
public function setUp(): void
{
parent::setUp();
$this->repository = $this->mock(DaemonBackupRepository::class);
}
public function testUserWithoutPermissionCannotDeleteBackup()
{
[$user, $server] = $this->generateTestAccount([Permission::ACTION_BACKUP_CREATE]);
$backup = Backup::factory()->create(['server_id' => $server->id]);
$this->actingAs($user)->deleteJson($this->link($backup))
->assertStatus(Response::HTTP_FORBIDDEN);
}
/**
* Tests that a backup can be deleted for a server and that it is properly updated
* in the database. Once deleted there should also be a corresponding record in the
* audit logs table for this API call.
*/
public function testBackupCanBeDeleted()
{
[$user, $server] = $this->generateTestAccount([Permission::ACTION_BACKUP_DELETE]);
/** @var \Pterodactyl\Models\Backup $backup */
$backup = Backup::factory()->create(['server_id' => $server->id]);
$this->repository->expects('setServer->delete')->with(Mockery::on(function ($value) use ($backup) {
return $value instanceof Backup && $value->uuid === $backup->uuid;
}))->andReturn(new Response());
$this->actingAs($user)->deleteJson($this->link($backup))->assertStatus(Response::HTTP_NO_CONTENT);
$backup->refresh();
$this->assertNotNull($backup->deleted_at);
$this->actingAs($user)->deleteJson($this->link($backup))->assertStatus(Response::HTTP_NOT_FOUND);
$event = $backup->audits()->where('action', AuditLog::SERVER__BACKUP_DELETED)->latest()->first();
$this->assertNotNull($event);
$this->assertFalse($event->is_system);
$this->assertEquals($backup->server_id, $event->server_id);
$this->assertEquals($user->id, $event->user_id);
}
}

View file

@ -0,0 +1,123 @@
<?php
namespace Pterodactyl\Tests\Integration\Services\Backups;
use Mockery;
use GuzzleHttp\Psr7\Request;
use GuzzleHttp\Psr7\Response;
use Pterodactyl\Models\Backup;
use GuzzleHttp\Exception\ClientException;
use Pterodactyl\Extensions\Backups\BackupManager;
use Pterodactyl\Services\Backups\DeleteBackupService;
use Pterodactyl\Tests\Integration\IntegrationTestCase;
use Pterodactyl\Repositories\Wings\DaemonBackupRepository;
use Pterodactyl\Exceptions\Service\Backup\BackupLockedException;
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
class DeleteBackupServiceTest extends IntegrationTestCase
{
private $repository;
public function setUp(): void
{
parent::setUp();
$this->repository = Mockery::mock(DaemonBackupRepository::class);
$this->app->instance(DaemonBackupRepository::class, $this->repository);
}
public function testLockedBackupCannotBeDeleted()
{
$server = $this->createServerModel();
$backup = Backup::factory()->create([
'server_id' => $server->id,
'is_locked' => true,
]);
$this->expectException(BackupLockedException::class);
$this->app->make(DeleteBackupService::class)->handle($backup);
}
public function testFailedBackupThatIsLockedCanBeDeleted()
{
$server = $this->createServerModel();
$backup = Backup::factory()->create([
'server_id' => $server->id,
'is_locked' => true,
'is_successful' => false,
]);
$this->repository->expects('setServer->delete')->with($backup)->andReturn(
new Response()
);
$this->app->make(DeleteBackupService::class)->handle($backup);
$backup->refresh();
$this->assertNotNull($backup->deleted_at);
}
public function testExceptionThrownDueToMissingBackupIsIgnored()
{
$server = $this->createServerModel();
$backup = Backup::factory()->create(['server_id' => $server->id]);
$this->repository->expects('setServer->delete')->with($backup)->andThrow(
new DaemonConnectionException(
new ClientException('', new Request('DELETE', '/'), new Response(404))
)
);
$this->app->make(DeleteBackupService::class)->handle($backup);
$backup->refresh();
$this->assertNotNull($backup->deleted_at);
}
public function testExceptionIsThrownIfNot404()
{
$server = $this->createServerModel();
$backup = Backup::factory()->create(['server_id' => $server->id]);
$this->repository->expects('setServer->delete')->with($backup)->andThrow(
new DaemonConnectionException(
new ClientException('', new Request('DELETE', '/'), new Response(500))
)
);
$this->expectException(DaemonConnectionException::class);
$this->app->make(DeleteBackupService::class)->handle($backup);
$backup->refresh();
$this->assertNull($backup->deleted_at);
}
public function testS3ObjectCanBeDeleted()
{
$server = $this->createServerModel();
$backup = Backup::factory()->create([
'disk' => Backup::ADAPTER_AWS_S3,
'server_id' => $server->id,
]);
$manager = $this->mock(BackupManager::class);
$manager->expects('getBucket')->andReturns('foobar');
$manager->expects('adapter')->with(Backup::ADAPTER_AWS_S3)->andReturnSelf();
$manager->expects('getClient->deleteObject')->with([
'Bucket' => 'foobar',
'Key' => sprintf('%s/%s.tar.gz', $server->uuid, $backup->uuid),
]);
$this->app->make(DeleteBackupService::class)->handle($backup);
$backup->refresh();
$this->assertNotNull($backup->deleted_at);
}
}