Skip to content

Commit ad40764

Browse files
GH-86508: skip binding to local addresses of different family in asyncio.open_connection (GH-100615)
(cherry picked from commit ba8dcdb) Co-authored-by: Kumar Aditya <[email protected]>
1 parent d8073ee commit ad40764

File tree

3 files changed

+50
-2
lines changed

3 files changed

+50
-2
lines changed

Lib/asyncio/base_events.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -950,7 +950,10 @@ async def _connect_sock(self, exceptions, addr_info, local_addr_infos=None):
950950
sock = socket.socket(family=family, type=type_, proto=proto)
951951
sock.setblocking(False)
952952
if local_addr_infos is not None:
953-
for _, _, _, _, laddr in local_addr_infos:
953+
for lfamily, _, _, _, laddr in local_addr_infos:
954+
# skip local addresses of different family
955+
if lfamily != family:
956+
continue
954957
try:
955958
sock.bind(laddr)
956959
break
@@ -963,7 +966,10 @@ async def _connect_sock(self, exceptions, addr_info, local_addr_infos=None):
963966
exc = OSError(exc.errno, msg)
964967
my_exceptions.append(exc)
965968
else: # all bind attempts failed
966-
raise my_exceptions.pop()
969+
if my_exceptions:
970+
raise my_exceptions.pop()
971+
else:
972+
raise OSError(f"no matching local address with {family=} found")
967973
await self.sock_connect(sock, address)
968974
return sock
969975
except OSError as exc:

Lib/test/test_asyncio/test_events.py

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,47 @@ def test_create_connection_local_addr(self):
671671
self.assertEqual(port, expected)
672672
tr.close()
673673

674+
def test_create_connection_local_addr_skip_different_family(self):
675+
# See https://github.com/python/cpython/issues/86508
676+
port1 = socket_helper.find_unused_port()
677+
port2 = socket_helper.find_unused_port()
678+
getaddrinfo_orig = self.loop.getaddrinfo
679+
680+
async def getaddrinfo(host, port, *args, **kwargs):
681+
if port == port2:
682+
return [(socket.AF_INET6, socket.SOCK_STREAM, 0, '', ('::1', 0, 0, 0)),
683+
(socket.AF_INET, socket.SOCK_STREAM, 0, '', ('127.0.0.1', 0))]
684+
return await getaddrinfo_orig(host, port, *args, **kwargs)
685+
686+
self.loop.getaddrinfo = getaddrinfo
687+
688+
f = self.loop.create_connection(
689+
lambda: MyProto(loop=self.loop),
690+
'localhost', port1, local_addr=('localhost', port2))
691+
692+
with self.assertRaises(OSError):
693+
self.loop.run_until_complete(f)
694+
695+
def test_create_connection_local_addr_nomatch_family(self):
696+
# See https://github.com/python/cpython/issues/86508
697+
port1 = socket_helper.find_unused_port()
698+
port2 = socket_helper.find_unused_port()
699+
getaddrinfo_orig = self.loop.getaddrinfo
700+
701+
async def getaddrinfo(host, port, *args, **kwargs):
702+
if port == port2:
703+
return [(socket.AF_INET6, socket.SOCK_STREAM, 0, '', ('::1', 0, 0, 0))]
704+
return await getaddrinfo_orig(host, port, *args, **kwargs)
705+
706+
self.loop.getaddrinfo = getaddrinfo
707+
708+
f = self.loop.create_connection(
709+
lambda: MyProto(loop=self.loop),
710+
'localhost', port1, local_addr=('localhost', port2))
711+
712+
with self.assertRaises(OSError):
713+
self.loop.run_until_complete(f)
714+
674715
def test_create_connection_local_addr_in_use(self):
675716
with test_utils.run_test_server() as httpd:
676717
f = self.loop.create_connection(
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix :func:`asyncio.open_connection` to skip binding to local addresses of different family. Patch by Kumar Aditya.

0 commit comments

Comments
 (0)