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

Fix badly encoded charset crashing instead of falling back to detector #9160

Merged
merged 1 commit into from
Sep 17, 2024

Conversation

PLPeeters
Copy link
Contributor

@PLPeeters PLPeeters commented Sep 17, 2024

What do these changes do?

They fix a crash that occurs when processing a Content-Type header that is itself badly encoded.

Example I saw in the wild was:

HTTP/1.1 200 OK
Date: Tue, 17 Sep 2024 08:02:39 GMT
Server: Apache
Vary: Accept-Encoding
Connection: close
Content-Type: text/html; charset=�gUTF-8��

where I got:

  File "/usr/local/lib/python3.12/site-packages/aiohttp/client_reqrep.py", line 1179, in text
    encoding = self.get_encoding()
               ^^^^^^^^^^^^^^^^^^^
  File "/usr/local/lib/python3.12/site-packages/aiohttp/client_reqrep.py", line 1157, in get_encoding
    return codecs.lookup(encoding).name
           ^^^^^^^^^^^^^^^^^^^^^^^
UnicodeEncodeError: 'utf-8' codec can't encode character '\udc81' in position 0: surrogates not allowed

Yet to me, this falls under the "not understood by Python" case of the documentation:

Retrieve content encoding using charset info in Content-Type HTTP header.
If no charset is present or the charset is not understood by Python, the
fallback_charset_resolver function associated with the ClientSession is called.

Are there changes in behavior for the user?

Such websites no longer cause a UnicodeEncodeError that crashes ClientResponse.get_encoding() (and ultimately ClientResponse.text()) and will instead fallback as if it was a LookupError on the encoding. This is the behaviour I expected to see, hence the PR.

Is it a substantial burden for the maintainers to support this?

I don't think so, it might even lead to issues not being raised when they would have.

Related issue number

Sort of related to #207 and #3279.

Checklist

  • I think the code is well written
  • Unit tests for the changes exist
  • Documentation reflects the changes
  • If you provide code modification, please add yourself to CONTRIBUTORS.txt
    • The format is <Name> <Surname>.
    • Please keep alphabetical order, the file is sorted by names.
  • Add a new news fragment into the CHANGES/ folder
    • name it <issue_or_pr_num>.<type>.rst (e.g. 588.bugfix.rst)

    • if you don't have an issue number, change it to the pull request
      number after creating the PR

      • .bugfix: A bug fix for something the maintainers deemed an
        improper undesired behavior that got corrected to match
        pre-agreed expectations.
      • .feature: A new behavior, public APIs. That sort of stuff.
      • .deprecation: A declaration of future API removals and breaking
        changes in behavior.
      • .breaking: When something public is removed in a breaking way.
        Could be deprecated in an earlier release.
      • .doc: Notable updates to the documentation structure or build
        process.
      • .packaging: Notes for downstreams about unobvious side effects
        and tooling. Changes in the test invocation considerations and
        runtime assumptions.
      • .contrib: Stuff that affects the contributor experience. e.g.
        Running tests, building the docs, setting up the development
        environment.
      • .misc: Changes that are hard to assign to any of the above
        categories.
    • Make sure to use full sentences with correct case and punctuation,
      for example:

      Fixed issue with non-ascii contents in doctest text files
      -- by :user:`contributor-gh-handle`.

      Use the past tense or the present tense a non-imperative mood,
      referring to what's changed compared to the last released version
      of this project.

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Sep 17, 2024
Copy link

codecov bot commented Sep 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.31%. Comparing base (fa98921) to head (38e20f8).
Report is 1052 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9160   +/-   ##
=======================================
  Coverage   98.31%   98.31%           
=======================================
  Files         107      107           
  Lines       34461    34475   +14     
  Branches     4089     4090    +1     
=======================================
+ Hits        33879    33893   +14     
  Misses        411      411           
  Partials      171      171           
Flag Coverage Δ
CI-GHA 98.20% <100.00%> (+<0.01%) ⬆️
OS-Linux 97.87% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.28% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.55% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.64% <100.00%> (+<0.01%) ⬆️
Py-3.10.14 97.58% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.80% <100.00%> (+<0.01%) ⬆️
Py-3.12.5 97.58% <100.00%> (+<0.01%) ⬆️
Py-3.12.6 97.65% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.53% <100.00%> (+<0.01%) ⬆️
Py-3.9.19 97.47% <100.00%> (+0.09%) ⬆️
Py-3.9.20 ?
Py-pypy7.3.16 97.08% <100.00%> (-0.01%) ⬇️
VM-macos 97.55% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 97.87% <100.00%> (+<0.01%) ⬆️
VM-windows 96.28% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Dreamsorcerer Dreamsorcerer added backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Sep 17, 2024
@Dreamsorcerer
Copy link
Member

Weird that the documentation doesn't mention these exceptions, but I think the change is correct.

@Dreamsorcerer Dreamsorcerer merged commit 8ad118b into aio-libs:master Sep 17, 2024
35 of 37 checks passed
Copy link
Contributor

patchback bot commented Sep 17, 2024

Backport to 3.10: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 8ad118b on top of patchback/backports/3.10/8ad118b1d8b83ce0c0b61ae0cf8019c9a2fcd5ae/pr-9160

Backporting merged PR #9160 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.10/8ad118b1d8b83ce0c0b61ae0cf8019c9a2fcd5ae/pr-9160 upstream/3.10
  4. Now, cherry-pick PR Fix badly encoded charset crashing instead of falling back to detector #9160 contents into that branch:
    $ git cherry-pick -x 8ad118b1d8b83ce0c0b61ae0cf8019c9a2fcd5ae
    If it'll yell at you with something like fatal: Commit 8ad118b1d8b83ce0c0b61ae0cf8019c9a2fcd5ae is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 8ad118b1d8b83ce0c0b61ae0cf8019c9a2fcd5ae
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix badly encoded charset crashing instead of falling back to detector #9160 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/8ad118b1d8b83ce0c0b61ae0cf8019c9a2fcd5ae/pr-9160
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link
Contributor

patchback bot commented Sep 17, 2024

Backport to 3.11: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 8ad118b on top of patchback/backports/3.11/8ad118b1d8b83ce0c0b61ae0cf8019c9a2fcd5ae/pr-9160

Backporting merged PR #9160 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.11/8ad118b1d8b83ce0c0b61ae0cf8019c9a2fcd5ae/pr-9160 upstream/3.11
  4. Now, cherry-pick PR Fix badly encoded charset crashing instead of falling back to detector #9160 contents into that branch:
    $ git cherry-pick -x 8ad118b1d8b83ce0c0b61ae0cf8019c9a2fcd5ae
    If it'll yell at you with something like fatal: Commit 8ad118b1d8b83ce0c0b61ae0cf8019c9a2fcd5ae is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 8ad118b1d8b83ce0c0b61ae0cf8019c9a2fcd5ae
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix badly encoded charset crashing instead of falling back to detector #9160 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/8ad118b1d8b83ce0c0b61ae0cf8019c9a2fcd5ae/pr-9160
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@Dreamsorcerer
Copy link
Member

Could you follow the above instructions for backports please?

PLPeeters added a commit to PLPeeters/aiohttp that referenced this pull request Sep 18, 2024
…or (aio-libs#9160)

(cherry picked from commit 8ad118b)

# Conflicts:
#	tests/test_client_response.py
PLPeeters added a commit to PLPeeters/aiohttp that referenced this pull request Sep 18, 2024
…or (aio-libs#9160)

(cherry picked from commit 8ad118b)

# Conflicts:
#	tests/test_client_response.py
Dreamsorcerer pushed a commit that referenced this pull request Sep 18, 2024
…of falling back to detector (#9182)

Backport of #9160 to 3.11
Dreamsorcerer pushed a commit that referenced this pull request Sep 18, 2024
…of falling back to detector (#9181)

Backport of #9160 to 3.10
@PLPeeters PLPeeters deleted the bugfix/bad-charset branch September 25, 2024 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants