Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-113892: Add a extra check to `ProactorEventLoop.sock_connect` to ensure that the given socket is in non-blocking mode (#119519)

This commit is contained in:
Kirill Podoprigora 2024-06-01 19:05:19 +03:00 committed by GitHub
parent ce2ea7d629
commit cf3bba3f06
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/asyncio/proactor_events.py
View File

@ -721,6 +721,8 @@ class BaseProactorEventLoop(base_events.BaseEventLoop):
return await self._proactor.sendto(sock, data, 0, address) return await self._proactor.sendto(sock, data, 0, address)
async def sock_connect(self, sock, address): async def sock_connect(self, sock, address):
if self._debug and sock.gettimeout() != 0:
raise ValueError("the socket must be non-blocking")
return await self._proactor.connect(sock, address) return await self._proactor.connect(sock, address)
async def sock_accept(self, sock): async def sock_accept(self, sock):

9
Lib/test/test_asyncio/test_proactor_events.py
View File

@ -1018,9 +1018,9 @@ class ProactorEventLoopUnixSockSendfileTests(test_utils.TestCase):
self.addCleanup(self.file.close) self.addCleanup(self.file.close)
super().setUp() super().setUp()
def make_socket(self, cleanup=True): def make_socket(self, cleanup=True, blocking=False):
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.setblocking(False) sock.setblocking(blocking)
sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 1024) sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 1024)
sock.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 1024) sock.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 1024)
if cleanup: if cleanup:
@ -1082,6 +1082,11 @@ class ProactorEventLoopUnixSockSendfileTests(test_utils.TestCase):
0, None)) 0, None))
self.assertEqual(self.file.tell(), 0) self.assertEqual(self.file.tell(), 0)
def test_blocking_socket(self):
self.loop.set_debug(True)
sock = self.make_socket(blocking=True)
with self.assertRaisesRegex(ValueError, "must be non-blocking"):
self.run_loop(self.loop.sock_sendfile(sock, self.file))
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

3
Misc/NEWS.d/next/Library/2024-05-24-21-54-55.gh-issue-113892.JKDFqq.rst Normal file
View File

@ -0,0 +1,3 @@
Now, the method ``sock_connect`` of :class:`asyncio.ProactorEventLoop`
raises a :exc:`ValueError` if given socket is not in
non-blocking mode, as well as in other loop implementations.