[5.x] Throw UnableToReadFile for invalid images in ImageGenerator#14043
Open
mmodler wants to merge 2 commits intostatamic:5.xfrom
Open
[5.x] Throw UnableToReadFile for invalid images in ImageGenerator#14043mmodler wants to merge 2 commits intostatamic:5.xfrom
mmodler wants to merge 2 commits intostatamic:5.xfrom
Conversation
The validateImage() method threw a generic \Exception when an image failed validation, which was not caught by ThumbnailController and resulted in a 500 error. By throwing UnableToReadFile instead, it is now caught and converted to a 404, consistent with other file-not-found scenarios.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
The
validateImage()method inImageGeneratorthrows a generic\Exceptionwhen an image fails validation (invalid extension or MIME type mismatch). This exception is not caught byThumbnailController::generate(), which only catchesUnableToReadFile, resulting in a 500 Internal Server Error for what is essentially a "file not usable" scenario (e.g. corrupted uploads, non-image files with image extensions).By throwing
UnableToReadFileinstead, the exception is now caught by the existingcatchblock inThumbnailControllerand converted to a 404, consistent with other file-not-found scenarios.Changes
ImageGenerator::validateImage(): ThrowUnableToReadFile::fromLocation()instead of generic\ExceptionUnableToReadFileis thrown when image validation failsNotes
The same gap exists in the
6.xbranch — happy to open a separate PR there if preferred.