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

🔗 Fix connecting to link-local IPv6 addresses #4556

Merged
merged 5 commits into from
Oct 16, 2020
Merged

🔗 Fix connecting to link-local IPv6 addresses #4556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ca0c9c
🔗 Fix connecting to link-local IPv6 addresses (#4554)
socketpair Feb 5, 2020
88e4596
Merge branch 'master' into ipv6ll
asvetlov Oct 16, 2020
bf44c2f
Fix typing
asvetlov Oct 16, 2020
b376c2d
Fix test
asvetlov Oct 16, 2020
6948941
Fix test
asvetlov Oct 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES/4554.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix connecting to link-local IPv6 addresses.
Copy link
Member

Choose a reason for hiding this comment

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

Any chance you could add a test for this?

35 changes: 25 additions & 10 deletions aiohttp/resolver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,23 @@ async def resolve(self, host: str, port: int=0,

hosts = []
for family, _, proto, _, address in infos:
hosts.append(
{'hostname': host,
'host': address[0], 'port': address[1],
'family': family, 'proto': proto,
'flags': socket.AI_NUMERICHOST})
if family == socket.AF_INET6 and address[3]: # type: ignore
# This is essential for link-local IPv6 addresses.
# LL IPv6 is a VERY rare case. Strictly speaking, we should use
# getnameinfo() unconditionally, but performance makes sense.
host, _port = socket.getnameinfo(
address, socket.NI_NUMERICHOST | socket.NI_NUMERICSERV)
port = int(_port)
else:
host, port = address[:2]
hosts.append({
'hostname': host,
'host': host,
'port': port,
Copy link
Member

Choose a reason for hiding this comment

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

maybe normalize the port here instead of the if-block?

Suggested change
'port': port,
'port': int(port),

'family': family,
'proto': proto,
'flags': socket.AI_NUMERICHOST | socket.AI_NUMERICSERV,
})

return hosts

Expand All @@ -62,11 +74,14 @@ async def resolve(self, host: str, port: int=0,
raise OSError(msg) from exc
hosts = []
for address in resp.addresses:
hosts.append(
{'hostname': host,
'host': address, 'port': port,
'family': family, 'proto': 0,
'flags': socket.AI_NUMERICHOST})
hosts.append({
'hostname': host,
'host': address,
'port': port,
'family': family,
'proto': 0,
'flags': socket.AI_NUMERICHOST | socket.AI_NUMERICSERV,
})

if not hosts:
raise OSError("DNS lookup failed")
Expand Down
4 changes: 2 additions & 2 deletions tests/test_connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,10 +652,10 @@ async def test_tcp_connector_resolve_host(loop) -> None:
for rec in res:
if rec['family'] == socket.AF_INET:
assert rec['host'] == '127.0.0.1'
assert rec['hostname'] == 'localhost'
assert rec['hostname'] == '127.0.0.1'
assert rec['port'] == 8080
elif rec['family'] == socket.AF_INET6:
assert rec['hostname'] == 'localhost'
assert rec['hostname'] == '::1'
assert rec['port'] == 8080
if platform.system() == 'Darwin':
assert rec['host'] in ('::1', 'fe80::1', 'fe80::1%lo0')
Expand Down