Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clarify error messaging for transfers

Browse source
This commit is contained in:
Dane Everitt 2020-12-24 10:14:10 -08:00
parent a2548c14ac
commit 6c39288def
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
5 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Exceptions/Http/Server/ServerTransferringException.php
View file

@ -7,8 +7,11 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
class ServerTransferringException extends HttpException
{
/**
* ServerTransferringException constructor.
*/
public function __construct()
{
parent::__construct(Response::HTTP_CONFLICT, 'Server is currently being transferred.');
parent::__construct(Response::HTTP_CONFLICT, 'This server is currently being transferred to a new machine, please try again laster.');
}
}

2
app/Http/Controllers/Api/Remote/SftpAuthenticationController.php
View file

@ -113,7 +113,7 @@ class SftpAuthenticationController extends Controller
// Prevent SFTP access to servers that are being transferred.
if (! is_null($server->transfer)) {
throw new ServerTransferringException();
throw new ServerTransferringException;
}
// Remember, for security purposes, only reveal the existence of the server to people that

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

@ -82,7 +82,7 @@ class AuthenticateServerAccess
if (! is_null($server->transfer)) {
if (! $user->root_admin || ($user->root_admin && ! $request->routeIs($this->except))) {
throw new ServerTransferringException();
throw new ServerTransferringException;
}
}
}

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

@ -83,7 +83,7 @@ class AccessingValidServer
if (! is_null($server->transfer)) {
if ($isApiRequest) {
throw new ServerTransferringException();
throw new ServerTransferringException;
}
return $this->response->view('errors.transferring', [], 409);

2
app/Services/Servers/SuspensionService.php
View file

@ -60,7 +60,7 @@ class SuspensionService
// Check if the server is currently being transferred.
if (! is_null($server->transfer)) {
throw new ServerTransferringException();
throw new ServerTransferringException;
}
$this->connection->transaction(function () use ($action, $server) {