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

IBX-7485: Skipped files with corrupted filenames when loading and deleting #400

Merged
merged 3 commits into from
Jan 31, 2024
Merged

IBX-7485: Skipped files with corrupted filenames when loading and deleting #400

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8570f91
IBX-7485: Skipped files with corrupted filenames when loading and del…
barw4 Jan 5, 2024
06a1086
IBX-7845: Added integration test
barw4 Jan 29, 2024
2096fd3
IBX-7845: Applied review remarks
barw4 Jan 30, 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
3 changes: 2 additions & 1 deletion eZ/Publish/Core/IO/IOBinarydataHandler/Flysystem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use eZ\Publish\Core\IO\UrlDecorator;
use eZ\Publish\SPI\IO\BinaryFileCreateStruct;
use League\Flysystem\AdapterInterface;
use League\Flysystem\CorruptedPathDetected;
use League\Flysystem\FileExistsException;
use League\Flysystem\FileNotFoundException as FlysystemNotFoundException;
use League\Flysystem\FilesystemInterface;
Expand Down Expand Up @@ -56,7 +57,7 @@ public function delete($spiBinaryFileId)
{
try {
$this->filesystem->delete($spiBinaryFileId);
} catch (FlysystemNotFoundException $e) {
} catch (FlysystemNotFoundException|CorruptedPathDetected $e) {
throw new BinaryFileNotFoundException($spiBinaryFileId, $e);
}
}
Expand Down
9 changes: 7 additions & 2 deletions eZ/Publish/Core/IO/IOMetadataHandler/Flysystem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use eZ\Publish\Core\IO\IOMetadataHandler;
use eZ\Publish\SPI\IO\BinaryFile as SPIBinaryFile;
use eZ\Publish\SPI\IO\BinaryFileCreateStruct as SPIBinaryFileCreateStruct;
use League\Flysystem\CorruptedPathDetected;
use League\Flysystem\FileNotFoundException;
use League\Flysystem\FilesystemInterface;

Expand Down Expand Up @@ -47,7 +48,7 @@ public function load($spiBinaryFileId)
{
try {
$info = $this->filesystem->getMetadata($spiBinaryFileId);
} catch (FileNotFoundException $e) {
} catch (FileNotFoundException|CorruptedPathDetected $e) {
throw new BinaryFileNotFoundException($spiBinaryFileId);
}

Expand All @@ -64,7 +65,11 @@ public function load($spiBinaryFileId)

public function exists($spiBinaryFileId)
{
return $this->filesystem->has($spiBinaryFileId);
try {
return $this->filesystem->has($spiBinaryFileId);
} catch (CorruptedPathDetected $e) {
return false;
alongosz marked this conversation as resolved.
Show resolved Hide resolved
}
}

public function getMimeType($spiBinaryFileId)
Expand Down
Loading