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.

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

Bugfix to ensure image type is correctly extracted from content type #4062

Merged
merged 12 commits into from
Apr 10, 2024

Conversation

thegreendrinker
Copy link
Contributor

@thegreendrinker thegreendrinker commented Apr 8, 2024

Fixes

Fixes #3750 by @obulat
In api/utils/image_proxy/extension.py, _get_file_extension_from_content_type() was modified to split the returned content_type by ; in order to remove undesirable appended section of string to the file type. I also made sure to strip any preceding . that occurred when passing content_type to mimetypes.guess_extension(). Finally, None was returned anytime the call to mimetypes.guess_extension() returned None.

Description

When you attempt to go to the following link, the following 415 error is returned:
{"detail":"Unsupported media type \"Image extension png;charset=UTF-8 is not supported by the thumbnail proxy.\" in request."}
charset=UTF-8 is incorrectly appended to png. To solve this, I wrote a function to remove the undesirable appended section of the content file type. I also wrote a @pytest.mark.parametrize decorator that contains tests for various file extensions.

Testing Instructions

Created a draft pull request so that I can get assistance on running the tests utilizing the Docker container.

Checklist

  • My pull request has a descriptive title (not a vague title likeUpdate index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.
  • I ran the DAG documentation generator (if applicable).

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@openverse-bot openverse-bot added 🟨 priority: medium Not blocking but should be addressed soon 🛠 goal: fix Bug fix 💻 aspect: code Concerns the software code in the repository 🚦 status: awaiting triage Has not been triaged & therefore, not ready for work labels Apr 8, 2024
@zackkrida zackkrida added the 🧱 stack: api Related to the Django API label Apr 8, 2024
@AetherUnbound AetherUnbound removed the 🚦 status: awaiting triage Has not been triaged & therefore, not ready for work label Apr 8, 2024
Darien and others added 6 commits April 8, 2024 15:09
…modified get_file_extension_from_content_type() to utilize mimetypes.guess_extension() to automatically find file extensions in strings
…that return None when passed to mimetypes.guess_extension() to compare to None. Also, call mimetypes.guess_extension() in conditional header, assign it to variable, and then only strip it of '.' if it isn't None
@thegreendrinker thegreendrinker marked this pull request as ready for review April 8, 2024 23:17
@thegreendrinker thegreendrinker requested a review from a team as a code owner April 8, 2024 23:17
Copy link
Collaborator

@sarayourfriend sarayourfriend left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! Thanks very much for the contribution @thegreendrinker and for adding a new unit test 🚀

Copy link
Collaborator

@stacimc stacimc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fantastic, lgtm 👍

@stacimc stacimc merged commit 35197e9 into WordPress:main Apr 10, 2024
80 of 92 checks passed
@thegreendrinker thegreendrinker deleted the bugfix-extension branch April 15, 2024 17:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
💻 aspect: code Concerns the software code in the repository 🛠 goal: fix Bug fix 🟨 priority: medium Not blocking but should be addressed soon 🧱 stack: api Related to the Django API
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Image type used for thumbnails is sometimes incorrectly extracted from the content type
6 participants