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

[Posting] Add Content Length constraint to form validation

Browse Source
This commit is contained in:
Eliseu Amaro 2021-10-24 15:32:28 +01:00 committed by Diogo Peralta Cordeiro
parent 8038fdbce9
commit b7d9da8ae6
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0
1 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
components/Posting/Posting.php
View File

@ -28,8 +28,6 @@ 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 App\Core\Modules\Component; use App\Core\Modules\Component;
use App\Core\Security; use App\Core\Security;
use App\Entity\Actor; use App\Entity\Actor;
@ -47,6 +45,11 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\FileType; use Symfony\Component\Form\Extension\Core\Type\FileType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\HttpFoundation\File\Exception\FormSizeFileException;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use Symfony\Component\Validator\Constraints\Length;
use function App\Core\I18n\_m;
use function count;
class Posting extends Component class Posting extends Component
{ {
@ -82,23 +85,26 @@ class Posting extends Component
$initial_content = ''; $initial_content = '';
Event::handle('PostingInitialContent', [&$initial_content]); Event::handle('PostingInitialContent', [&$initial_content]);
$available_content_types = ['Plain Text' => 'text/plain']; $available_content_types = [
'Plain Text' => 'text/plain',
];
Event::handle('PostingAvailableContentTypes', [&$available_content_types]); Event::handle('PostingAvailableContentTypes', [&$available_content_types]);
$request = $vars['request']; $request = $vars['request'];
$form_params = [ $form_params = [
['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)], 'constraints' => [new Length(['max' => Common::config('site', 'text_limit')])],]],
['attachments', FileType::class, [ ['attachments', FileType::class, [
'label' => _m('Attachments:'), 'label' => _m('Attachments:'),
'multiple' => true, 'multiple' => true,
'required' => false, 'required' => false,
'invalid_message' => _m('Attachment not valid.'), '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,
[ [
'label' => _m('Text format:'), 'multiple' => false, 'expanded' => false, 'label' => _m('Text format:'), 'multiple' => false, 'expanded' => false,
@ -113,14 +119,14 @@ class Posting extends Component
$form->handleRequest($request); $form->handleRequest($request);
if ($form->isSubmitted()) { if ($form->isSubmitted()) {
try { try {
$data = $form->getData();
if ($form->isValid()) { if ($form->isValid()) {
$data = $form->getData();
$content_type = $data['content_type'] ?? $available_content_types[array_key_first($available_content_types)]; $content_type = $data['content_type'] ?? $available_content_types[array_key_first($available_content_types)];
self::storeLocalNote($user->getActor(), $data['content'], $content_type, $data['attachments']); self::storeLocalNote($user->getActor(), $data['content'], $content_type, $data['attachments']);
throw new RedirectException(); throw new RedirectException();
} }
} catch (FormSizeFileException $sizeFileException) { } catch (FormSizeFileException $sizeFileException) {
throw new FormSizeFileException(_m($sizeFileException)); throw new FormSizeFileException();
} catch (InvalidFormException $invalidFormException) { } catch (InvalidFormException $invalidFormException) {
throw new InvalidFormException(); throw new InvalidFormException();
} }
@ -152,13 +158,13 @@ class Posting extends Component
]); ]);
$processed_attachments = []; $processed_attachments = [];
/** @var \Symfony\Component\HttpFoundation\File\UploadedFile[] $attachments */ /** @var UploadedFile[] $attachments */
foreach ($attachments as $f) { foreach ($attachments as $f) {
$filesize = $f->getSize(); $filesize = $f->getSize();
$max_file_size = Common::getUploadLimit(); $max_file_size = Common::getUploadLimit();
if ($max_file_size < $filesize) { if ($max_file_size < $filesize) {
throw new FormSizeFileException(_m('No file may be larger than {quota} bytes and the file you sent was {size} bytes. ' throw new ClientException(_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()];