Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Daemon secret is not a thing anymore

Browse source
This commit is contained in:
Dane Everitt 2019-12-15 18:31:15 -08:00
parent 1aacc48f0c
commit 2cabfeec15
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Services/Servers/ServerCreationService.php
View file

@ -4,7 +4,6 @@ namespace Pterodactyl\Services\Servers;
use Ramsey\Uuid\Uuid;
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
use Pterodactyl\Models\Node;
use Pterodactyl\Models\User;
use Pterodactyl\Models\Server;
@ -228,7 +227,6 @@ class ServerCreationService
'egg_id' => Arr::get($data, 'egg_id'),
'pack_id' => empty($data['pack_id']) ? null : $data['pack_id'],
'startup' => Arr::get($data, 'startup'),
'daemonSecret' => Str::random(Node::DAEMON_SECRET_LENGTH),
'image' => Arr::get($data, 'image'),
'database_limit' => Arr::get($data, 'database_limit'),
'allocation_limit' => Arr::get($data, 'allocation_limit'),

30
app/Traits/Controllers/JavascriptInjection.php
View file

@ -32,36 +32,6 @@ trait JavascriptInjection
return $this;
}
/**
* Injects server javascript into the page to be used by other services.
*
* @param array $args
* @param bool $overwrite
* @return array
*/
public function injectJavascript($args = [], $overwrite = false)
{
$request = $this->request ?? app()->make(Request::class);
$server = $request->attributes->get('server');
$token = $request->attributes->get('server_token');
$response = array_merge_recursive([
'server' => [
'uuid' => $server->uuid,
'uuidShort' => $server->uuidShort,
'daemonSecret' => $token,
],
'server_token' => $token,
'node' => [
'fqdn' => $server->node->fqdn,
'scheme' => $server->node->scheme,
'daemonListen' => $server->node->daemonListen,
],
], $args);
return Javascript::put($overwrite ? $args : $response);
}
/**
* Injects the exact array passed in, nothing more.
*