Update logic that handles creation of folders for a server

This commit is contained in:
Dane Everitt 2019-05-01 21:45:39 -07:00
parent ec87330a81
commit 95d19bf09e
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
13 changed files with 116 additions and 9 deletions

View file

@ -4,12 +4,14 @@ namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
use Carbon\Carbon;
use Ramsey\Uuid\Uuid;
use Illuminate\Http\Response;
use Pterodactyl\Models\Server;
use Illuminate\Http\JsonResponse;
use Illuminate\Contracts\Cache\Repository as CacheRepository;
use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
use Pterodactyl\Http\Requests\Api\Client\Servers\Files\ListFilesRequest;
use Pterodactyl\Http\Requests\Api\Client\Servers\Files\CreateFolderRequest;
use Pterodactyl\Http\Requests\Api\Client\Servers\Files\DownloadFileRequest;
class FileController extends ClientApiController
@ -53,6 +55,21 @@ class FileController extends ClientApiController
]);
}
/**
* Creates a new folder on the server.
*
* @param \Pterodactyl\Http\Requests\Api\Client\Servers\Files\CreateFolderRequest $request
* @return \Illuminate\Http\Response
*/
public function createFolder(CreateFolderRequest $request): Response
{
$this->fileRepository
->setServer($request->getModel(Server::class))
->createDirectory($request->input('name'), $request->input('directory', '/'));
return Response::create('s');
}
/**
* Configure a reference to a file to download in the cache so that when the
* user hits the Daemon and it verifies with the Panel they'll actually be able

View file

@ -39,7 +39,7 @@ class AuthenticateServerAccess
$server = $request->route()->parameter('server');
if (! $server instanceof Server) {
throw new NotFoundHttpException;
throw new NotFoundHttpException(trans('exceptions.api.resource_not_found'));
}
if ($server->suspended) {

View file

@ -26,8 +26,13 @@ class SubstituteClientApiBindings extends ApiSubstituteBindings
// column rather than the default 'id'.
$this->router->bind('server', function ($value) use ($request) {
try {
$column = 'uuidShort';
if (preg_match('/^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i', $value)) {
$column = 'uuid';
}
return Container::getInstance()->make(ServerRepositoryInterface::class)->findFirstWhere([
['uuidShort', '=', $value],
[$column, '=', $value],
]);
} catch (RecordNotFoundException $ex) {
$request->attributes->set('is_missing_model', true);

View file

@ -0,0 +1,30 @@
<?php
namespace Pterodactyl\Http\Requests\Api\Client\Servers\Files;
use Pterodactyl\Models\Server;
use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
class CreateFolderRequest extends ClientApiRequest
{
/**
* Checks that the authenticated user is allowed to create files on the server.
*
* @return bool
*/
public function authorize(): bool
{
return $this->user()->can('create-files', $this->getModel(Server::class));
}
/**
* @return array
*/
public function rules(): array
{
return [
'root' => 'sometimes|nullable|string',
'name' => 'required|string',
];
}
}

View file

@ -17,4 +17,14 @@ class ListFilesRequest extends ClientApiRequest
{
return $this->user()->can('list-files', $this->getModel(Server::class));
}
/**
* @return array
*/
public function rules(): array
{
return [
'directory' => 'sometimes|nullable|string',
];
}
}