Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Delete uploaded resource after failed validation #174

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Delete uploaded resource after failed validation #174

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3fca95e
feat: delete file if it fails type validation
fdchriswaechter Jul 19, 2024
5018a7f
feat: delete file if form validation result has errors
fdchriswaechter Jul 22, 2024
2043014
fix: set var $isInstanceOfUploadedFileBeforeProcess before process
fdchriswaechter Jul 22, 2024
45e97a7
feat: advance with option property if resource should be deleted
fdchriswaechter Jul 22, 2024
cf438cb
Merge remote-tracking branch 'origin/master' into improve-upload-field
fdchriswaechter Aug 26, 2024
2dfbfa1
chore: revert FormRuntime.php to original
fdchriswaechter Aug 26, 2024
90f2449
chore: delete resource with resource manager
fdchriswaechter Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Classes/Validation/FileTypeValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
* source code.
*/

use Neos\Flow\Annotations as Flow;
use Neos\Flow\ResourceManagement\PersistentResource;
use Neos\Flow\ResourceManagement\ResourceManager;
use Neos\Flow\Validation\Validator\AbstractValidator;

/**
Expand All @@ -20,6 +22,12 @@
*/
class FileTypeValidator extends AbstractValidator
{
/**
* @Flow\Inject
* @var ResourceManager
*/
protected ResourceManager $resourceManager;

/**
* @var array
*/
Expand All @@ -41,13 +49,18 @@ protected function isValid($resource)
$this->addError('The given value was not a PersistentResource instance.', 1327865587);
return;
}

$fileExtension = $resource->getFileExtension();

if ($fileExtension === null || $fileExtension === '') {
$this->addError('The file has no file extension.', 1327865808);
$this->resourceManager->deleteResource($resource);
return;
}

if (!in_array($fileExtension, $this->options['allowedExtensions'])) {
$this->addError('The file extension "%s" is not allowed.', 1327865764, array($resource->getFileExtension()));
$this->resourceManager->deleteResource($resource);
return;
}
}
Expand Down
Loading