Complete move from old repository to new repository structure!
This commit is contained in:
parent
2cabb61b54
commit
72735c24f7
27 changed files with 964 additions and 730 deletions
|
@ -0,0 +1,72 @@
|
|||
<?php
|
||||
/**
|
||||
* Pterodactyl - Panel
|
||||
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
namespace Tests\Unit\Services\Subusers;
|
||||
|
||||
use Mockery as m;
|
||||
use Pterodactyl\Contracts\Repository\PermissionRepositoryInterface;
|
||||
use Pterodactyl\Services\Subusers\PermissionCreationService;
|
||||
use Tests\TestCase;
|
||||
|
||||
class PermissionCreationServiceTest extends TestCase
|
||||
{
|
||||
/**
|
||||
* @var \Pterodactyl\Contracts\Repository\PermissionRepositoryInterface
|
||||
*/
|
||||
protected $repository;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Services\Subusers\PermissionCreationService
|
||||
*/
|
||||
protected $service;
|
||||
|
||||
/**
|
||||
* Setup tests.
|
||||
*/
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
$this->repository = m::mock(PermissionRepositoryInterface::class);
|
||||
$this->service = new PermissionCreationService($this->repository);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that permissions can be assigned correctly.
|
||||
*/
|
||||
public function testPermissionsAreAssignedCorrectly()
|
||||
{
|
||||
$permissions = ['reset-sftp', 'view-sftp'];
|
||||
|
||||
$this->repository->shouldReceive('insert')->with([
|
||||
['subuser_id' => 1, 'permission' => 'reset-sftp'],
|
||||
['subuser_id' => 1, 'permission' => 'view-sftp'],
|
||||
]);
|
||||
|
||||
$response = $this->service->handle(1, $permissions);
|
||||
|
||||
$this->assertNotEmpty($response);
|
||||
$this->assertEquals(['s:get', 's:console', 's:set-password'], $response);
|
||||
}
|
||||
}
|
|
@ -29,7 +29,6 @@ use Illuminate\Log\Writer;
|
|||
use Mockery as m;
|
||||
use phpmock\phpunit\PHPMock;
|
||||
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
|
||||
use Pterodactyl\Contracts\Repository\PermissionRepositoryInterface;
|
||||
use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
|
||||
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
|
||||
use Pterodactyl\Exceptions\DisplayException;
|
||||
|
@ -38,6 +37,7 @@ use Pterodactyl\Exceptions\Service\Subuser\UserIsServerOwnerException;
|
|||
use Pterodactyl\Models\Server;
|
||||
use Pterodactyl\Models\Subuser;
|
||||
use Pterodactyl\Models\User;
|
||||
use Pterodactyl\Services\Subusers\PermissionCreationService;
|
||||
use Pterodactyl\Services\Subusers\SubuserCreationService;
|
||||
use Pterodactyl\Services\Users\CreationService;
|
||||
use Tests\TestCase;
|
||||
|
@ -58,14 +58,9 @@ class SubuserCreationServiceTest extends TestCase
|
|||
protected $daemonRepository;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Models\Permission
|
||||
* @var \Pterodactyl\Services\Subusers\PermissionCreationService
|
||||
*/
|
||||
protected $permission;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Contracts\Repository\PermissionRepositoryInterface
|
||||
*/
|
||||
protected $permissionRepository;
|
||||
protected $permissionService;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface
|
||||
|
@ -108,8 +103,7 @@ class SubuserCreationServiceTest extends TestCase
|
|||
|
||||
$this->connection = m::mock(ConnectionInterface::class);
|
||||
$this->daemonRepository = m::mock(DaemonServerRepositoryInterface::class);
|
||||
$this->permission = m::mock('overload:Pterodactyl\Models\Permission');
|
||||
$this->permissionRepository = m::mock(PermissionRepositoryInterface::class);
|
||||
$this->permissionService = m::mock(PermissionCreationService::class);
|
||||
$this->subuserRepository = m::mock(SubuserRepositoryInterface::class);
|
||||
$this->serverRepository = m::mock(ServerRepositoryInterface::class);
|
||||
$this->userCreationService = m::mock(CreationService::class);
|
||||
|
@ -120,7 +114,7 @@ class SubuserCreationServiceTest extends TestCase
|
|||
$this->connection,
|
||||
$this->userCreationService,
|
||||
$this->daemonRepository,
|
||||
$this->permissionRepository,
|
||||
$this->permissionService,
|
||||
$this->serverRepository,
|
||||
$this->subuserRepository,
|
||||
$this->userRepository,
|
||||
|
@ -154,14 +148,8 @@ class SubuserCreationServiceTest extends TestCase
|
|||
'daemonSecret' => 'bin2hex',
|
||||
])->once()->andReturn($subuser);
|
||||
|
||||
$this->permission->shouldReceive('getPermissions')->with(true)->once()
|
||||
->andReturn($permissions);
|
||||
|
||||
foreach(array_keys($permissions) as $permission) {
|
||||
$this->permissionRepository->shouldReceive('create')
|
||||
->with(['subuser_id' => $subuser->id, 'permission' => $permission])
|
||||
->once()->andReturnNull();
|
||||
}
|
||||
$this->permissionService->shouldReceive('handle')->with($subuser->id, array_keys($permissions))->once()
|
||||
->andReturn(['s:get', 's:console', 'test:1']);
|
||||
|
||||
$this->daemonRepository->shouldReceive('setNode')->with($server->node_id)->once()->andReturnSelf()
|
||||
->shouldReceive('setAccessServer')->with($server->uuid)->once()->andReturnSelf()
|
||||
|
@ -179,7 +167,7 @@ class SubuserCreationServiceTest extends TestCase
|
|||
*/
|
||||
public function testExistingUserCanBeAddedAsASubuser()
|
||||
{
|
||||
$permissions = ['test-1' => 'test:1', 'test-2' => null];
|
||||
$permissions = ['view-sftp', 'reset-sftp'];
|
||||
$server = factory(Server::class)->make();
|
||||
$user = factory(User::class)->make();
|
||||
$subuser = factory(Subuser::class)->make(['user_id' => $user->id, 'server_id' => $server->id]);
|
||||
|
@ -197,21 +185,15 @@ class SubuserCreationServiceTest extends TestCase
|
|||
'daemonSecret' => 'bin2hex',
|
||||
])->once()->andReturn($subuser);
|
||||
|
||||
$this->permission->shouldReceive('getPermissions')->with(true)->once()
|
||||
->andReturn($permissions);
|
||||
|
||||
foreach(array_keys($permissions) as $permission) {
|
||||
$this->permissionRepository->shouldReceive('create')
|
||||
->with(['subuser_id' => $subuser->id, 'permission' => $permission])
|
||||
->once()->andReturnNull();
|
||||
}
|
||||
$this->permissionService->shouldReceive('handle')->with($subuser->id, $permissions)->once()
|
||||
->andReturn(['s:get', 's:console', 's:set-password']);
|
||||
|
||||
$this->daemonRepository->shouldReceive('setNode')->with($server->node_id)->once()->andReturnSelf()
|
||||
->shouldReceive('setAccessServer')->with($server->uuid)->once()->andReturnSelf()
|
||||
->shouldReceive('setSubuserKey')->with($subuser->daemonSecret, ['s:get', 's:console', 'test:1'])->once()->andReturnSelf();
|
||||
->shouldReceive('setSubuserKey')->with($subuser->daemonSecret, ['s:get', 's:console', 's:set-password'])->once()->andReturnSelf();
|
||||
$this->connection->shouldReceive('commit')->withNoArgs()->once()->andReturnNull();
|
||||
|
||||
$response = $this->service->handle($server, $user->email, array_keys($permissions));
|
||||
$response = $this->service->handle($server, $user->email, $permissions);
|
||||
|
||||
$this->assertInstanceOf(Subuser::class, $response);
|
||||
$this->assertSame($subuser, $response);
|
||||
|
|
|
@ -97,7 +97,7 @@ class SubuserDeletionServiceTest extends TestCase
|
|||
$subuser = factory(Subuser::class)->make();
|
||||
$subuser->server = factory(Server::class)->make();
|
||||
|
||||
$this->repository->shouldReceive('getWithServerAndPermissions')->with($subuser->id)->once()->andReturn($subuser);
|
||||
$this->repository->shouldReceive('getWithServer')->with($subuser->id)->once()->andReturn($subuser);
|
||||
$this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
|
||||
$this->repository->shouldReceive('delete')->with($subuser->id)->once()->andReturn(1);
|
||||
|
||||
|
@ -119,7 +119,7 @@ class SubuserDeletionServiceTest extends TestCase
|
|||
$subuser = factory(Subuser::class)->make();
|
||||
$subuser->server = factory(Server::class)->make();
|
||||
|
||||
$this->repository->shouldReceive('getWithServerAndPermissions')->with($subuser->id)->once()->andReturn($subuser);
|
||||
$this->repository->shouldReceive('getWithServer')->with($subuser->id)->once()->andReturn($subuser);
|
||||
$this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
|
||||
$this->repository->shouldReceive('delete')->with($subuser->id)->once()->andReturn(1);
|
||||
|
||||
|
|
158
tests/Unit/Services/Subusers/SubuserUpdateServiceTest.php
Normal file
158
tests/Unit/Services/Subusers/SubuserUpdateServiceTest.php
Normal file
|
@ -0,0 +1,158 @@
|
|||
<?php
|
||||
/**
|
||||
* Pterodactyl - Panel
|
||||
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
namespace Tests\Unit\Services\Subusers;
|
||||
|
||||
use GuzzleHttp\Exception\RequestException;
|
||||
use Illuminate\Database\ConnectionInterface;
|
||||
use Illuminate\Log\Writer;
|
||||
use Mockery as m;
|
||||
use Pterodactyl\Contracts\Repository\PermissionRepositoryInterface;
|
||||
use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
|
||||
use Pterodactyl\Exceptions\DisplayException;
|
||||
use Pterodactyl\Models\Server;
|
||||
use Pterodactyl\Models\Subuser;
|
||||
use Pterodactyl\Services\Subusers\PermissionCreationService;
|
||||
use Pterodactyl\Services\Subusers\SubuserUpdateService;
|
||||
use Tests\TestCase;
|
||||
use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
|
||||
|
||||
class SubuserUpdateServiceTest extends TestCase
|
||||
{
|
||||
/**
|
||||
* @var \Illuminate\Database\ConnectionInterface
|
||||
*/
|
||||
protected $connection;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
|
||||
*/
|
||||
protected $daemonRepository;
|
||||
|
||||
/**
|
||||
* @var \GuzzleHttp\Exception\RequestException
|
||||
*/
|
||||
protected $exception;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Contracts\Repository\PermissionRepositoryInterface
|
||||
*/
|
||||
protected $permissionRepository;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Services\Subusers\PermissionCreationService
|
||||
*/
|
||||
protected $permissionService;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface
|
||||
*/
|
||||
protected $repository;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Services\Subusers\SubuserUpdateService
|
||||
*/
|
||||
protected $service;
|
||||
|
||||
/**
|
||||
* @var \Illuminate\Log\Writer
|
||||
*/
|
||||
protected $writer;
|
||||
|
||||
/**
|
||||
* Setup tests.
|
||||
*/
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
$this->connection = m::mock(ConnectionInterface::class);
|
||||
$this->daemonRepository = m::mock(DaemonServerRepositoryInterface::class);
|
||||
$this->exception = m::mock(RequestException::class);
|
||||
$this->permissionRepository = m::mock(PermissionRepositoryInterface::class);
|
||||
$this->permissionService = m::mock(PermissionCreationService::class);
|
||||
$this->repository = m::mock(SubuserRepositoryInterface::class);
|
||||
$this->writer = m::mock(Writer::class);
|
||||
|
||||
$this->service = new SubuserUpdateService(
|
||||
$this->connection,
|
||||
$this->daemonRepository,
|
||||
$this->permissionService,
|
||||
$this->permissionRepository,
|
||||
$this->repository,
|
||||
$this->writer
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that permissions are updated in the database.
|
||||
*/
|
||||
public function testPermissionsAreUpdated()
|
||||
{
|
||||
$subuser = factory(Subuser::class)->make();
|
||||
$subuser->server = factory(Server::class)->make();
|
||||
|
||||
$this->repository->shouldReceive('getWithServer')->with($subuser->id)->once()->andReturn($subuser);
|
||||
$this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
|
||||
$this->permissionRepository->shouldReceive('deleteWhere')->with([
|
||||
['subuser_id', '=', $subuser->id],
|
||||
])->once()->andReturnNull();
|
||||
$this->permissionService->shouldReceive('handle')->with($subuser->id, ['some-permission'])->once()->andReturn(['test:1', 'test:2']);
|
||||
|
||||
$this->daemonRepository->shouldReceive('setNode')->with($subuser->server->node_id)->once()->andReturnSelf()
|
||||
->shouldReceive('setAccessServer')->with($subuser->server->uuid)->once()->andReturnSelf()
|
||||
->shouldReceive('setSubuserKey')->with($subuser->daemonSecret, ['test:1', 'test:2'])->once()->andReturnNull();
|
||||
|
||||
$this->connection->shouldReceive('commit')->withNoArgs()->once()->andReturnNull();
|
||||
|
||||
$this->service->handle($subuser->id, ['some-permission']);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that an exception is thrown if the daemon connection fails.
|
||||
*/
|
||||
public function testExceptionIsThrownIfDaemonConnectionFails()
|
||||
{
|
||||
$subuser = factory(Subuser::class)->make();
|
||||
$subuser->server = factory(Server::class)->make();
|
||||
|
||||
$this->repository->shouldReceive('getWithServer')->with($subuser->id)->once()->andReturn($subuser);
|
||||
$this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
|
||||
$this->permissionRepository->shouldReceive('deleteWhere')->with([
|
||||
['subuser_id', '=', $subuser->id],
|
||||
])->once()->andReturnNull();
|
||||
$this->permissionService->shouldReceive('handle')->with($subuser->id, [])->once()->andReturn([]);
|
||||
|
||||
$this->daemonRepository->shouldReceive('setNode')->once()->andThrow($this->exception);
|
||||
$this->connection->shouldReceive('rollBack')->withNoArgs()->once()->andReturnNull();
|
||||
$this->writer->shouldReceive('warning')->with($this->exception)->once()->andReturnNull();
|
||||
$this->exception->shouldReceive('getResponse')->withNoArgs()->once()->andReturnNull();
|
||||
|
||||
try {
|
||||
$this->service->handle($subuser->id, []);
|
||||
} catch (DisplayException $exception) {
|
||||
$this->assertEquals(trans('admin/exceptions.daemon_connection_failed', ['code' => 'E_CONN_REFUSED']), $exception->getMessage());
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue