mirror of
https://github.com/pelican-dev/panel.git
synced 2026-05-04 18:00:48 +03:00
Replace str_random with Str::random (#1676)
Co-authored-by: RMartinOscar <40749467+RMartinOscar@users.noreply.github.com>
This commit is contained in:
@@ -6,6 +6,7 @@ use Illuminate\Support\Facades\Schema;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use App\Contracts\Repository\DaemonKeyRepositoryInterface;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
@@ -21,7 +22,7 @@ return new class extends Migration
|
||||
$inserts[] = [
|
||||
'user_id' => $server->owner_id,
|
||||
'server_id' => $server->id,
|
||||
'secret' => DaemonKeyRepositoryInterface::INTERNAL_KEY_IDENTIFIER . str_random(40),
|
||||
'secret' => DaemonKeyRepositoryInterface::INTERNAL_KEY_IDENTIFIER . Str::random(40),
|
||||
'expires_at' => Carbon::now()->addMinutes(config('panel.api.key_expire_time', 720))->toDateTimeString(),
|
||||
'created_at' => Carbon::now()->toDateTimeString(),
|
||||
'updated_at' => Carbon::now()->toDateTimeString(),
|
||||
|
||||
@@ -5,6 +5,7 @@ use Illuminate\Support\Facades\Schema;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use App\Contracts\Repository\DaemonKeyRepositoryInterface;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
@@ -19,7 +20,7 @@ return new class extends Migration
|
||||
$inserts[] = [
|
||||
'user_id' => $subuser->user_id,
|
||||
'server_id' => $subuser->server_id,
|
||||
'secret' => DaemonKeyRepositoryInterface::INTERNAL_KEY_IDENTIFIER . str_random(40),
|
||||
'secret' => DaemonKeyRepositoryInterface::INTERNAL_KEY_IDENTIFIER . Str::random(40),
|
||||
'expires_at' => Carbon::now()->addMinutes(config('panel.api.key_expire_time', 720))->toDateTimeString(),
|
||||
'created_at' => Carbon::now()->toDateTimeString(),
|
||||
'updated_at' => Carbon::now()->toDateTimeString(),
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Support\Str;
|
||||
use Ramsey\Uuid\Uuid;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
@@ -51,7 +52,7 @@ return new class extends Migration
|
||||
DB::transaction(function () {
|
||||
DB::table('service_options')->select(['id', 'tag'])->get()->each(function ($option) {
|
||||
DB::table('service_options')->where('id', $option->id)->update([
|
||||
'tag' => str_random(10),
|
||||
'tag' => Str::random(10),
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -6,6 +6,7 @@ use Illuminate\Support\Facades\Schema;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Contracts\Encryption\DecryptException;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
@@ -19,7 +20,7 @@ return new class extends Migration
|
||||
try {
|
||||
$decrypted = Crypt::decrypt($item->secret);
|
||||
} catch (DecryptException $exception) {
|
||||
$decrypted = str_random(32);
|
||||
$decrypted = Str::random(32);
|
||||
} finally {
|
||||
DB::table('api_keys')->where('id', $item->id)->update([
|
||||
'secret' => $decrypted,
|
||||
@@ -66,7 +67,7 @@ return new class extends Migration
|
||||
DB::transaction(function () {
|
||||
DB::table('api_keys')->get()->each(function ($item) {
|
||||
DB::table('api_keys')->where('id', $item->id)->update([
|
||||
'public' => str_random(16),
|
||||
'public' => Str::random(16),
|
||||
'secret' => Crypt::encrypt($item->secret),
|
||||
]);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user