Always treat SSLError timeouts as socket timeouts (#247)

Without specifically handling this case, the socket.timeout()
was not raised sometimes causing the connection to lock up.

In the case we hit the errno was None, so the previous if
condition did not apply.

Co-Authored-By: aojeagarcia <aojeagarcia@suse.com>

2 files changed, 21 insertions, 1 deletions

diff --git a/amqp/transport.py b/amqp/transport.py
index ea713fd..898dbe6 100644
--- a/amqp/transport.py
+++ b/amqp/transport.py
@@ -376,6 +376,10 @@ class SSLTransport(_AbstractTransport):
                 try:
                     s = recv(n - len(rbuf))  # see note above
                 except socket.error as exc:
+                    # ssl.sock.read may cause a SSLerror without errno
+                    # http://bugs.python.org/issue10272
+                    if isinstance(exc, SSLError) and 'timed out' in str(exc):
+                        raise socket.timeout()
                     # ssl.sock.read may cause ENOENT if the
                     # operation couldn't be performed (Issue celery#1414).
                     if exc.errno in _errnos:
diff --git a/t/unit/test_transport.py b/t/unit/test_transport.py
index 10a112b..dfc398c 100644
--- a/t/unit/test_transport.py
+++ b/t/unit/test_transport.py
@@ -5,7 +5,7 @@ import socket
 import struct
 
 import pytest
-from case import ANY, Mock, call, patch
+from case import ANY, Mock, MagicMock, call, patch
 
 from amqp import transport
 from amqp.exceptions import UnexpectedFrame
@@ -653,6 +653,22 @@ class test_SSLTransport:
                            match=r'.*Socket closed.*'):
             self.t._write('foo')
 
+    def test_read_timeout(self):
+        self.t.sock = Mock(name='SSLSocket')
+        self.t._quick_recv = Mock(name='recv', return_value='4')
+        self.t._quick_recv.side_effect = socket.timeout()
+        self.t._read_buffer = MagicMock(return_value='AA')
+        with pytest.raises(socket.timeout):
+            self.t._read(64)
+
+    def test_read_SSLError(self):
+        self.t.sock = Mock(name='SSLSocket')
+        self.t._quick_recv = Mock(name='recv', return_value='4')
+        self.t._quick_recv.side_effect = transport.SSLError('timed out')
+        self.t._read_buffer = MagicMock(return_value='AA')
+        with pytest.raises(socket.timeout):
+            self.t._read(64)
+
 
 class test_TCPTransport: