Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2867336 by mbovan, jcnventura, Berdir, hchonov, gabesullice, jonathanshaw: File size validator should only respect the explicitly configured maximum file size 

(cherry picked from commit c647ef4daf)
merge-requests/2923/head
catch 2022-10-28 10:20:08 +01:00
parent 0ba146b64c
commit 6c93f38f64
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/file/src/Plugin/Field/FieldType/FileItem.php
View File

@ -180,7 +180,7 @@ class FileItem extends EntityReferenceItem {
'#type' => 'textfield',
'#title' => $this->t('Maximum upload size'),
'#default_value' => $settings['max_filesize'],
'#description' => $this->t('Enter a value like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes) in order to restrict the allowed file size. If left empty the file sizes will be limited only by PHP\'s maximum post and file upload sizes (current limit <strong>%limit</strong>).', ['%limit' => format_size(Environment::getUploadMaxSize())]),
'#description' => $this->t('Enter a value like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes) in order to restrict the allowed file size. If left empty the file sizes could be limited only by PHP\'s maximum post and file upload sizes (current limit <strong>%limit</strong>).', ['%limit' => format_size(Environment::getUploadMaxSize())]),
'#size' => 10,
'#element_validate' => [[static::class, 'validateMaxFilesize']],
'#weight' => 5,

12
core/modules/file/src/Plugin/Validation/Constraint/FileValidationConstraintValidator.php
View File

@ -2,6 +2,7 @@
namespace Drupal\file\Plugin\Validation\Constraint;
use Drupal\Component\Utility\Bytes;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintValidator;
@ -23,6 +24,17 @@ class FileValidationConstraintValidator extends ConstraintValidator {
$file = $target->getValue();
// Get the validators.
$validators = $value->getUploadValidators();
// Always respect the configured maximum file size.
$field_settings = $value->getFieldDefinition()->getSettings();
if (array_key_exists('max_filesize', $field_settings)) {
$validators['file_validate_size'] = [Bytes::toNumber($field_settings['max_filesize'])];
}
else {
// Do not validate the file size if it is not set explicitly.
unset($validators['file_validate_size']);
}
// Checks that a file meets the criteria specified by the validators.
if ($errors = file_validate($file, $validators)) {
foreach ($errors as $error) {