Alex/Pterodactyl-Panel
1
1
Fork 1
mirror of https://github.com/pterodactyl/panel.git synced 2024-11-22 09:02:28 +01:00
Code Issues Releases Wiki Activity

Properly handle loading files with special characters

Browse Source
This commit is contained in:
Dane Everitt 2020-12-16 21:38:46 -08:00
parent 0084b48d86
commit 5d03c0d2e5
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 3 additions and 3 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

@ -72,7 +72,7 @@ class FileController extends ClientApiController
{
$contents = $this->fileRepository
->setServer($server)
->getDirectory(rawurldecode($request->get('directory') ?? '/'));
->getDirectory($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(
rawurldecode($request->get('file')), config('pterodactyl.files.max_edit_size')
$request->get('file'), config('pterodactyl.files.max_edit_size')
),
Response::HTTP_OK,
['Content-Type' => 'text/plain']

2
resources/scripts/api/server/files/loadDirectory.ts
View File

@ -20,7 +20,7 @@ export default async (uuid: string, directory?: string): Promise<FileObject[]> =
const { data } = await http.get(`/api/client/servers/${uuid}/files/list`, {
// At this point the directory is still encoded so we need to decode it since axios
// will automatically re-encode this value before sending it along in the request.
params: { directory: decodeURI(directory ?? '/') },
params: { directory: directory ?? '/' },
});
return (data.data || []).map(rawDataToFileObject);