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

Final adjustments to Daemon <-> Panel communication change

Browse source
This commit is contained in:
Dane Everitt 2017-09-24 21:12:30 -05:00
parent 8e2b77dc1e
commit 7d1c233c49
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
32 changed files with 528 additions and 538 deletions
Download patch file Download diff file Expand all files Collapse all files

9
database/migrations/2017_09_23_173628_RemoveDaemonSecretFromServersTable.php
View file

@ -5,6 +5,7 @@ use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface;
class RemoveDaemonSecretFromServersTable extends Migration
{
@ -20,10 +21,10 @@ class RemoveDaemonSecretFromServersTable extends Migration
$inserts[] = [
'user_id' => $server->owner_id,
'server_id' => $server->id,
'secret' => 'i_' . str_random(40),
'expires_at' => Carbon::now()->addHours(24),
'created_at' => Carbon::now(),
'updated_at' => Carbon::now(),
'secret' => DaemonKeyRepositoryInterface::INTERNAL_KEY_IDENTIFIER . str_random(40),
'expires_at' => Carbon::now()->addMinutes(config('pterodactyl.api.key_expire_time', 720))->toDateTimeString(),
'created_at' => Carbon::now()->toDateTimeString(),
'updated_at' => Carbon::now()->toDateTimeString(),
];
});

11
database/migrations/2017_09_23_185022_RemoveDaemonSecretFromSubusersTable.php
View file

@ -4,6 +4,7 @@ use Carbon\Carbon;
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface;
class RemoveDaemonSecretFromSubusersTable extends Migration
{
@ -18,10 +19,10 @@ class RemoveDaemonSecretFromSubusersTable extends Migration
$inserts[] = [
'user_id' => $subuser->user_id,
'server_id' => $subuser->server_id,
'secret' => 'i_' . str_random(40),
'expires_at' => Carbon::now()->addHours(24),
'created_at' => Carbon::now(),
'updated_at' => Carbon::now(),
'secret' => DaemonKeyRepositoryInterface::INTERNAL_KEY_IDENTIFIER . str_random(40),
'expires_at' => Carbon::now()->addMinutes(config('pterodactyl.api.key_expire_time', 720))->toDateTimeString(),
'created_at' => Carbon::now()->toDateTimeString(),
'updated_at' => Carbon::now()->toDateTimeString(),
];
});
@ -46,7 +47,7 @@ class RemoveDaemonSecretFromSubusersTable extends Migration
$subusers = DB::table('subusers')->get();
$subusers->each(function ($subuser) {
DB::table('daemon_keys')->delete($subuser->id);
DB::table('daemon_keys')->where('user_id', $subuser->user_id)->where('server_id', $subuser->server_id)->delete();
});
}
}