StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add ServerTransferringException, use is_null

Browse source
This commit is contained in:
Matthew Penner 2020-12-17 10:34:26 -07:00
parent 5668a780e2
commit fd848985ee
9 changed files with 36 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Middleware/Api/Client/Server/AuthenticateServerAccess.php
View file

@ -79,7 +79,7 @@ class AuthenticateServerAccess
}
}
if ($server->transfer !== null) {
if (! is_null($server->transfer)) {
if (! $user->root_admin || ($user->root_admin && ! $request->routeIs($this->except))) {
throw new ConflictHttpException('Server is currently being transferred.');
}

5
app/Http/Middleware/Server/AccessingValidServer.php
View file

@ -9,6 +9,7 @@ use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Contracts\Config\Repository as ConfigRepository;
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
use Pterodactyl\Exceptions\Http\Server\ServerTransferringException;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
class AccessingValidServer
@ -80,9 +81,9 @@ class AccessingValidServer
return $this->response->view('errors.installing', [], 409);
}
if ($server->transfer !== null) {
if (! is_null($server->transfer)) {
if ($isApiRequest) {
throw new ConflictHttpException('Server is currently being transferred.');
throw new ServerTransferringException();
}
return $this->response->view('errors.transferring', [], 409);