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 double unquoting in url dispatcher #9267

Merged
merged 52 commits into from
Sep 23, 2024
Merged

Fix double unquoting in url dispatcher #9267

merged 52 commits into from
Sep 23, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Sep 23, 2024

#8898 now passes the unquoted path and we would unquote it again. To fix this we need to bump the minimum yarl version to 1.12.0 and use the new URL.path_safe method. This is done in a single PR since the yarl bump has a revert in it that is breaking (only for unreleased/non-stable versions of aiohttp) without this change.

#8898 now passes the unquoted path and we would
unquote it again
@bdraco bdraco added backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Sep 23, 2024
@bdraco
Copy link
Member Author

bdraco commented Sep 23, 2024

If this passes the CI than we likely have a gap in test coverage

Copy link

codecov bot commented Sep 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.41%. Comparing base (2383b9c) to head (2694229).
Report is 2 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9267   +/-   ##
=======================================
  Coverage   98.41%   98.41%           
=======================================
  Files         107      107           
  Lines       34811    34828   +17     
  Branches     4130     4132    +2     
=======================================
+ Hits        34260    34277   +17     
  Misses        380      380           
  Partials      171      171           
Flag Coverage Δ
CI-GHA 98.30% <100.00%> (+<0.01%) ⬆️
OS-Linux 97.97% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.36% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.64% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.63% <100.00%> (+<0.01%) ⬆️
Py-3.10.15 97.56% <100.00%> (+<0.01%) ⬆️
Py-3.11.10 97.53% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.60% <100.00%> (-0.01%) ⬇️
Py-3.12.6 98.02% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.52% <100.00%> (+<0.01%) ⬆️
Py-3.9.20 97.46% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 97.08% <100.00%> (+<0.01%) ⬆️
VM-macos 97.64% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 97.97% <100.00%> (+<0.01%) ⬆️
VM-windows 96.36% <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_urldispatcher.py Outdated Show resolved Hide resolved
aiohttp/web_urldispatcher.py Outdated Show resolved Hide resolved
Dreamsorcerer and others added 2 commits September 23, 2024 19:43
The minimum version must increase because we need ``URL.path_safe`` to be
able to fix #9267 and the original PR #8898
@bdraco bdraco marked this pull request as ready for review September 23, 2024 21:32
@bdraco bdraco enabled auto-merge (squash) September 23, 2024 21:36
@bdraco bdraco merged commit 947b9c4 into master Sep 23, 2024
32 of 33 checks passed
@bdraco bdraco deleted the fix_double_unquoting branch September 23, 2024 21:41
Copy link
Contributor

patchback bot commented Sep 23, 2024

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

❌ Failed to cleanly apply 947b9c4 on top of patchback/backports/3.10/947b9c43374a2d6a73baab31c5f4bc106d4683ef/pr-9267

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

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

❌ Failed to cleanly apply 947b9c4 on top of patchback/backports/3.11/947b9c43374a2d6a73baab31c5f4bc106d4683ef/pr-9267

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

bdraco added a commit that referenced this pull request Sep 23, 2024
Co-authored-by: Sam Bull <git@sambull.org>
(cherry picked from commit 947b9c4)
bdraco added a commit that referenced this pull request Sep 23, 2024
Co-authored-by: Sam Bull <git@sambull.org>
(cherry picked from commit 947b9c4)
bdraco added a commit that referenced this pull request Sep 23, 2024
…her (#9269)

Co-authored-by: Sam Bull <git@sambull.org>
@bdraco bdraco mentioned this pull request Sep 23, 2024
bdraco added a commit that referenced this pull request Sep 23, 2024
…her (#9270)

Co-authored-by: Sam Bull <git@sambull.org>
@bdraco
Copy link
Member Author

bdraco commented Sep 24, 2024

home-assistant/core#126468

all passing now.

I think we are good to do the stable release

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot 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