Allow background image URLs for file types the web server doesn't know about, e.g. when AVIF is sent as application/octet-stream#1956
Merged
westonruter merged 3 commits intoWordPress:trunkfrom Mar 26, 2025
Conversation
b1ink0
added
[Type] Bug
b1ink0
changed the title
application/octet-stream Content-Type
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## trunk #1956 +/- ##
=======================================
Coverage 72.25% 72.26%
=======================================
Files 85 85
Lines 6968 6958 -10
=======================================
- Hits 5035 5028 -7
+ Misses 1933 1930 -3
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message. To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
westonruter
requested changes
Mar 25, 2025
plugins/image-prioritizer/helper.php
Outdated
| $file_extension = pathinfo( (string) wp_parse_url( $url, PHP_URL_PATH ), PATHINFO_EXTENSION ); | ||
| $valid_image_file_extensions = array( 'jpg', 'jpeg', 'png', 'gif', 'webp', 'avif', 'heic', 'heif', 'svg' ); | ||
| if ( '' !== $file_extension && in_array( strtolower( $file_extension ), $valid_image_file_extensions, true ) ) { | ||
| return true; |
Member
There was a problem hiding this comment.
This doesn't look right because then the $content_length check below is not being accounted for.
plugins/image-prioritizer/helper.php
Outdated
Comment on lines
+236
to
+246
| $content_type = (array) wp_remote_retrieve_header( $r, 'content-type' ); | ||
| if ( ! is_string( $content_type[0] ) || ! str_starts_with( $content_type[0], 'image/' ) ) { | ||
| // This is a special case for images that are not served with the correct Content-Type. | ||
| if ( is_string( $content_type[0] ) && 'application/octet-stream' === $content_type[0] ) { | ||
| $file_extension = pathinfo( (string) wp_parse_url( $url, PHP_URL_PATH ), PATHINFO_EXTENSION ); | ||
| $valid_image_file_extensions = array( 'jpg', 'jpeg', 'png', 'gif', 'webp', 'avif', 'heic', 'heif', 'svg' ); | ||
| if ( '' !== $file_extension && in_array( strtolower( $file_extension ), $valid_image_file_extensions, true ) ) { | ||
| return true; | ||
| } | ||
| } | ||
|
|
Member
There was a problem hiding this comment.
Maybe something like this instead?
Suggested change
| $content_type = (array) wp_remote_retrieve_header( $r, 'content-type' ); | |
| if ( ! is_string( $content_type[0] ) || ! str_starts_with( $content_type[0], 'image/' ) ) { | |
| // This is a special case for images that are not served with the correct Content-Type. | |
| if ( is_string( $content_type[0] ) && 'application/octet-stream' === $content_type[0] ) { | |
| $file_extension = pathinfo( (string) wp_parse_url( $url, PHP_URL_PATH ), PATHINFO_EXTENSION ); | |
| $valid_image_file_extensions = array( 'jpg', 'jpeg', 'png', 'gif', 'webp', 'avif', 'heic', 'heif', 'svg' ); | |
| if ( '' !== $file_extension && in_array( strtolower( $file_extension ), $valid_image_file_extensions, true ) ) { | |
| return true; | |
| } | |
| } | |
| $content_type = (array) wp_remote_retrieve_header( $r, 'content-type' ); | |
| if ( 'application/octet-stream' === $content_type[0] ) { | |
| // This is a special case for images that are not served with the correct Content-Type. | |
| $file_extension = pathinfo( (string) wp_parse_url( $url, PHP_URL_PATH ), PATHINFO_EXTENSION ); | |
| $valid_image_file_extensions = array( 'jpg', 'jpeg', 'png', 'gif', 'webp', 'avif', 'heic', 'heif', 'svg' ); | |
| $is_valid_content_type = in_array( strtolower( $file_extension ), $valid_image_file_extensions, true ); | |
| } else { | |
| $is_valid_content_type = is_string( $content_type[0] ) && str_starts_with( $content_type[0], 'image/' ); | |
| } | |
| if ( ! $is_valid_content_type ) { |
Co-authored-by: Weston Ruter <westonruter@google.com>
westonruter
changed the title
application/octet-stream
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
2 participants
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.
Summary
Fixes #1952
Relevant technical choices
This PR addresses an issue where the Image Prioritizer plugin fails to validate background image URLs when the server returns a Content-Type of
application/octet-streaminstead of an expectedimage/*Content-Type.