Fix daemon auth
This commit is contained in:
parent
1438a50ae9
commit
ecdd133b75
2 changed files with 7 additions and 5 deletions
|
@ -13,7 +13,6 @@ use Pterodactyl\Http\Middleware\VerifyReCaptcha;
|
||||||
use Pterodactyl\Http\Middleware\AdminAuthenticate;
|
use Pterodactyl\Http\Middleware\AdminAuthenticate;
|
||||||
use Pterodactyl\Http\Middleware\HMACAuthorization;
|
use Pterodactyl\Http\Middleware\HMACAuthorization;
|
||||||
use Illuminate\Routing\Middleware\ThrottleRequests;
|
use Illuminate\Routing\Middleware\ThrottleRequests;
|
||||||
use Pterodactyl\Http\Middleware\DaemonAuthenticate;
|
|
||||||
use Pterodactyl\Http\Middleware\LanguageMiddleware;
|
use Pterodactyl\Http\Middleware\LanguageMiddleware;
|
||||||
use Illuminate\Foundation\Http\Kernel as HttpKernel;
|
use Illuminate\Foundation\Http\Kernel as HttpKernel;
|
||||||
use Illuminate\Routing\Middleware\SubstituteBindings;
|
use Illuminate\Routing\Middleware\SubstituteBindings;
|
||||||
|
@ -21,6 +20,7 @@ use Pterodactyl\Http\Middleware\AccessingValidServer;
|
||||||
use Illuminate\View\Middleware\ShareErrorsFromSession;
|
use Illuminate\View\Middleware\ShareErrorsFromSession;
|
||||||
use Pterodactyl\Http\Middleware\RedirectIfAuthenticated;
|
use Pterodactyl\Http\Middleware\RedirectIfAuthenticated;
|
||||||
use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
|
use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
|
||||||
|
use Pterodactyl\Http\Middleware\Daemon\DaemonAuthenticate;
|
||||||
use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
|
use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
|
||||||
use Pterodactyl\Http\Middleware\Server\AuthenticateAsSubuser;
|
use Pterodactyl\Http\Middleware\Server\AuthenticateAsSubuser;
|
||||||
use Pterodactyl\Http\Middleware\Server\SubuserBelongsToServer;
|
use Pterodactyl\Http\Middleware\Server\SubuserBelongsToServer;
|
||||||
|
@ -28,6 +28,7 @@ use Pterodactyl\Http\Middleware\RequireTwoFactorAuthentication;
|
||||||
use Pterodactyl\Http\Middleware\Server\DatabaseBelongsToServer;
|
use Pterodactyl\Http\Middleware\Server\DatabaseBelongsToServer;
|
||||||
use Pterodactyl\Http\Middleware\Server\ScheduleBelongsToServer;
|
use Pterodactyl\Http\Middleware\Server\ScheduleBelongsToServer;
|
||||||
use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode;
|
use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode;
|
||||||
|
use Pterodactyl\Http\Middleware\DaemonAuthenticate as OldDaemonAuthenticate;
|
||||||
|
|
||||||
class Kernel extends HttpKernel
|
class Kernel extends HttpKernel
|
||||||
{
|
{
|
||||||
|
@ -71,7 +72,7 @@ class Kernel extends HttpKernel
|
||||||
],
|
],
|
||||||
'daemon' => [
|
'daemon' => [
|
||||||
SubstituteBindings::class,
|
SubstituteBindings::class,
|
||||||
'daemon-old',
|
DaemonAuthenticate::class,
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -87,7 +88,7 @@ class Kernel extends HttpKernel
|
||||||
'server' => AccessingValidServer::class,
|
'server' => AccessingValidServer::class,
|
||||||
'subuser.auth' => AuthenticateAsSubuser::class,
|
'subuser.auth' => AuthenticateAsSubuser::class,
|
||||||
'admin' => AdminAuthenticate::class,
|
'admin' => AdminAuthenticate::class,
|
||||||
'daemon-old' => DaemonAuthenticate::class,
|
'daemon-old' => OldDaemonAuthenticate::class,
|
||||||
'csrf' => VerifyCsrfToken::class,
|
'csrf' => VerifyCsrfToken::class,
|
||||||
'throttle' => ThrottleRequests::class,
|
'throttle' => ThrottleRequests::class,
|
||||||
'can' => Authorize::class,
|
'can' => Authorize::class,
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
namespace Pterodactyl\Http\Middleware;
|
namespace Pterodactyl\Http\Middleware;
|
||||||
|
|
||||||
use Closure;
|
use Closure;
|
||||||
|
use stdClass;
|
||||||
use GuzzleHttp\Client;
|
use GuzzleHttp\Client;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Pterodactyl\Events\Auth\FailedCaptcha;
|
use Pterodactyl\Events\Auth\FailedCaptcha;
|
||||||
|
@ -65,11 +66,11 @@ class VerifyReCaptcha
|
||||||
/**
|
/**
|
||||||
* Determine if the response from the recaptcha servers was valid.
|
* Determine if the response from the recaptcha servers was valid.
|
||||||
*
|
*
|
||||||
* @param object $result
|
* @param stdClass $result
|
||||||
* @param \Illuminate\Http\Request $request
|
* @param \Illuminate\Http\Request $request
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
private function isResponseVerified(object $result, Request $request): bool
|
private function isResponseVerified(stdClass $result, Request $request): bool
|
||||||
{
|
{
|
||||||
if (! $this->config->get('recaptcha.verify_domain')) {
|
if (! $this->config->get('recaptcha.verify_domain')) {
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Add table
Reference in a new issue