Add support for a list of allowed mime-types instead of only one #50
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
There was a problem hiding this comment.
Thanks a bunch for the PR, @gabsoftware! Just left a few comments, let me know what you think.
I'll tag afterwards and add a note about the change of screenshotMimeType -> screenshotMimeTypes
| @@ -20,21 +20,22 @@ | |||
| exit(); | |||
| } | |||
|
|
|||
| $mimetype = isset($screenshot['tmp_name']) ? mime_content_type($screenshot['tmp_name']) : "error"; | |||
There was a problem hiding this comment.
Suggested change
| $mimetype = isset($screenshot['tmp_name']) ? mime_content_type($screenshot['tmp_name']) : "error"; | |
| $mimetype = isset($screenshot['tmp_name']) ? mime_content_type($screenshot['tmp_name']) : 'error'; |
| if ( | ||
| // Make sure it is a successful single file upload | ||
| !isset($screenshot['error']) || | ||
| is_array($screenshot['error']) || | ||
| $screenshot['error'] !== UPLOAD_ERR_OK || | ||
| // Verify size and mime type | ||
| $screenshot['size'] > $config['maxScreenshotSize'] || | ||
| mime_content_type($screenshot['tmp_name']) !== $config['screenshotMimeType'] | ||
| !in_array( $mimetype, $config['screenshotMimeTypes'], true) |
There was a problem hiding this comment.
Suggested change
| !in_array( $mimetype, $config['screenshotMimeTypes'], true) | |
| !in_array($mimetype, $config['screenshotMimeTypes'], true) |
| ) { | ||
| http_response_code(422); | ||
| exit(); | ||
| } | ||
|
|
||
| // Generate screenshot path | ||
| do {} while (file_exists($filename = bin2hex(random_bytes(12)) . '.png')); | ||
| do {} while (file_exists($filename = bin2hex(random_bytes(12)) . '.' . ($mimetype == "image/png" ? "png" : "jpg" ))); |
There was a problem hiding this comment.
Suggested change
| do {} while (file_exists($filename = bin2hex(random_bytes(12)) . '.' . ($mimetype == "image/png" ? "png" : "jpg" ))); | |
| do {} while (file_exists($filename = bin2hex(random_bytes(12)) . '.' . ($mimetype == 'image/png' ? 'png' : 'jpg' ))); |
| ) { | ||
| http_response_code(422); | ||
| exit(); | ||
| } | ||
|
|
||
| // Generate screenshot path | ||
| do {} while (file_exists($filename = bin2hex(random_bytes(12)) . '.png')); | ||
| do {} while (file_exists($filename = bin2hex(random_bytes(12)) . '.' . ($mimetype == "image/png" ? "png" : "jpg" ))); |
There was a problem hiding this comment.
If someone adds other mimetypes besides these 2, I guess we can't really have this assumption of using .jpg here.
| @@ -4,5 +4,5 @@ return [ | |||
| 'secretBcrypt' => '', | |||
| 'saveDirName' => '/data/', | |||
| 'maxScreenshotSize' => 2 * 1048576, | |||
| 'screenshotMimeType' => 'image/png' | |||
| 'screenshotMimeTypes' => [ 'image/png', 'image/jpeg' ] | |||
There was a problem hiding this comment.
Suggested change
| 'screenshotMimeTypes' => [ 'image/png', 'image/jpeg' ] | |
| 'screenshotMimeTypes' => ['image/png', 'image/jpeg'] |
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.
Applications such as ShareX will save to PNG below a certain file size (usually 2 MB) then to JPEG, so it would be useful to allow a list of mime-types instead of only one.
This pull-request enables that.
By default it allows image/png and image/jpeg.