summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorKumar Aditya <59607654+kumaraditya303@users.noreply.github.com>2023-01-04 08:00:26 (GMT)
committerGitHub <noreply@github.com>2023-01-04 08:00:26 (GMT)
commitba8dcdbcab5fd9989be6c9a51002394e782c463c (patch)
tree5b83b3e4cba8cbb1d6232b49b66aaf41f6177476 /Lib
parenta286caa937405f7415dcc095a7ad5097c4433246 (diff)
downloadcpython-ba8dcdbcab5fd9989be6c9a51002394e782c463c.zip
cpython-ba8dcdbcab5fd9989be6c9a51002394e782c463c.tar.gz
cpython-ba8dcdbcab5fd9989be6c9a51002394e782c463c.tar.bz2
GH-86508: skip binding to local addresses of different family in `asyncio.open_connection` (#100615)
Diffstat (limited to 'Lib')
-rw-r--r--Lib/asyncio/base_events.py10
-rw-r--r--Lib/test/test_asyncio/test_events.py41
2 files changed, 49 insertions, 2 deletions
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index f2f9375..cbabb43 100644
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -961,7 +961,10 @@ class BaseEventLoop(events.AbstractEventLoop):
sock = socket.socket(family=family, type=type_, proto=proto)
sock.setblocking(False)
if local_addr_infos is not None:
- for _, _, _, _, laddr in local_addr_infos:
+ for lfamily, _, _, _, laddr in local_addr_infos:
+ # skip local addresses of different family
+ if lfamily != family:
+ continue
try:
sock.bind(laddr)
break
@@ -974,7 +977,10 @@ class BaseEventLoop(events.AbstractEventLoop):
exc = OSError(exc.errno, msg)
my_exceptions.append(exc)
else: # all bind attempts failed
- raise my_exceptions.pop()
+ if my_exceptions:
+ raise my_exceptions.pop()
+ else:
+ raise OSError(f"no matching local address with {family=} found")
await self.sock_connect(sock, address)
return sock
except OSError as exc:
diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index e7771ed..093f8c1 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -670,6 +670,47 @@ class EventLoopTestsMixin:
self.assertEqual(port, expected)
tr.close()
+ def test_create_connection_local_addr_skip_different_family(self):
+ # See https://github.com/python/cpython/issues/86508
+ port1 = socket_helper.find_unused_port()
+ port2 = socket_helper.find_unused_port()
+ getaddrinfo_orig = self.loop.getaddrinfo
+
+ async def getaddrinfo(host, port, *args, **kwargs):
+ if port == port2:
+ return [(socket.AF_INET6, socket.SOCK_STREAM, 0, '', ('::1', 0, 0, 0)),
+ (socket.AF_INET, socket.SOCK_STREAM, 0, '', ('127.0.0.1', 0))]
+ return await getaddrinfo_orig(host, port, *args, **kwargs)
+
+ self.loop.getaddrinfo = getaddrinfo
+
+ f = self.loop.create_connection(
+ lambda: MyProto(loop=self.loop),
+ 'localhost', port1, local_addr=('localhost', port2))
+
+ with self.assertRaises(OSError):
+ self.loop.run_until_complete(f)
+
+ def test_create_connection_local_addr_nomatch_family(self):
+ # See https://github.com/python/cpython/issues/86508
+ port1 = socket_helper.find_unused_port()
+ port2 = socket_helper.find_unused_port()
+ getaddrinfo_orig = self.loop.getaddrinfo
+
+ async def getaddrinfo(host, port, *args, **kwargs):
+ if port == port2:
+ return [(socket.AF_INET6, socket.SOCK_STREAM, 0, '', ('::1', 0, 0, 0))]
+ return await getaddrinfo_orig(host, port, *args, **kwargs)
+
+ self.loop.getaddrinfo = getaddrinfo
+
+ f = self.loop.create_connection(
+ lambda: MyProto(loop=self.loop),
+ 'localhost', port1, local_addr=('localhost', port2))
+
+ with self.assertRaises(OSError):
+ self.loop.run_until_complete(f)
+
def test_create_connection_local_addr_in_use(self):
with test_utils.run_test_server() as httpd:
f = self.loop.create_connection(