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

Return 500 error when handler has wrong return type #8845

Merged
merged 4 commits into from
Aug 24, 2024
Merged

Conversation

Dreamsorcerer
Copy link
Member

Fixes #4572.

Not entirely sure if this is the best solution. Will sort the test tomorrow.

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

codecov bot commented Aug 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.23%. Comparing base (faa15fd) to head (27527d8).
Report is 1071 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8845      +/-   ##
==========================================
- Coverage   98.24%   98.23%   -0.01%     
==========================================
  Files         107      107              
  Lines       34107    34094      -13     
  Branches     4050     4046       -4     
==========================================
- Hits        33507    33493      -14     
  Misses        424      424              
- Partials      176      177       +1     
Flag Coverage Δ
CI-GHA 98.13% <100.00%> (-0.01%) ⬇️
OS-Linux 97.79% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.18% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.46% <100.00%> (-0.01%) ⬇️
Py-3.10.11 97.56% <100.00%> (-0.01%) ⬇️
Py-3.10.14 97.49% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.72% <100.00%> (-0.01%) ⬇️
Py-3.12.4 95.99% <100.00%> (+<0.01%) ⬆️
Py-3.12.5 97.52% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.45% <100.00%> (+<0.01%) ⬆️
Py-3.9.19 97.39% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 96.99% <100.00%> (-0.01%) ⬇️
VM-macos 97.46% <100.00%> (-0.01%) ⬇️
VM-ubuntu 97.79% <100.00%> (+<0.01%) ⬆️
VM-windows 96.18% <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.

@webknjaz
Copy link
Member

Perhaps, instead of returning a tuple, an exception wrapping the response could be raised and unwrapped/handled on the calling side?

@Dreamsorcerer
Copy link
Member Author

So, it's already covered by tests, they just asserted that the server would disconnect, which seems like an odd choice..

@Dreamsorcerer
Copy link
Member Author

Dreamsorcerer commented Aug 23, 2024

Perhaps, instead of returning a tuple, an exception wrapping the response could be raised and unwrapped/handled on the calling side?

I don't think that works without more substantial refactoring. The actual writing happens in finish_response() where I create the replacement Response, the only reason I then return the new response, is because the calling function returns the resp to something else which accesses an attribute on it one more time, so I need it to replace the invalid resp object it passed in with the new one (back in .start() it accesses resp.keep_alive).

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Aug 23, 2024
@Dreamsorcerer Dreamsorcerer merged commit 48a5e07 into master Aug 24, 2024
35 of 36 checks passed
@Dreamsorcerer Dreamsorcerer deleted the 500-error branch August 24, 2024 12:31
@Dreamsorcerer Dreamsorcerer added backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot and removed backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Aug 24, 2024
@Dreamsorcerer
Copy link
Member Author

@webknjaz Backport's broken...

@webknjaz
Copy link
Member

I know, GitHub's API response started including a new field which broke the mapping. I'll try to fix it today.

@Dreamsorcerer
Copy link
Member Author

Oh, that's timeline as well. So, won't be able to merge anything new at the moment.

@webknjaz webknjaz added backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot and removed backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Aug 26, 2024
Copy link
Contributor

patchback bot commented Aug 26, 2024

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

❌ Failed to cleanly apply 48a5e07 on top of patchback/backports/3.10/48a5e07ad833bd1a8fcb2ce6f85a41ad0cef9dc6/pr-8845

Backporting merged PR #8845 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/48a5e07ad833bd1a8fcb2ce6f85a41ad0cef9dc6/pr-8845 upstream/3.10
  4. Now, cherry-pick PR Return 500 error when handler has wrong return type #8845 contents into that branch:
    $ git cherry-pick -x 48a5e07ad833bd1a8fcb2ce6f85a41ad0cef9dc6
    If it'll yell at you with something like fatal: Commit 48a5e07ad833bd1a8fcb2ce6f85a41ad0cef9dc6 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 48a5e07ad833bd1a8fcb2ce6f85a41ad0cef9dc6
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Return 500 error when handler has wrong return type #8845 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/48a5e07ad833bd1a8fcb2ce6f85a41ad0cef9dc6/pr-8845
  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 Aug 26, 2024

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

❌ Failed to cleanly apply 48a5e07 on top of patchback/backports/3.11/48a5e07ad833bd1a8fcb2ce6f85a41ad0cef9dc6/pr-8845

Backporting merged PR #8845 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/48a5e07ad833bd1a8fcb2ce6f85a41ad0cef9dc6/pr-8845 upstream/3.11
  4. Now, cherry-pick PR Return 500 error when handler has wrong return type #8845 contents into that branch:
    $ git cherry-pick -x 48a5e07ad833bd1a8fcb2ce6f85a41ad0cef9dc6
    If it'll yell at you with something like fatal: Commit 48a5e07ad833bd1a8fcb2ce6f85a41ad0cef9dc6 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 48a5e07ad833bd1a8fcb2ce6f85a41ad0cef9dc6
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Return 500 error when handler has wrong return type #8845 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/48a5e07ad833bd1a8fcb2ce6f85a41ad0cef9dc6/pr-8845
  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 added a commit that referenced this pull request Aug 26, 2024
Dreamsorcerer added a commit that referenced this pull request Aug 26, 2024
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.

Server closes connection if wrong type returned by handler
2 participants