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.

Sign up for GitHub

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

Jump to bottom

Avoid using the proxy headers in the ConnectionKey if no proxy is in use #9368

Merged
merged 4 commits into from
Oct 1, 2024
Merged

Avoid using the proxy headers in the ConnectionKey if no proxy is in use #9368

merged 4 commits into from
Oct 1, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Oct 1, 2024 •
edited
Loading

What do these changes do?

Default proxy headers may be passed to the connector to be included in the event a proxy is being used. If no proxy is being used, we should not include the proxy auth and proxy headers in the ConnectionKey since it means we could end up creating a connection when one was already available for reuse

Are there changes in behavior for the user?

no

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

no

@bdraco
Avoid using the proxy headers in the ConnectionKey if no proxy is in use
a6d451e 
Default proxy headers may be passed to the connector to be included if
a proxy is being used. If no proxy is being used, we should not include
the proxy auth and proxy headers in the ConnectionKey
@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 Oct 1, 2024
@bdraco
Copy link
Member Author

bdraco commented Oct 1, 2024 •
edited
Loading

I was wondering why the proxy headers were always being considered in the connection key for Home Assistant even when no proxy is in use. Its because default headers apply to proxy as well even when no proxy is in use

aiohttp/aiohttp/client.py

Line 474 in e3b1011

proxy_headers = self._prepare_headers(proxy_headers)

@codecov Codecov
Copy link

codecov bot commented Oct 1, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.56%. Comparing base (e3b1011) to head (599374e).
Report is 6 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master    #9368   +/-   ##
=======================================
  Coverage   98.56%   98.56%           
=======================================
  Files         107      107           
  Lines       34981    34990    +9     
  Branches     4149     4146    -3     
=======================================
+ Hits        34478    34487    +9     
  Misses        335      335           
  Partials      168      168
Flag Coverage Δ
CI-GHA 98.44% <100.00%> (+<0.01%) ⬆️
OS-Linux 98.10% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.52% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.79% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.66% <100.00%> (+<0.01%) ⬆️
Py-3.10.15 97.60% <100.00%> (+<0.01%) ⬆️
Py-3.11.10 97.67% <100.00%> (-0.01%) ⬇️
Py-3.11.9 97.73% <100.00%> (-0.02%) ⬇️
Py-3.12.6 98.15% <100.00%> (+<0.01%) ⬆️
Py-3.13.0-rc.2 98.14% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.56% <100.00%> (+<0.01%) ⬆️
Py-3.9.20 97.50% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 97.11% <100.00%> (-0.01%) ⬇️
VM-macos 97.79% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 98.10% <100.00%> (+<0.01%) ⬆️
VM-windows 96.52% <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.

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Oct 1, 2024
@bdraco
Copy link
Member Author

bdraco commented Oct 1, 2024

needs a test

@bdraco bdraco marked this pull request as ready for review October 1, 2024 16:30
@bdraco bdraco merged commit 02d8dba into master Oct 1, 2024
38 of 39 checks passed
@bdraco bdraco deleted the no_consider_proxy_header_cache_key_no_proxy branch October 1, 2024 16:56
@patchback Patchback
Copy link
Contributor

patchback bot commented Oct 1, 2024 •
edited
Loading

Backport to 3.10: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.10/02d8dba9a320e4d15d8d7539ca5fb6d93083bd26/pr-9368

Backported as #9378

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

patchback bot pushed a commit that referenced this pull request Oct 1, 2024
@bdraco @patchback
Avoid using the proxy headers in the ConnectionKey if no proxy is in …
7f9951a 
…use (#9368)

(cherry picked from commit 02d8dba)
@patchback Patchback
Copy link
Contributor

patchback bot commented Oct 1, 2024 •
edited
Loading

Backport to 3.11: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.11/02d8dba9a320e4d15d8d7539ca5fb6d93083bd26/pr-9368

Backported as #9379

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

@patchback patchback bot mentioned this pull request Oct 1, 2024
Merged
patchback bot pushed a commit that referenced this pull request Oct 1, 2024
@bdraco @patchback
Avoid using the proxy headers in the ConnectionKey if no proxy is in …
16196cb 
…use (#9368)

(cherry picked from commit 02d8dba)
@patchback patchback bot mentioned this pull request Oct 1, 2024
Merged
bdraco added a commit that referenced this pull request Oct 1, 2024
@bdraco
Fix missing text in #9368 changelog message
3690764
@bdraco bdraco mentioned this pull request Oct 1, 2024
Merged
bdraco added a commit that referenced this pull request Oct 1, 2024
@patchback @bdraco
[PR #9368/02d8dba9 backport][3.11] Avoid using the proxy headers in t…
c95998e 
…he ConnectionKey if no proxy is in use (#9379)

Co-authored-by: J. Nick Koston <[email protected]>
bdraco added a commit that referenced this pull request Oct 1, 2024
@bdraco
Fix missing text in #9368 changelog message (#9385)
8a583ed
patchback bot pushed a commit that referenced this pull request Oct 1, 2024
@bdraco @patchback
Fix missing text in #9368 changelog message (#9385)
8cc1ad6 
(cherry picked from commit 8a583ed)
@patchback patchback bot mentioned this pull request Oct 1, 2024
Merged
bdraco pushed a commit that referenced this pull request Oct 1, 2024
@patchback
[PR #9385/8a583ed1 backport][3.11] Fix missing text in #9368 changelo…
72b90b0 
…g message (#9387)

Co-authored-by: J. Nick Koston <[email protected]>
Fix missing text in #9368 changelog message
bdraco added a commit that referenced this pull request Oct 1, 2024
@patchback @bdraco
[PR #9368/02d8dba9 backport][3.10] Avoid using the proxy headers in t…
6198a56 
…he ConnectionKey if no proxy is in use (#9378)

Co-authored-by: J. Nick Koston <[email protected]>
@bdraco bdraco mentioned this pull request Oct 4, 2024
Merged
20 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@webknjaz webknjaz Awaiting requested review from webknjaz webknjaz is a code owner

@asvetlov asvetlov Awaiting requested review from asvetlov asvetlov is a code owner

Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@bdraco