Add the ability for a node to fetch a list of all servers it has been assigned
This commit is contained in:
parent
07d19ad326
commit
42fb9fdbd9
4 changed files with 70 additions and 1 deletions
|
@ -171,4 +171,16 @@ interface ServerRepositoryInterface extends RepositoryInterface, SearchableInter
|
|||
* @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
|
||||
*/
|
||||
public function loadAllServersForNode(int $node, int $limit): LengthAwarePaginator;
|
||||
|
||||
/**
|
||||
* Returns every server that exists for a given node.
|
||||
*
|
||||
* This is different from {@see loadAllServersForNode} because
|
||||
* it does not paginate the response.
|
||||
*
|
||||
* @param int $node
|
||||
*
|
||||
* @return \Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection
|
||||
*/
|
||||
public function loadEveryServerForNode(int $node);
|
||||
}
|
||||
|
|
|
@ -5,6 +5,7 @@ namespace Pterodactyl\Http\Controllers\Api\Remote\Servers;
|
|||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Pterodactyl\Http\Controllers\Controller;
|
||||
use Pterodactyl\Repositories\Eloquent\NodeRepository;
|
||||
use Pterodactyl\Services\Eggs\EggConfigurationService;
|
||||
use Pterodactyl\Repositories\Eloquent\ServerRepository;
|
||||
use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
|
||||
|
@ -26,21 +27,29 @@ class ServerDetailsController extends Controller
|
|||
*/
|
||||
private $configurationStructureService;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Repositories\Eloquent\NodeRepository
|
||||
*/
|
||||
private $nodeRepository;
|
||||
|
||||
/**
|
||||
* ServerConfigurationController constructor.
|
||||
*
|
||||
* @param \Pterodactyl\Repositories\Eloquent\ServerRepository $repository
|
||||
* @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService
|
||||
* @param \Pterodactyl\Services\Eggs\EggConfigurationService $eggConfigurationService
|
||||
* @param \Pterodactyl\Repositories\Eloquent\NodeRepository $nodeRepository
|
||||
*/
|
||||
public function __construct(
|
||||
ServerRepository $repository,
|
||||
ServerConfigurationStructureService $configurationStructureService,
|
||||
EggConfigurationService $eggConfigurationService
|
||||
EggConfigurationService $eggConfigurationService,
|
||||
NodeRepository $nodeRepository
|
||||
) {
|
||||
$this->eggConfigurationService = $eggConfigurationService;
|
||||
$this->repository = $repository;
|
||||
$this->configurationStructureService = $configurationStructureService;
|
||||
$this->nodeRepository = $nodeRepository;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -62,4 +71,32 @@ class ServerDetailsController extends Controller
|
|||
'process_configuration' => $this->eggConfigurationService->handle($server),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Lists all servers with their configurations that are assigned to the requesting node.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
*
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*
|
||||
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
||||
*/
|
||||
public function list(Request $request)
|
||||
{
|
||||
$authorization = substr($request->header('Authorization'), 7);
|
||||
|
||||
$node = $this->nodeRepository->findFirstWhere([ 'daemonSecret' => $authorization ]);
|
||||
$servers = $this->repository->loadEveryServerForNode($node->id);
|
||||
|
||||
$configurations = [];
|
||||
|
||||
foreach ($servers as $server) {
|
||||
$configurations[$server->uuid] = [
|
||||
'settings' => $this->configurationStructureService->handle($server),
|
||||
'process_configuration' => $this->eggConfigurationService->handle($server),
|
||||
];
|
||||
}
|
||||
|
||||
return JsonResponse::create($configurations);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -378,4 +378,21 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
|
|||
->where('node_id', '=', $node)
|
||||
->paginate($limit);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns every server that exists for a given node.
|
||||
*
|
||||
* This is different from {@see loadAllServersForNode} because
|
||||
* it does not paginate the response.
|
||||
*
|
||||
* @param int $node
|
||||
*
|
||||
* @return \Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection
|
||||
*/
|
||||
public function loadEveryServerForNode(int $node)
|
||||
{
|
||||
return $this->getBuilder()
|
||||
->with('nest')
|
||||
->where('node_id', '=', $node)->get();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -7,6 +7,9 @@ Route::post('/download-file', 'FileDownloadController@index');
|
|||
|
||||
// Routes for the Wings daemon.
|
||||
Route::post('/sftp/auth', 'SftpAuthenticationController');
|
||||
|
||||
Route::get('/servers', 'Servers\ServerDetailsController@list');
|
||||
|
||||
Route::group(['prefix' => '/servers/{uuid}'], function () {
|
||||
Route::get('/', 'Servers\ServerDetailsController');
|
||||
Route::get('/install', 'Servers\ServerInstallController@index');
|
||||
|
|
Loading…
Reference in a new issue