Improve avatar upload experience #3181
Merged
Conversation
This file contains 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
Fixes #3055 - On the frontend, accept only image types as a hint to the OS file picker - On the backend, use `getimagesize` as an additional validation guard against non-image files with image extensions. This isn't necessary for security, but results in less confusing error mesages.
[ci skip] [skip ci]
askvortsov1
requested review from
tankerkiller125,
clarkwinkelmann,
davwheat and
SychO9
davwheat
approved these changes
Nov 25, 2021
SychO9
reviewed
Nov 25, 2021
src/User/AvatarValidator.php
Outdated
Comment on lines
69
to
73
| if (! in_array($guessedExtension, $allowedTypes)) { | ||
| $stream = $file->getStream(); | ||
| $tmpFilename = $stream->getMetadata('uri'); | ||
| $notImage = ! getimagesize($tmpFilename); | ||
|
|
||
| if ($notImage || ! in_array($guessedExtension, $allowedTypes)) { |
There was a problem hiding this comment.
getimagesize doesn't seem to be a reliable way of checking if the file is an image (https://www.php.net/manual/en/function.getimagesize.php)
I'm thinking it might be better to catch errors when creation the intervention image object, logging the error in the logs, and returning a better response to the end user.
There was a problem hiding this comment.
Changed to use that logic
There was a problem hiding this comment.
I wouldn't get rid of the mimes check though 🤔 ? the try catch should act as a second check.
tankerkiller125
approved these changes
Nov 26, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #3055
getimagesizeas an additional validation guard against non-image files with image extensions. This isn't necessary for security, but results in less confusing error mesages.