Add initial support for viewing basic server details
Includes support for changing server name, owner, and daemon secret.
This commit is contained in:
Dane Everitt
parent
41652d7384
commit
2c054e7edc
6 changed files with 327 additions and 4 deletions
|
|
@ -4,6 +4,7 @@ namespace Pterodactyl\Http\Controllers\Admin;
|
|||
|
||||
use Alert;
|
||||
use Debugbar;
|
||||
use Log;
|
||||
|
||||
use Pterodactyl\Models;
|
||||
use Pterodactyl\Repositories\ServerRepository;
|
||||
|
|
@ -49,7 +50,21 @@ class ServersController extends Controller
|
|||
|
||||
public function getView(Request $request, $id)
|
||||
{
|
||||
//
|
||||
return view('admin.servers.view', [
|
||||
'server' => Models\Server::select(
|
||||
'servers.*',
|
||||
'nodes.name as a_nodeName',
|
||||
'users.email as a_ownerEmail',
|
||||
'locations.long as a_locationName',
|
||||
'services.name as a_serviceName',
|
||||
'service_options.name as a_servceOptionName'
|
||||
)->join('nodes', 'servers.node', '=', 'nodes.id')
|
||||
->join('users', 'servers.owner', '=', 'users.id')
|
||||
->join('locations', 'nodes.location', '=', 'locations.id')
|
||||
->join('services', 'servers.service', '=', 'services.id')
|
||||
->join('service_options', 'servers.option', '=', 'service_options.id')
|
||||
->first()
|
||||
]);
|
||||
}
|
||||
|
||||
public function postNewServer(Request $request)
|
||||
|
|
@ -170,4 +185,44 @@ class ServersController extends Controller
|
|||
|
||||
}
|
||||
|
||||
public function postUpdateServerDetails(Request $request, $id)
|
||||
{
|
||||
|
||||
try {
|
||||
|
||||
$server = new ServerRepository;
|
||||
$server->updateDetails($id, [
|
||||
'owner' => $request->input('owner'),
|
||||
'name' => $request->input('name'),
|
||||
'reset_token' => ($request->input('reset_token', false) === 'on') ? true : false
|
||||
]);
|
||||
|
||||
Alert::success('Server details were successfully updated.')->flash();
|
||||
return redirect()->route('admin.servers.view', [
|
||||
'id' => $id,
|
||||
'tab' => 'tab_details'
|
||||
]);
|
||||
|
||||
} catch (\Exception $e) {
|
||||
|
||||
if ($e instanceof \Pterodactyl\Exceptions\DisplayValidationException) {
|
||||
return redirect()->route('admin.servers.view', [
|
||||
'id' => $id,
|
||||
'tab' => 'tab_details'
|
||||
])->withErrors(json_decode($e->getMessage()))->withInput();
|
||||
} else if ($e instanceof \Pterodactyl\Exceptions\DisplayException) {
|
||||
Alert::danger($e->getMessage())->flash();
|
||||
} else {
|
||||
Log::error($e);
|
||||
Alert::danger('An unhandled exception occured while attemping to add this server. Please try again.')->flash();
|
||||
}
|
||||
|
||||
return redirect()->route('admin.servers.view', [
|
||||
'id' => $id,
|
||||
'tab' => 'tab_details'
|
||||
])->withInput();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@ class AdminRoutes {
|
|||
$router->get('/new', [ 'as' => 'admin.servers.new', 'uses' => 'Admin\ServersController@getNew' ]);
|
||||
$router->get('/view/{id}', [ 'as' => 'admin.servers.view', 'uses' => 'Admin\ServersController@getView' ]);
|
||||
|
||||
$router->post('/view/{id}/details', [ 'uses' => 'Admin\ServersController@postUpdateServerDetails' ]);
|
||||
|
||||
$router->post('/new', [ 'uses' => 'Admin\ServersController@postNewServer']);
|
||||
$router->post('/new/get-nodes', [ 'uses' => 'Admin\ServersController@postNewServerGetNodes' ]);
|
||||
$router->post('/new/get-ips', [ 'uses' => 'Admin\ServersController@postNewServerGetIps' ]);
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ namespace Pterodactyl\Repositories;
|
|||
use DB;
|
||||
use Debugbar;
|
||||
use Validator;
|
||||
use Log;
|
||||
|
||||
use Pterodactyl\Models;
|
||||
use Pterodactyl\Services\UuidService;
|
||||
|
|
@ -41,7 +42,8 @@ class ServerRepository
|
|||
|
||||
/**
|
||||
* Adds a new server to the system.
|
||||
* @param array $data An array of data descriptors for creating the server. These should align to the columns in the database.
|
||||
* @param array $data An array of data descriptors for creating the server. These should align to the columns in the database.
|
||||
* @return integer
|
||||
*/
|
||||
public function create(array $data)
|
||||
{
|
||||
|
|
@ -209,4 +211,104 @@ class ServerRepository
|
|||
|
||||
}
|
||||
|
||||
/**
|
||||
* [updateDetails description]
|
||||
* @param integer $id
|
||||
* @param array $data
|
||||
* @return boolean
|
||||
*/
|
||||
public function updateDetails($id, array $data)
|
||||
{
|
||||
|
||||
$uuid = new UuidService;
|
||||
$resetDaemonKey = false;
|
||||
|
||||
// Validate Fields
|
||||
$validator = Validator::make($data, [
|
||||
'owner' => 'email|exists:users,email',
|
||||
'name' => 'regex:([\w -]{4,35})'
|
||||
]);
|
||||
|
||||
// Run validator, throw catchable and displayable exception if it fails.
|
||||
// Exception includes a JSON result of failed validation rules.
|
||||
if ($validator->fails()) {
|
||||
throw new DisplayValidationException($validator->errors());
|
||||
}
|
||||
|
||||
DB::beginTransaction();
|
||||
$server = Models\Server::findOrFail($id);
|
||||
$owner = Models\User::findOrFail($server->owner);
|
||||
|
||||
// Update daemon secret if it was passed.
|
||||
if ((isset($data['reset_token']) && $data['reset_token'] === true) || (isset($data['owner']) && $data['owner'] !== $owner->email)) {
|
||||
$oldDaemonKey = $server->daemonSecret;
|
||||
$server->daemonSecret = $uuid->generate('servers', 'daemonSecret');
|
||||
$resetDaemonKey = true;
|
||||
}
|
||||
|
||||
// Update Server Owner if it was passed.
|
||||
if (isset($data['owner']) && $data['owner'] !== $owner->email) {
|
||||
$newOwner = Models\User::select('id')->where('email', $data['owner'])->first();
|
||||
$server->owner = $newOwner->id;
|
||||
}
|
||||
|
||||
// Update Server Name if it was passed.
|
||||
if (isset($data['name'])) {
|
||||
$server->name = $data['name'];
|
||||
}
|
||||
|
||||
// Save our changes
|
||||
$server->save();
|
||||
|
||||
// Do we need to update? If not, return successful.
|
||||
if (!$resetDaemonKey) {
|
||||
DB::commit();
|
||||
return true;
|
||||
}
|
||||
|
||||
// If we need to update do it here.
|
||||
try {
|
||||
|
||||
$node = Models\Node::getByID($server->node);
|
||||
$client = Models\Node::guzzleRequest($server->node);
|
||||
|
||||
$res = $client->request('PATCH', '/server', [
|
||||
'headers' => [
|
||||
'X-Access-Server' => $server->uuid,
|
||||
'X-Access-Token' => $node->daemonSecret
|
||||
],
|
||||
'exceptions' => false,
|
||||
'json' => [
|
||||
'keys' => [
|
||||
(string) $oldDaemonKey => [],
|
||||
(string) $server->daemonSecret => [
|
||||
's:get',
|
||||
's:power',
|
||||
's:console',
|
||||
's:command',
|
||||
's:files:get',
|
||||
's:files:read',
|
||||
's:files:post',
|
||||
's:files:delete',
|
||||
's:files:upload',
|
||||
's:set-password'
|
||||
]
|
||||
]
|
||||
]
|
||||
]);
|
||||
|
||||
if ($res->getStatusCode() === 204) {
|
||||
DB::commit();
|
||||
return true;
|
||||
} else {
|
||||
throw new DisplayException('Daemon returned a a non HTTP/204 error code. HTTP/' + $res->getStatusCode());
|
||||
}
|
||||
} catch (\Exception $ex) {
|
||||
DB::rollback();
|
||||
Log::error($ex);
|
||||
throw new DisplayException('An error occured while attempting to update this server\'s information.');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue