Skip to content

Commit ecdd133

Browse files
committed
Fix daemon auth
1 parent 1438a50 commit ecdd133

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

app/Http/Kernel.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,22 @@
1313
use Pterodactyl\Http\Middleware\AdminAuthenticate;
1414
use Pterodactyl\Http\Middleware\HMACAuthorization;
1515
use Illuminate\Routing\Middleware\ThrottleRequests;
16-
use Pterodactyl\Http\Middleware\DaemonAuthenticate;
1716
use Pterodactyl\Http\Middleware\LanguageMiddleware;
1817
use Illuminate\Foundation\Http\Kernel as HttpKernel;
1918
use Illuminate\Routing\Middleware\SubstituteBindings;
2019
use Pterodactyl\Http\Middleware\AccessingValidServer;
2120
use Illuminate\View\Middleware\ShareErrorsFromSession;
2221
use Pterodactyl\Http\Middleware\RedirectIfAuthenticated;
2322
use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
23+
use Pterodactyl\Http\Middleware\Daemon\DaemonAuthenticate;
2424
use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
2525
use Pterodactyl\Http\Middleware\Server\AuthenticateAsSubuser;
2626
use Pterodactyl\Http\Middleware\Server\SubuserBelongsToServer;
2727
use Pterodactyl\Http\Middleware\RequireTwoFactorAuthentication;
2828
use Pterodactyl\Http\Middleware\Server\DatabaseBelongsToServer;
2929
use Pterodactyl\Http\Middleware\Server\ScheduleBelongsToServer;
3030
use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode;
31+
use Pterodactyl\Http\Middleware\DaemonAuthenticate as OldDaemonAuthenticate;
3132

3233
class Kernel extends HttpKernel
3334
{
@@ -71,7 +72,7 @@ class Kernel extends HttpKernel
7172
],
7273
'daemon' => [
7374
SubstituteBindings::class,
74-
'daemon-old',
75+
DaemonAuthenticate::class,
7576
],
7677
];
7778

@@ -87,7 +88,7 @@ class Kernel extends HttpKernel
8788
'server' => AccessingValidServer::class,
8889
'subuser.auth' => AuthenticateAsSubuser::class,
8990
'admin' => AdminAuthenticate::class,
90-
'daemon-old' => DaemonAuthenticate::class,
91+
'daemon-old' => OldDaemonAuthenticate::class,
9192
'csrf' => VerifyCsrfToken::class,
9293
'throttle' => ThrottleRequests::class,
9394
'can' => Authorize::class,

app/Http/Middleware/VerifyReCaptcha.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Pterodactyl\Http\Middleware;
44

55
use Closure;
6+
use stdClass;
67
use GuzzleHttp\Client;
78
use Illuminate\Http\Request;
89
use Pterodactyl\Events\Auth\FailedCaptcha;
@@ -65,11 +66,11 @@ public function handle($request, Closure $next)
6566
/**
6667
* Determine if the response from the recaptcha servers was valid.
6768
*
68-
* @param object $result
69+
* @param stdClass $result
6970
* @param \Illuminate\Http\Request $request
7071
* @return bool
7172
*/
72-
private function isResponseVerified(object $result, Request $request): bool
73+
private function isResponseVerified(stdClass $result, Request $request): bool
7374
{
7475
if (! $this->config->get('recaptcha.verify_domain')) {
7576
return false;

0 commit comments

Comments
 (0)