From e17cc6992f6b78adb5ed76a7db4723925fcc7cec Mon Sep 17 00:00:00 2001 From: "iVampireSP.com" Date: Fri, 17 Feb 2023 20:59:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Public/AuthRequestController.php | 1 - app/Http/Controllers/Web/AuthController.php | 20 +++++++++---------- app/Http/Middleware/TrustedDomain.php | 7 +++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/Public/AuthRequestController.php b/app/Http/Controllers/Public/AuthRequestController.php index 7ed4e78..bfc49cb 100644 --- a/app/Http/Controllers/Public/AuthRequestController.php +++ b/app/Http/Controllers/Public/AuthRequestController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers\Public; use App\Http\Controllers\Controller; -use App\Rules\Domain; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Cache; diff --git a/app/Http/Controllers/Web/AuthController.php b/app/Http/Controllers/Web/AuthController.php index 181094a..321750b 100644 --- a/app/Http/Controllers/Web/AuthController.php +++ b/app/Http/Controllers/Web/AuthController.php @@ -7,14 +7,14 @@ use App\Http\Controllers\Controller; use App\Notifications\User\UserNotification; use App\Rules\Domain; +use function back; +use function config; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Cache; use Illuminate\View\View; -use function back; -use function config; use function redirect; use function session; use function view; @@ -34,17 +34,17 @@ public function index(Request $request): View|RedirectResponse $dashboardHost = parse_url(config('settings.dashboard.base_url'), PHP_URL_HOST); if ($callbackHost === $dashboardHost) { - if (!$request->user('web')->isRealNamed()) { + if (! $request->user('web')->isRealNamed()) { return redirect()->route('real_name.create')->with('status', '重定向已被打断,需要先实人认证。'); } $requestHost = parse_url($request->header('referer'), PHP_URL_HOST); $token = $request->user()->createToken('Dashboard', [ - 'domain-access:' . $requestHost, + 'domain-access:'.$requestHost, ])->plainTextToken; - return redirect($callback . '?token=' . $token); + return redirect($callback.'?token='.$token); } return redirect()->route('confirm_redirect'); @@ -92,11 +92,11 @@ public function newToken(Request $request): RedirectResponse if ($request->has('domain')) { // 检测是不是一个合格的域名 - if (!preg_match('/^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$/', $request->input('domain'))) { + if (! preg_match('/^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$/', $request->input('domain'))) { return back()->with('error', '域名格式不正确。'); } - $abilities = ['domain-access:' . $request->input('domain')]; + $abilities = ['domain-access:'.$request->input('domain')]; } $token = $request->user()->createToken( @@ -135,7 +135,7 @@ public function exitSudo(): RedirectResponse public function showAuthRequest($token): View|RedirectResponse { - $data = Cache::get('auth_request:' . $token); + $data = Cache::get('auth_request:'.$token); if (empty($data)) { return redirect()->route('index')->with('error', '登录请求的 Token 不存在或已过期。'); @@ -159,7 +159,7 @@ public function storeAuthRequest(Request $request): RedirectResponse 'token' => 'required|string|max:128', ]); - $data = Cache::get('auth_request:' . $request->input('token')); + $data = Cache::get('auth_request:'.$request->input('token')); if (empty($data)) { return back()->with('error', '登录请求的 Token 不存在或已过期。'); @@ -183,7 +183,7 @@ public function storeAuthRequest(Request $request): RedirectResponse $data['token'] = $user->createToken($data['meta']['description'] ?? Carbon::now()->toDateString(), $abilities)->plainTextToken; } - Cache::put('auth_request:' . $request->input('token'), $data, 60); + Cache::put('auth_request:'.$request->input('token'), $data, 60); return redirect()->route('index')->with('success', '登录请求已确认。'); } diff --git a/app/Http/Middleware/TrustedDomain.php b/app/Http/Middleware/TrustedDomain.php index fb64fbe..33c40e3 100644 --- a/app/Http/Middleware/TrustedDomain.php +++ b/app/Http/Middleware/TrustedDomain.php @@ -12,16 +12,15 @@ class TrustedDomain /** * Handle an incoming request. * - * @param Request $request + * @param Request $request * @param Closure(Request): (Response|RedirectResponse) $next - * * @return mixed */ public function handle(Request $request, Closure $next): mixed { $user = $request->user('sanctum'); - if (!$user) { + if (! $user) { return $next($request); } @@ -37,7 +36,7 @@ public function handle(Request $request, Closure $next): mixed return $next($request); } - return $user->tokenCan('domain-access:' . $requestHost) ? $next($request) : response()->json([ + return $user->tokenCan('domain-access:'.$requestHost) ? $next($request) : response()->json([ 'message' => 'Token 无权访问此域名。', ], 401); }