[Python-checkins] bpo-37404: Raising value error if an SSLSocket is passed to asyncio functions (GH-16457)

Sat Dec 7 07:45:11 EST 2019

https://github.com/python/cpython/commit/a85066df9423d381e6b233469b00db55563a9f80
commit: a85066df9423d381e6b233469b00db55563a9f80
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019年12月07日T04:45:07-08:00
summary:
bpo-37404: Raising value error if an SSLSocket is passed to asyncio functions (GH-16457)
https://bugs.python.org/issue37404
(cherry picked from commit 892f9e0777f262d366d4747a54c33a1c15a49da6)
Co-authored-by: idomic <michael.ido at gmail.com>
files:
A Misc/NEWS.d/next/Build/2019-12-01-21-45-24.bpo-37404.cNsA7S.rst
M Lib/asyncio/selector_events.py

diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
index 23bd8ad8492ff..c539b5d387196 100644
--- a/Lib/asyncio/selector_events.py
+++ b/Lib/asyncio/selector_events.py
@@ -345,6 +345,8 @@ def remove_writer(self, fd):
 The maximum amount of data to be received at once is specified by
 nbytes.
 """
+ if isinstance(sock, ssl.SSLSocket):
+ raise TypeError("Socket cannot be of type SSLSocket")
 if self._debug and sock.gettimeout() != 0:
 raise ValueError("the socket must be non-blocking")
 fut = self.create_future()
@@ -378,6 +380,8 @@ def _sock_recv(self, fut, registered_fd, sock, n):
 The received data is written into *buf* (a writable buffer).
 The return value is the number of bytes written.
 """
+ if isinstance(sock, ssl.SSLSocket):
+ raise TypeError("Socket cannot be of type SSLSocket")
 if self._debug and sock.gettimeout() != 0:
 raise ValueError("the socket must be non-blocking")
 fut = self.create_future()
@@ -415,6 +419,8 @@ def _sock_recv_into(self, fut, registered_fd, sock, buf):
 raised, and there is no way to determine how much data, if any, was
 successfully processed by the receiving end of the connection.
 """
+ if isinstance(sock, ssl.SSLSocket):
+ raise TypeError("Socket cannot be of type SSLSocket")
 if self._debug and sock.gettimeout() != 0:
 raise ValueError("the socket must be non-blocking")
 fut = self.create_future()
@@ -451,6 +457,8 @@ def _sock_sendall(self, fut, registered_fd, sock, data):
 
 This method is a coroutine.
 """
+ if isinstance(sock, ssl.SSLSocket):
+ raise TypeError("Socket cannot be of type SSLSocket")
 if self._debug and sock.gettimeout() != 0:
 raise ValueError("the socket must be non-blocking")
 
@@ -508,6 +516,8 @@ def _sock_connect_cb(self, fut, sock, address):
 object usable to send and receive data on the connection, and address
 is the address bound to the socket on the other end of the connection.
 """
+ if isinstance(sock, ssl.SSLSocket):
+ raise TypeError("Socket cannot be of type SSLSocket")
 if self._debug and sock.gettimeout() != 0:
 raise ValueError("the socket must be non-blocking")
 fut = self.create_future()
diff --git a/Misc/NEWS.d/next/Build/2019-12-01-21-45-24.bpo-37404.cNsA7S.rst b/Misc/NEWS.d/next/Build/2019-12-01-21-45-24.bpo-37404.cNsA7S.rst
new file mode 100644
index 0000000000000..067fc9d3f189d
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2019-12-01-21-45-24.bpo-37404.cNsA7S.rst
@@ -0,0 +1,2 @@
+:mod:`asyncio` now raises :exc:`TyperError` when calling incompatible methods
+with an :class:`ssl.SSLSocket` socket. Patch by Ido Michael.
