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

Pass one at unfucking the stupid file encoding issues

Browse source
This commit is contained in:
Dane Everitt 2020-12-08 21:24:17 -08:00
parent 24417ac516
commit 3e65a2d055
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
10 changed files with 33 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

2
app/Transformers/Daemon/FileObjectTransformer.php
View file

@ -23,7 +23,7 @@ class FileObjectTransformer extends BaseDaemonTransformer
public function transform(array $item)
{
return [
'name' => Arr::get($item, 'name'),
'name' => rawurlencode(Arr::get($item, 'name')),
'mode' => Arr::get($item, 'mode'),
'mode_bits' => Arr::get($item, 'mode_bits'),
'size' => Arr::get($item, 'size'),