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

Check if ipv6 is enabled, when processing socket address info #5906

Merged
merged 1 commit into from Oct 24, 2021

Conversation

Hanaasagi
Copy link
Member

@Hanaasagi Hanaasagi commented Jul 21, 2021

What do these changes do?

Related to #5901; getaddrinfo will return an (int, bytes) tuple, if
CPython could not handle the address family. It will cause a index out
of range error in aiohttp.

Are there changes in behavior for the user?

I think not.

Related issue number

#5901 and #5156.

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_id>.<type> for example (588.bugfix)
    • if you don't have an issue_id change it to the pr id after creating the pr
    • ensure type is one of the following:
      • .feature: Signifying a new feature.
      • .bugfix: Signifying a bug fix.
      • .doc: Signifying a documentation improvement.
      • .removal: Signifying a deprecation or removal of public API.
      • .misc: A ticket has been closed, but it is not of interest to users.
    • Make sure to use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files."

@codecov
Copy link

codecov bot commented Jul 21, 2021

Codecov Report

Merging #5906 (23da79f) into master (60f5727) will increase coverage by 0.00%.
The diff coverage is 66.66%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #5906   +/-   ##
=======================================
  Coverage   96.75%   96.75%           
=======================================
  Files          44       44           
  Lines        9851     9854    +3     
  Branches     1591     1592    +1     
=======================================
+ Hits         9531     9534    +3     
  Misses        182      182           
  Partials      138      138           
Flag Coverage Δ
unit 96.65% <66.66%> (+<0.01%) ⬆️

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

Impacted Files Coverage Δ
aiohttp/resolver.py 93.61% <66.66%> (+0.28%) ⬆️
aiohttp/client.py 94.00% <0.00%> (+0.01%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 60f5727...23da79f. Read the comment docs.

@Hanaasagi
Copy link
Member Author

Is there any good way to test this change? It needs a CPython that compiled with --disable-ipv6 and enable ipv6 in Linux.

@Hanaasagi Hanaasagi changed the title [WIP]Check if ipv6 is enabled, when processing socket address info Check if ipv6 is enabled, when processing socket address info Jul 21, 2021
CPython and enable ipv6 in system.
Related to aio-libs#5901; `getaddrinfo` will return an `(int, bytes)` tuple, if
CPython could not handle the address family. It will cause a index out
of range error in aiohttp.
Copy link
Member

@Dreamsorcerer Dreamsorcerer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, but I'm not really familiar with this part.

Copy link
Member

@asvetlov asvetlov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@asvetlov asvetlov merged commit 5ec6aec into aio-libs:master Oct 24, 2021
@patchback
Copy link
Contributor

patchback bot commented Oct 24, 2021

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

❌ Failed to cleanly apply 5ec6aec on top of patchback/backports/3.8/5ec6aec1baef1ff68d0bf3066b4f81f64c367376/pr-5906

Backporting merged PR #5906 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.8/5ec6aec1baef1ff68d0bf3066b4f81f64c367376/pr-5906 upstream/3.8
  4. Now, cherry-pick PR Check if ipv6 is enabled, when processing socket address info #5906 contents into that branch:
    $ git cherry-pick -x 5ec6aec1baef1ff68d0bf3066b4f81f64c367376
    If it'll yell at you with something like fatal: Commit 5ec6aec1baef1ff68d0bf3066b4f81f64c367376 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 5ec6aec1baef1ff68d0bf3066b4f81f64c367376
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Check if ipv6 is enabled, when processing socket address info #5906 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.8/5ec6aec1baef1ff68d0bf3066b4f81f64c367376/pr-5906
  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.

@aio-libs-github-bot
Copy link
Contributor

💔 Backport was not successful

The PR was attempted backported to the following branches:

  • ❌ 3.8: Commit could not be cherrypicked due to conflicts

asvetlov pushed a commit that referenced this pull request Oct 24, 2021
…5906)

CPython and enable ipv6 in system.
Related to #5901; `getaddrinfo` will return an `(int, bytes)` tuple, if
CPython could not handle the address family. It will cause a index out
of range error in aiohttp.
@webknjaz
Copy link
Member

webknjaz commented Nov 1, 2021

FTR this may have caused a regression, according to #6195.

asvetlov pushed a commit that referenced this pull request Nov 1, 2021
…5906)

CPython and enable ipv6 in system.
Related to #5901; `getaddrinfo` will return an `(int, bytes)` tuple, if
CPython could not handle the address family. It will cause a index out
of range error in aiohttp.
asvetlov pushed a commit that referenced this pull request Nov 1, 2021
…5906)

CPython and enable ipv6 in system.
Related to #5901; `getaddrinfo` will return an `(int, bytes)` tuple, if
CPython could not handle the address family. It will cause a index out
of range error in aiohttp.
@asvetlov
Copy link
Member

asvetlov commented Nov 1, 2021

Thanks for the reminder!
I've missed the fact that the auto-backporting has failed.
Backported by 13b6400

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

None yet

5 participants