GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[UTIL][Common] Added Common::getUploadLimit().

Browse Source 
[COMPONENT][Posting] Update Posting to warn the user of submtting attachments too large.
This commit is contained in:
Eliseu Amaro 2021-10-21 14:54:32 +01:00 committed by Diogo Peralta Cordeiro
parent 656c2c7812
commit 8038fdbce9
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
components/Posting/Posting.php
View File

@ -28,6 +28,7 @@ use App\Core\DB\DB;
use App\Core\Event; use App\Core\Event;
use App\Core\Form; use App\Core\Form;
use App\Core\GSFile; use App\Core\GSFile;
use Symfony\Component\HttpFoundation\File\Exception\FormSizeFileException;
use function App\Core\I18n\_m; use function App\Core\I18n\_m;
use App\Core\Modules\Component; use App\Core\Modules\Component;
use App\Core\Security; use App\Core\Security;
@ -89,8 +90,14 @@ class Posting extends Component
['to', ChoiceType::class, ['label' => _m('To:'), 'multiple' => false, 'expanded' => false, 'choices' => $to_tags]], ['to', ChoiceType::class, ['label' => _m('To:'), 'multiple' => false, 'expanded' => false, 'choices' => $to_tags]],
['visibility', ChoiceType::class, ['label' => _m('Visibility:'), 'multiple' => false, 'expanded' => false, 'data' => 'public', 'choices' => [_m('Public') => 'public', _m('Instance') => 'instance', _m('Private') => 'private']]], ['visibility', ChoiceType::class, ['label' => _m('Visibility:'), 'multiple' => false, 'expanded' => false, 'data' => 'public', 'choices' => [_m('Public') => 'public', _m('Instance') => 'instance', _m('Private') => 'private']]],
['content', TextareaType::class, ['label' => _m('Content:'), 'data' => $initial_content, 'attr' => ['placeholder' => _m($placeholder)]]], ['content', TextareaType::class, ['label' => _m('Content:'), 'data' => $initial_content, 'attr' => ['placeholder' => _m($placeholder)]]],
['attachments', FileType::class, ['label' => _m('Attachments:'), 'data' => null, 'multiple' => true, 'required' => false]], ['attachments', FileType::class, [
]; 'label' => _m('Attachments:'),
'multiple' => true,
'required' => false,
'invalid_message' => _m('Attachment not valid.'),
]
]];
if (\count($available_content_types) > 1) { if (\count($available_content_types) > 1) {
$form_params[] = ['content_type', ChoiceType::class, $form_params[] = ['content_type', ChoiceType::class,
[ [
@ -105,12 +112,16 @@ class Posting extends Component
$form->handleRequest($request); $form->handleRequest($request);
if ($form->isSubmitted()) { if ($form->isSubmitted()) {
$data = $form->getData(); try {
if ($form->isValid()) { $data = $form->getData();
$content_type = $data['content_type'] ?? $available_content_types[array_key_first($available_content_types)]; if ($form->isValid()) {
self::storeLocalNote($user->getActor(), $data['content'], $content_type, $data['attachments']); $content_type = $data['content_type'] ?? $available_content_types[array_key_first($available_content_types)];
throw new RedirectException(); self::storeLocalNote($user->getActor(), $data['content'], $content_type, $data['attachments']);
} else { throw new RedirectException();
}
} catch (FormSizeFileException $sizeFileException) {
throw new FormSizeFileException(_m($sizeFileException));
} catch (InvalidFormException $invalidFormException) {
throw new InvalidFormException(); throw new InvalidFormException();
} }
} }
@ -144,10 +155,10 @@ class Posting extends Component
/** @var \Symfony\Component\HttpFoundation\File\UploadedFile[] $attachments */ /** @var \Symfony\Component\HttpFoundation\File\UploadedFile[] $attachments */
foreach ($attachments as $f) { foreach ($attachments as $f) {
$filesize = $f->getSize(); $filesize = $f->getSize();
$max_file_size = Common::config('attachments', 'file_quota'); $max_file_size = Common::getUploadLimit();
if ($max_file_size < $filesize) { if ($max_file_size < $filesize) {
throw new ClientException(_m('No file may be larger than {quota} bytes and the file you sent was {size} bytes. ' throw new FormSizeFileException(_m('No file may be larger than {quota} bytes and the file you sent was {size} bytes. '
. 'Try to upload a smaller version.', ['quota' => $max_file_size, 'size' => $filesize], )); . 'Try to upload a smaller version.', ['quota' => $max_file_size, 'size' => $filesize]));
} }
Event::handle('EnforceUserFileQuota', [$filesize, $actor->getId()]); Event::handle('EnforceUserFileQuota', [$filesize, $actor->getId()]);
$processed_attachments[] = [GSFile::storeFileAsAttachment($f), $f->getClientOriginalName()]; $processed_attachments[] = [GSFile::storeFileAsAttachment($f), $f->getClientOriginalName()];

11
src/Util/Common.php
View File

@ -257,6 +257,17 @@ abstract class Common
); );
} }
/**
* Uses common config 'attachments' 'file_quota' while respecting PreferredPhpUploadLimit
*/
public static function getUploadLimit(): int
{
return min(
self::getPreferredPhpUploadLimit(),
self::config('attachments', 'file_quota')
);
}
/** /**
* Clamps a value between 2 numbers * Clamps a value between 2 numbers
* *