diff --git a/app/Console/Commands/Test.php b/app/Console/Commands/Test.php index 799718a8..a20927d4 100644 --- a/app/Console/Commands/Test.php +++ b/app/Console/Commands/Test.php @@ -49,9 +49,9 @@ class Test extends Command */ public function handle() { - $r = PersonalAccessToken::query()->find(11); + $r = config('nexus.ammds_secret'); // $r = SearchBox::query()->find(4)->ss()->orWhere("mode", 0)->get(); - dd($r->abilitiesText); + dd($r); } } diff --git a/app/Repositories/AuthenticateRepository.php b/app/Repositories/AuthenticateRepository.php index f66e3236..04ab75ae 100644 --- a/app/Repositories/AuthenticateRepository.php +++ b/app/Repositories/AuthenticateRepository.php @@ -44,7 +44,7 @@ class AuthenticateRepository extends BaseRepository public function nasToolsApprove(string $json) { - $key = env('NAS_TOOLS_KEY'); + $key = config('nexus.nas_tools_key'); $encrypter = new Encrypter($key); $decrypted = $encrypter->decryptString($json); $data = json_decode($decrypted, true); @@ -65,7 +65,7 @@ class AuthenticateRepository extends BaseRepository public function iyuuApprove($token, $id, $verity) { - $secret = env('IYUU_SECRET'); + $secret = config('nexus.iyuu_secret'); $user = User::query()->findOrFail($id, User::$commonFields); $user->checkIsNormal(); $encryptedResult = md5($token . $id . sha1($user->passkey) . $secret); @@ -90,7 +90,7 @@ class AuthenticateRepository extends BaseRepository $user->checkIsNormal(); $passkeyHash = hash('sha256', $user->passkey); $dataToSign = sprintf("%s%s%s%s", $user->id, $passkeyHash, $request->timestamp, $request->nonce); - $signatureKey = env('AMMDS_SECRET'); + $signatureKey = config('nexus.ammds_secret'); $serverSignature = hash_hmac('sha256', $dataToSign, $signatureKey); if (!hash_equals($serverSignature, $request->signature)) { do_log(sprintf( diff --git a/config/nexus.php b/config/nexus.php index 5bc94d8b..ebf4f951 100644 --- a/config/nexus.php +++ b/config/nexus.php @@ -56,4 +56,9 @@ return [ 'master_key' => nexus_env('MEILISEARCH_MASTER_KEY', ''), ], + 'nas_tools_key' => nexus_env('NAS_TOOLS_KEY', ''), + 'iyuu_secret' => nexus_env('IYUU_SECRET', ''), + 'ammds_secret' => nexus_env('AMMDS_SECRET', ''), + + ];