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

Fix bad encoding when handling files; closes #2399

Browse source
This commit is contained in:
Dane Everitt 2020-09-24 20:27:02 -07:00
parent 711efe34bb
commit 3340ee7fd8
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/Api/Client/Servers/FileController.php
View file

@ -70,7 +70,7 @@ class FileController extends ClientApiController
{ {
$contents = $this->fileRepository $contents = $this->fileRepository
->setServer($server) ->setServer($server)
->getDirectory($request->get('directory') ?? '/'); ->getDirectory(urlencode($request->get('directory') ?? '/'));
return $this->fractal->collection($contents) return $this->fractal->collection($contents)
->transformWith($this->getTransformer(FileObjectTransformer::class)) ->transformWith($this->getTransformer(FileObjectTransformer::class))
@ -91,7 +91,7 @@ class FileController extends ClientApiController
{ {
return new Response( return new Response(
$this->fileRepository->setServer($server)->getContent( $this->fileRepository->setServer($server)->getContent(
$request->get('file'), config('pterodactyl.files.max_edit_size') urlencode($request->get('file')), config('pterodactyl.files.max_edit_size')
), ),
Response::HTTP_OK, Response::HTTP_OK,
['Content-Type' => 'text/plain'] ['Content-Type' => 'text/plain']

6
app/Repositories/Wings/DaemonFileRepository.php
View file

@ -117,8 +117,8 @@ class DaemonFileRepository extends DaemonRepository
sprintf('/api/servers/%s/files/create-directory', $this->server->uuid), sprintf('/api/servers/%s/files/create-directory', $this->server->uuid),
[ [
'json' => [ 'json' => [
'name' => urldecode($name), 'name' => $name,
'path' => urldecode($path), 'path' => $path,
], ],
] ]
); );
@ -172,7 +172,7 @@ class DaemonFileRepository extends DaemonRepository
sprintf('/api/servers/%s/files/copy', $this->server->uuid), sprintf('/api/servers/%s/files/copy', $this->server->uuid),
[ [
'json' => [ 'json' => [
'location' => urldecode($location), 'location' => $location,
], ],
] ]
); );