dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

Fix error handling for large files (and endpoints called as non-json)

Browse Source
This commit is contained in:
Dane Everitt 2020-04-06 21:59:14 -07:00
parent 7f2b477538
commit f9878d842c
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Exceptions/Http/Server/FileSizeTooLargeException.php
View File

@ -1,11 +1,4 @@
<?php
/**
* Pterodactyl - Panel
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
*
* This software is licensed under the terms of the MIT license.
* https://opensource.org/licenses/MIT
*/
namespace Pterodactyl\Exceptions\Http\Server;
@ -13,4 +6,11 @@ use Pterodactyl\Exceptions\DisplayException;
class FileSizeTooLargeException extends DisplayException
{
/**
* FileSizeTooLargeException constructor.
*/
public function __construct()
{
parent::__construct('The file you are attempting to open is too large to view in the file editor.');
}
}

4
app/Repositories/Wings/DaemonFileRepository.php
View File

@ -49,9 +49,7 @@ class DaemonFileRepository extends DaemonRepository
$length = (int) $response->getHeader('Content-Length')[0] ?? 0;
if ($notLargerThan && $length > $notLargerThan) {
throw new FileSizeTooLargeException(
trans('server.files.exceptions.max_size')
);
throw new FileSizeTooLargeException;
}
return $response->getBody()->__toString();

2
config/pterodactyl.php
View File

@ -172,7 +172,7 @@ return [
| This array includes the MIME filetypes that can be edited via the web.
*/
'files' => [
'max_edit_size' => env('PTERODACTYL_FILES_MAX_EDIT_SIZE', 50000),
'max_edit_size' => env('PTERODACTYL_FILES_MAX_EDIT_SIZE', 1024 * 512),
'editable' => [
'application/json',
'application/javascript',

13
resources/scripts/api/http.ts
View File

@ -29,7 +29,18 @@ export default http;
*/
export function httpErrorToHuman (error: any): string {
if (error.response && error.response.data) {
const { data } = error.response;
let { data } = error.response;
// Some non-JSON requests can still return the error as a JSON block. In those cases, attempt
// to parse it into JSON so we can display an actual error.
if (typeof data === 'string') {
try {
data = JSON.parse(data);
} catch (e) {
// do nothing, bad json
}
}
if (data.errors && data.errors[0] && data.errors[0].detail) {
return data.errors[0].detail;
}