StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Begin implementation of services for services/service options

Browse source
This commit is contained in:
Dane Everitt 2017-08-08 23:24:55 -05:00
parent 7277f728a9
commit 2c77d5c44d
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
21 changed files with 567 additions and 408 deletions
Download patch file Download diff file Expand all files Collapse all files

35
app/Http/Controllers/Admin/DatabaseController.php
View file

@ -24,12 +24,13 @@
namespace Pterodactyl\Http\Controllers\Admin;
use Pterodactyl\Models\Location;
use Pterodactyl\Models\DatabaseHost;
use Prologue\Alerts\AlertsMessageBag;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Services\Database\DatabaseHostService;
use Pterodactyl\Http\Requests\Admin\DatabaseHostFormRequest;
use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
class DatabaseController extends Controller
{
@ -39,14 +40,14 @@ class DatabaseController extends Controller
protected $alert;
/**
* @var \Pterodactyl\Models\DatabaseHost
* @var \Pterodactyl\Contracts\Repository\LocationRepositoryInterface
*/
protected $hostModel;
protected $locationRepository;
/**
* @var \Pterodactyl\Models\Location
* @var \Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface
*/
protected $locationModel;
protected $repository;
/**
* @var \Pterodactyl\Services\Database\DatabaseHostService
@ -56,21 +57,21 @@ class DatabaseController extends Controller
/**
* DatabaseController constructor.
*
* @param \Prologue\Alerts\AlertsMessageBag $alert
* @param \Pterodactyl\Models\DatabaseHost $hostModel
* @param \Pterodactyl\Models\Location $locationModel
* @param \Pterodactyl\Services\Database\DatabaseHostService $service
* @param \Prologue\Alerts\AlertsMessageBag $alert
* @param \Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface $repository
* @param \Pterodactyl\Services\Database\DatabaseHostService $service
* @param \Pterodactyl\Contracts\Repository\LocationRepositoryInterface $locationRepository
*/
public function __construct(
AlertsMessageBag $alert,
DatabaseHost $hostModel,
Location $locationModel,
DatabaseHostService $service
DatabaseHostRepositoryInterface $repository,
DatabaseHostService $service,
LocationRepositoryInterface $locationRepository
) {
$this->alert = $alert;
$this->hostModel = $hostModel;
$this->locationModel = $locationModel;
$this->repository = $repository;
$this->service = $service;
$this->locationRepository = $locationRepository;
}
/**
@ -81,8 +82,8 @@ class DatabaseController extends Controller
public function index()
{
return view('admin.databases.index', [
'locations' => $this->locationModel->with('nodes')->get(),
'hosts' => $this->hostModel->withCount('databases')->with('node')->get(),
'locations' => $this->locationRepository->getAllWithNodes(),
'hosts' => $this->repository->getWithViewDetails(),
]);
}
@ -97,7 +98,7 @@ class DatabaseController extends Controller
$host->load('databases.server');
return view('admin.databases.view', [
'locations' => $this->locationModel->with('nodes')->get(),
'locations' => $this->locationRepository->getAllWithNodes(),
'host' => $host,
]);
}

2
app/Http/Controllers/Admin/LocationController.php
View file

@ -74,7 +74,7 @@ class LocationController extends Controller
public function index()
{
return view('admin.locations.index', [
'locations' => $this->repository->allWithDetails(),
'locations' => $this->repository->getAllWithDetails(),
]);
}

141
app/Http/Controllers/Admin/OptionController.php
View file

@ -26,6 +26,12 @@ namespace Pterodactyl\Http\Controllers\Admin;
use Log;
use Alert;
use Prologue\Alerts\AlertsMessageBag;
use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
use Pterodactyl\Http\Requests\Admin\OptionVariableFormRequest;
use Pterodactyl\Http\Requests\Admin\ServiceOptionFormRequest;
use Pterodactyl\Services\Services\Options\CreationService;
use Pterodactyl\Services\Services\Variables\VariableCreationService;
use Route;
use Javascript;
use Illuminate\Http\Request;
@ -42,100 +48,95 @@ use Pterodactyl\Http\Requests\Admin\Service\StoreOptionVariable;
class OptionController extends Controller
{
/**
* Store the repository instance.
*
* @var \Pterodactyl\Repositories\OptionRepository
* @var \Prologue\Alerts\AlertsMessageBag
*/
protected $repository;
protected $alert;
/**
* @var \Pterodactyl\Services\Services\Options\CreationService
*/
protected $creationService;
/**
* @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
*/
protected $serviceRepository;
/**
* @var \Pterodactyl\Services\Services\Variables\VariableCreationService
*/
protected $variableCreationService;
/**
* OptionController constructor.
*
* @param \Prologue\Alerts\AlertsMessageBag $alert
* @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface $serviceRepository
* @param \Pterodactyl\Services\Services\Options\CreationService $creationService
* @param \Pterodactyl\Services\Services\Variables\VariableCreationService $variableCreationService
*/
public function __construct()
{
$this->repository = new OptionRepository(Route::current()->parameter('option'));
public function __construct(
AlertsMessageBag $alert,
ServiceRepositoryInterface $serviceRepository,
CreationService $creationService,
VariableCreationService $variableCreationService
) {
$this->alert = $alert;
$this->creationService = $creationService;
$this->serviceRepository = $serviceRepository;
$this->variableCreationService = $variableCreationService;
}
/**
* Handles request to view page for adding new option.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\View\View
*/
public function create(Request $request)
public function create()
{
$services = Service::with('options')->get();
$services = $this->serviceRepository->getWithOptions();
Javascript::put(['services' => $services->keyBy('id')]);
return view('admin.services.options.new', ['services' => $services]);
}
/**
* Handles POST request to create a new option.
* Handle adding a new service option.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Response\RedirectResponse
* @param \Pterodactyl\Http\Requests\Admin\ServiceOptionFormRequest $request
* @return \Illuminate\Http\RedirectResponse
*
* @throws \Pterodactyl\Exceptions\DisplayException
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
*/
public function store(Request $request)
public function store(ServiceOptionFormRequest $request)
{
$repo = new OptionRepository;
$option = $this->creationService->handle($request->normalize());
$this->alert->success(trans('admin/services.options.notices.option_created'))->flash();
try {
$option = $repo->create($request->intersect([
'service_id', 'name', 'description', 'tag',
'docker_image', 'startup', 'config_from', 'config_startup',
'config_logs', 'config_files', 'config_stop',
]));
Alert::success('Successfully created new service option.')->flash();
return redirect()->route('admin.services.option.view', $option->id);
} catch (DisplayValidationException $ex) {
return redirect()->route('admin.services.option.new')->withErrors(json_decode($ex->getMessage()))->withInput();
} catch (DisplayException $ex) {
Alert::danger($ex->getMessage())->flash();
} catch (\Exception $ex) {
Log::error($ex);
Alert::danger('An unhandled exception occurred while attempting to create this service. This error has been logged.')->flash();
}
return redirect()->route('admin.services.option.new')->withInput();
return redirect()->route('admin.services.option.view', $option->id);
}
/**
* Handles POST request to create a new option variable.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @param \Pterodactyl\Http\Requests\Admin\OptionVariableFormRequest $request
* @param \Pterodactyl\Models\ServiceOption $option
* @return \Illuminate\Http\RedirectResponse
*/
public function createVariable(Request $request, $id)
public function createVariable(OptionVariableFormRequest $request, ServiceOption $option)
{
$repo = new VariableRepository;
$this->variableCreationService->handle($option->id, $request->normalize());
$this->alert->success(trans('admin/services.variables.notices.variable_created'))->flash();
try {
$variable = $repo->create($id, $request->intersect([
'name', 'description', 'env_variable',
'default_value', 'options', 'rules',
]));
Alert::success('New variable successfully assigned to this service option.')->flash();
} catch (DisplayValidationException $ex) {
return redirect()->route('admin.services.option.variables', $id)->withErrors(json_decode($ex->getMessage()));
} catch (DisplayException $ex) {
Alert::danger($ex->getMessage())->flash();
} catch (\Exception $ex) {
Log::error($ex);
Alert::danger('An unhandled exception was encountered while attempting to process that request. This error has been logged.')->flash();
}
return redirect()->route('admin.services.option.variables', $id);
return redirect()->route('admin.services.option.variables', $option->id);
}
/**
* Display option overview page.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\View\View
*/
public function viewConfiguration(Request $request, $id)
@ -146,13 +147,14 @@ class OptionController extends Controller
/**
* Display variable overview page for a service option.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\View\View
*/
public function viewVariables(Request $request, $id)
{
return view('admin.services.options.variables', ['option' => ServiceOption::with('variables')->findOrFail($id)]);
return view('admin.services.options.variables', ['option' => ServiceOption::with('variables')
->findOrFail($id), ]);
}
/**
@ -179,8 +181,8 @@ class OptionController extends Controller
/**
* Handles POST when editing a configration for a service option.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\RedirectResponse
*/
public function editConfiguration(Request $request, $id)
@ -207,7 +209,8 @@ class OptionController extends Controller
Alert::danger($ex->getMessage())->flash();
} catch (\Exception $ex) {
Log::error($ex);
Alert::danger('An unhandled exception occurred while attempting to perform that action. This error has been logged.')->flash();
Alert::danger('An unhandled exception occurred while attempting to perform that action. This error has been logged.')
->flash();
}
return redirect()->route('admin.services.option.view', $id);
@ -216,9 +219,9 @@ class OptionController extends Controller
/**
* Handles POST when editing a configration for a service option.
*
* @param \Pterodactyl\Http\Requests\Admin\Service\StoreOptionVariable $request
* @param int $option
* @param int $variable
* @param \Pterodactyl\Http\Requests\Admin\Service\StoreOptionVariable $request
* @param int $option
* @param int $variable
* @return \Illuminate\Http\RedirectResponse
*/
public function editVariable(StoreOptionVariable $request, $option, $variable)
@ -237,7 +240,8 @@ class OptionController extends Controller
Alert::danger($ex->getMessage())->flash();
} catch (\Exception $ex) {
Log::error($ex);
Alert::danger('An unhandled exception was encountered while attempting to process that request. This error has been logged.')->flash();
Alert::danger('An unhandled exception was encountered while attempting to process that request. This error has been logged.')
->flash();
}
return redirect()->route('admin.services.option.variables', $option);
@ -259,7 +263,8 @@ class OptionController extends Controller
Alert::danger($ex->getMessage())->flash();
} catch (\Exception $ex) {
Log::error($ex);
Alert::danger('An unhandled exception was encountered while attempting to process that request. This error has been logged.')->flash();
Alert::danger('An unhandled exception was encountered while attempting to process that request. This error has been logged.')
->flash();
}
return redirect()->route('admin.services.option.scripts', $id);

57
app/Http/Requests/Admin/OptionVariableFormRequest.php Normal file
View file

@ -0,0 +1,57 @@
<?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 Pterodactyl\Http\Requests\Admin;
use Pterodactyl\Models\ServiceVariable;
class OptionVariableFormRequest extends AdminFormRequest
{
/**
* @return array
*/
public function rules()
{
return [
'name' => 'required|string|min:1|max:255',
'description' => 'sometimes|nullable|string',
'env_variable' => 'required|regex:/^[\w]{1,255}$/|notIn:' . ServiceVariable::RESERVED_ENV_NAMES,
'default_value' => 'string',
'options' => 'sometimes|required|array',
'rules' => 'bail|required|string',
];
}
/**
* Run validation after the rules above have been applied.
*
* @param \Illuminate\Validation\Validator $validator
*/
public function withValidator($validator)
{
$validator->sometimes('default_value', $this->input('rules') ?? null, function ($input) {
return $input->default_value;
});
}
}

42
app/Http/Requests/Admin/ServiceOptionFormRequest.php Normal file
View file

@ -0,0 +1,42 @@
<?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 Pterodactyl\Http\Requests\Admin;
use Pterodactyl\Models\ServiceOption;
class ServiceOptionFormRequest extends AdminFormRequest
{
/**
* @return array
*/
public function rules()
{
if ($this->method() === 'PATCH') {
return ServiceOption::getUpdateRulesForId($this->route()->parameter('option')->id);
}
return ServiceOption::getCreateRules();
}
}