We can make this middleware significantly simpler

This commit is contained in:
DaneEveritt 2022-05-22 16:54:07 -04:00
parent 0fa33e0438
commit 56f15c15a1
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53

View file

@ -2,27 +2,10 @@
namespace Pterodactyl\Http\Middleware; namespace Pterodactyl\Http\Middleware;
use Illuminate\Http\Request;
use Illuminate\Routing\Pipeline;
use Illuminate\Session\Middleware\StartSession;
use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
use Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful; use Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful;
class EnsureStatefulRequests extends EnsureFrontendRequestsAreStateful class EnsureStatefulRequests extends EnsureFrontendRequestsAreStateful
{ {
/**
* {@inheritDoc}
*/
public function handle($request, $next)
{
$this->configureSecureCookieSessions();
return (new Pipeline(app()))
->send($request)
->through($this->isStateful($request) ? $this->statefulMiddleware() : [])
->then(fn ($request) => $next($request));
}
/** /**
* Determines if a request is stateful or not. This is determined using the default * Determines if a request is stateful or not. This is determined using the default
* Sanctum "fromFrontend" helper method. However, we also check if the request includes * Sanctum "fromFrontend" helper method. However, we also check if the request includes
@ -32,26 +15,12 @@ class EnsureStatefulRequests extends EnsureFrontendRequestsAreStateful
* We don't want to support API usage using the cookies, except for requests stemming * We don't want to support API usage using the cookies, except for requests stemming
* from the front-end we control. * from the front-end we control.
*/ */
protected function isStateful(Request $request): bool public static function fromFrontend($request)
{ {
return static::fromFrontend($request) || $request->hasCookie(config('session.cookie')); if (parent::fromFrontend($request)) {
} return true;
}
/** return $request->hasCookie(config('session.cookie'));
* Returns the middleware to be applied to a stateful request to the API.
*/
protected function statefulMiddleware(): array
{
return [
function ($request, $next) {
$request->attributes->set('sanctum', true);
return $next($request);
},
config('sanctum.middleware.encrypt_cookies', EncryptCookies::class),
AddQueuedCookiesToResponse::class,
StartSession::class,
config('sanctum.middleware.verify_csrf_token', VerifyCsrfToken::class),
];
} }
} }