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

Disallow newlines in reason #9167

Merged
merged 4 commits into from
Sep 19, 2024
Merged

Disallow newlines in reason #9167

merged 4 commits into from
Sep 19, 2024

Conversation

Dreamsorcerer
Copy link
Member

Fixes #6654.

@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
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Sep 17, 2024
tests/test_web_exceptions.py Dismissed Show dismissed Hide dismissed
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 (bf022b3) to head (850fa64).
Report is 1051 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9167   +/-   ##
=======================================
  Coverage   98.31%   98.31%           
=======================================
  Files         107      107           
  Lines       34483    34493   +10     
  Branches     4093     4097    +4     
=======================================
+ Hits        33901    33911   +10     
  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.10.15 ?
Py-3.11.9 97.81% <100.00%> (+<0.01%) ⬆️
Py-3.12.5 97.58% <100.00%> (+<0.01%) ⬆️
Py-3.12.6 97.64% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.53% <100.00%> (+<0.01%) ⬆️
Py-3.9.19 97.39% <100.00%> (-0.09%) ⬇️
Py-3.9.20 97.29% <100.00%> (-0.19%) ⬇️
Py-pypy7.3.16 97.09% <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.

aiohttp/web_exceptions.py Show resolved Hide resolved
aiohttp/web_response.py Show resolved Hide resolved
@Dreamsorcerer Dreamsorcerer merged commit 88f3834 into master Sep 19, 2024
34 of 35 checks passed
@Dreamsorcerer Dreamsorcerer deleted the fix-bad-reason branch September 19, 2024 11:33
Copy link
Contributor

patchback bot commented Sep 19, 2024

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

❌ Failed to cleanly apply 88f3834 on top of patchback/backports/3.10/88f383427e918360fd2762a9a3256897159e2d6b/pr-9167

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

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

❌ Failed to cleanly apply 88f3834 on top of patchback/backports/3.11/88f383427e918360fd2762a9a3256897159e2d6b/pr-9167

Backporting merged PR #9167 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/88f383427e918360fd2762a9a3256897159e2d6b/pr-9167 upstream/3.11
  4. Now, cherry-pick PR Disallow newlines in reason #9167 contents into that branch:
    $ git cherry-pick -x 88f383427e918360fd2762a9a3256897159e2d6b
    If it'll yell at you with something like fatal: Commit 88f383427e918360fd2762a9a3256897159e2d6b is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 88f383427e918360fd2762a9a3256897159e2d6b
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Disallow newlines in reason #9167 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/88f383427e918360fd2762a9a3256897159e2d6b/pr-9167
  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 Sep 19, 2024
(cherry picked from commit 88f3834)
Dreamsorcerer added a commit that referenced this pull request Sep 19, 2024
(cherry picked from commit 88f3834)
Dreamsorcerer added a commit that referenced this pull request Sep 19, 2024
Dreamsorcerer added a commit that referenced this pull request Sep 19, 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.

Unpredictable behavior of the server with the issuance of 500 when the "reason" parameter is incorrect.
3 participants